prepare for using program_options; sanitize namespaces a bit

[dyn-nsupdate.git] / dyn-nsupdate.cpp

diff --git a/dyn-nsupdate.cpp b/dyn-nsupdate.cpp
index fd804d0057eb6990dfc3f2cf958743a0dc0ade0a..b0bf8852c7ddec7d02b452c1a097f5373283630c 100644 (file)
--- a/dyn-nsupdate.cpp
+++ b/dyn-nsupdate.cpp
@@ -1,15 +1,44 @@
+/* Copyright (c) 2014, Ralf Jung <post@ralfj.de>
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer. 
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those
+ * of the authors and should not be interpreted as representing official policies, 
+ * either expressed or implied, of the FreeBSD Project.
+ */
+
 #include <iostream>
 #include <fstream>
 #include <sys/wait.h>
 
 #include <boost/regex.hpp>
+#include <boost/program_options.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/ini_parser.hpp>
 #include <boost/iostreams/device/file_descriptor.hpp>
 #include <boost/iostreams/stream.hpp>
 
-using namespace boost;
-typedef property_tree::ptree::path_type path;
+namespace pt = boost::property_tree;
+namespace po = boost::program_options;
 
 static void write(int fd, const char *str)
 {
@@ -23,9 +52,9 @@ static void write(int fd, const char *str)
 
 int main(int argc, const char ** argv)
 {
-       static const regex regex_ip("\\d{1,3}.\\d{1,3}.\\d{1,3}.\\d{1,3}");
-       static const regex regex_password("[a-zA-Z0-9.:;,_-]+");
-       static const regex regex_domain("[a-zA-Z0-9.]+");
+       static const boost::regex regex_ip("\\d{1,3}.\\d{1,3}.\\d{1,3}.\\d{1,3}");
+       static const boost::regex regex_password("[a-zA-Z0-9.:;,_-]+");
+       static const boost::regex regex_domain("[a-zA-Z0-9.]+");
        
        
        if (argc != 4) {
@@ -53,12 +82,13 @@ int main(int argc, const char ** argv)
        }
        
        /* read configuration */
-       property_tree::ptree config;
-       property_tree::ini_parser::read_ini(CONFIG_FILE, config);
+       pt::ptree config;
+       pt::ini_parser::read_ini(CONFIG_FILE, config);
        std::string nsupdate = config.get<std::string>("nsupdate");
+       unsigned server_port = config.get<unsigned>("port", 53);
        
        /* Given the domain, check whether the password matches */
-       optional<std::string> correct_password = config.get_optional<std::string>(path(domain+"/password", '/'));
+       boost::optional<std::string> correct_password = config.get_optional<std::string>(pt::ptree::path_type(domain+"/password", '/'));
        if (!correct_password || *correct_password != password) {
                std::cerr << "Password incorrect." << std::endl;
                exit(1);
@@ -86,7 +116,7 @@ int main(int argc, const char ** argv)
                        exit(1);
                }
                /* exec nsupdate */
-               execl(nsupdate.c_str(), nsupdate.c_str(), "-l", (char *)NULL);
+               execl(nsupdate.c_str(), nsupdate.c_str(), "-p", std::to_string(server_port).c_str(), "-l", (char *)NULL);
                /* There was an error */
                std::cerr << "There was an error executing nsupdate." << std::endl;
                exit(1);