Merge branch 'master' into authd-framework-2

[solanum.git] / authd / authd.c

diff --git a/authd/authd.c b/authd/authd.c
index 2e6861ae256877b2a046bad81f527c1addd3e057..335f55f51f15fe7b8466b23f28e9f05727ef1122 100644 (file)
--- a/authd/authd.c
+++ b/authd/authd.c
@@ -20,21 +20,29 @@
 
 #include "authd.h"
 #include "dns.h"
+#include "provider.h"
 
 #define MAXPARA 10
 
+static void handle_reload(int parc, char *parv[]);
 static void handle_stat(int parc, char *parv[]);
 
 rb_helper *authd_helper = NULL;
-authd_cmd_handler authd_cmd_handlers[255] = {
+authd_cmd_handler authd_cmd_handlers[256] = {
+       ['C'] = handle_new_connection,
        ['D'] = resolve_dns,
+       ['H'] = handle_reload,
        ['S'] = handle_stat,
 };
 
-authd_stat_handler authd_stat_handlers[255] = {
+authd_stat_handler authd_stat_handlers[256] = {
        ['D'] = enumerate_nameservers,
 };
 
+authd_reload_handler authd_reload_handlers[256] = {
+       ['D'] = reload_nameservers,
+};
+
 static void
 handle_stat(int parc, char *parv[])
 {
@@ -44,12 +52,27 @@ handle_stat(int parc, char *parv[])
                 /* XXX Should log this somehow */
                return;
 
-       if (!(handler = authd_stat_handlers[parv[2][0]]))
+       if (!(handler = authd_stat_handlers[(unsigned char)parv[2][0]]))
                return;
 
        handler(parv[1], parv[2][0]);
 }
 
+static void
+handle_reload(int parc, char *parv[])
+{
+       authd_reload_handler handler;
+
+       if(parc < 2)
+                /* XXX Should log this somehow */
+               return;
+
+       if (!(handler = authd_reload_handlers[(unsigned char)parv[1][0]]))
+               return;
+
+       handler(parv[1][0]);
+}
+
 static void
 parse_request(rb_helper *helper)
 {
@@ -66,7 +89,7 @@ parse_request(rb_helper *helper)
                if(parc < 1)
                        continue;
 
-               handler = authd_cmd_handlers[parv[0][0]];
+               handler = authd_cmd_handlers[(unsigned char)parv[0][0]];
                if (handler != NULL)
                        handler(parc, parv);
        }
@@ -78,7 +101,7 @@ error_cb(rb_helper *helper)
        exit(1);
 }
 
-#ifndef WINDOWS
+#ifndef _WIN32
 static void
 dummy_handler(int sig)
 {
@@ -89,7 +112,7 @@ dummy_handler(int sig)
 static void
 setup_signals(void)
 {
-#ifndef WINDOWS
+#ifndef _WIN32
        struct sigaction act;
 
        act.sa_flags = 0;
@@ -130,6 +153,7 @@ main(int argc, char *argv[])
        rb_set_time();
        setup_signals();
        init_resolver();
+       init_providers();
        rb_init_prng(NULL, RB_PRNG_DEFAULT);
 
        rb_helper_loop(authd_helper, 0);