ncd: support NCDUdevManager

ncd/CMakeLists.txt

@@ -59,7 +59,7 @@ add_executable(badvpn-ncd
     modules/net_watch_interfaces.c
     ${NCD_ADDITIONAL_SOURCES}
 )
-target_link_libraries(badvpn-ncd system dhcpclient ncdconfig process)
+target_link_libraries(badvpn-ncd system dhcpclient ncdconfig process udevmonitor)
 
 if (BADVPN_USE_LINUX_INPUT)
     string(REPLACE " " ";" FLAGS_LIST "${CMAKE_C_FLAGS}")

ncd/NCDModule.c

@@ -120,7 +120,7 @@ static void process_dead_job_handler (NCDModuleProcess *o)
     return;
 }
 
-void NCDModuleInst_Init (NCDModuleInst *n, const struct NCDModule *m, NCDModuleInst *method_object, NCDValue *args, BReactor *reactor, BProcessManager *manager, void *user,
+void NCDModuleInst_Init (NCDModuleInst *n, const struct NCDModule *m, NCDModuleInst *method_object, NCDValue *args, BReactor *reactor, BProcessManager *manager, NCDUdevManager *umanager, void *user,
                          NCDModule_handler_event handler_event,
                          NCDModule_handler_getvar handler_getvar,
                          NCDModule_handler_getobj handler_getobj,
@@ -133,6 +133,7 @@ void NCDModuleInst_Init (NCDModuleInst *n, const struct NCDModule *m, NCDModuleI
     n->args = args;
     n->reactor = reactor;
     n->manager = manager;
+    n->umanager = umanager;
     n->user = user;
     n->handler_event = handler_event;
     n->handler_getvar = handler_getvar;

ncd/NCDModule.h

@@ -28,6 +28,7 @@
 #include <system/BPending.h>
 #include <system/BLog.h>
 #include <process/BProcess.h>
+#include <udevmonitor/NCDUdevManager.h>
 #include <ncd/NCDValue.h>
 
 #define NCDMODULE_EVENT_UP 1
@@ -54,6 +55,7 @@ struct NCDModule;
 struct NCDModuleInitParams {
     BReactor *reactor;
     BProcessManager *manager;
+    NCDUdevManager *umanager;
 };
 
 typedef struct NCDModuleInst_s {
@@ -62,6 +64,7 @@ typedef struct NCDModuleInst_s {
     NCDValue *args;
     BReactor *reactor;
     BProcessManager *manager;
+    NCDUdevManager *umanager;
     void *user;
     NCDModule_handler_event handler_event;
     NCDModule_handler_getvar handler_getvar;
@@ -90,7 +93,7 @@ typedef struct NCDModuleProcess_s {
     DebugObject d_obj;
 } NCDModuleProcess;
 
-void NCDModuleInst_Init (NCDModuleInst *n, const struct NCDModule *m, NCDModuleInst *method_object, NCDValue *args, BReactor *reactor, BProcessManager *manager, void *user,
+void NCDModuleInst_Init (NCDModuleInst *n, const struct NCDModule *m, NCDModuleInst *method_object, NCDValue *args, BReactor *reactor, BProcessManager *manager, NCDUdevManager *umanager, void *user,
                          NCDModule_handler_event handler_event,
                          NCDModule_handler_getvar handler_getvar,
                          NCDModule_handler_getobj handler_getobj,

ncd/ncd.c

@@ -40,6 +40,7 @@
 #include <system/BSignal.h>
 #include <system/BSocket.h>
 #include <process/BProcess.h>
+#include <udevmonitor/NCDUdevManager.h>
 #include <ncdconfig/NCDConfigParser.h>
 #include <ncd/NCDModule.h>
 #include <ncd/modules/modules.h>
@@ -127,6 +128,9 @@ int terminating;
 // process manager
 BProcessManager manager;
 
+// udev manager
+NCDUdevManager umanager;
+
 // config AST
 struct NCDConfig_interfaces *config_ast;
 
@@ -242,6 +246,9 @@ int main (int argc, char **argv)
         goto fail1a;
     }
     
+    // init udev manager
+    NCDUdevManager_Init(&umanager, &ss, &manager);
+    
     // setup signal handler
     if (!BSignal_Init(&ss, signal_handler, NULL)) {
         BLog(BLOG_ERROR, "BSignal_Init failed");
@@ -270,6 +277,7 @@ int main (int argc, char **argv)
     struct NCDModuleInitParams params;
     params.reactor = &ss;
     params.manager = &manager;
+    params.umanager = &umanager;
     
     // init modules
     size_t num_inited_modules = 0;
@@ -318,6 +326,9 @@ fail3:
     // remove signal handler
     BSignal_Finish();
 fail2:
+    // free udev manager
+    NCDUdevManager_Free(&umanager);
+    
     // free process manager
     BProcessManager_Free(&manager);
 fail1a:
@@ -1037,7 +1048,7 @@ void process_advance_job_handler (struct process *p)
     
     // initialize module instance
     NCDModuleInst_Init(
-        &ps->inst, module, method_object, &ps->inst_args, &ss, &manager, ps,
+        &ps->inst, module, method_object, &ps->inst_args, &ss, &manager, &umanager, ps,
         (NCDModule_handler_event)process_statement_instance_handler_event,
         (NCDModule_handler_getvar)process_statement_instance_handler_getvar,
         (NCDModule_handler_getobj)process_statement_instance_handler_getobj,