ncd: move some stuff only used by modules and not the interpreter into extra/

examples/ncdinterfacemonitor_test.c

@@ -38,7 +38,7 @@
 #include <system/BTime.h>
 #include <system/BReactor.h>
 #include <system/BSignal.h>
-#include <ncd/NCDInterfaceMonitor.h>
+#include <ncd/extra/NCDInterfaceMonitor.h>
 
 BReactor reactor;
 NCDInterfaceMonitor monitor;

ncd-request/ncd-request.c

@@ -40,7 +40,7 @@
 #include <system/BAddr.h>
 #include <ncd/NCDValParser.h>
 #include <ncd/NCDValGenerator.h>
-#include <ncd/NCDRequestClient.h>
+#include <ncd/extra/NCDRequestClient.h>
 
 #include <generated/blog_channel_ncd_request.h>
 

ncd/CMakeLists.txt

@@ -6,7 +6,7 @@ set(NCD_ADDITIONAL_LIBS)
 if (NOT EMSCRIPTEN)
     if (BADVPN_USE_LINUX_RFKILL)
         list(APPEND NCD_ADDITIONAL_SOURCES
-            NCDRfkillMonitor.c
+            extra/NCDRfkillMonitor.c
             modules/net_backend_rfkill.c
         )
     endif ()
@@ -24,12 +24,12 @@ if (NOT EMSCRIPTEN)
     endif ()
 
     add_library(ncdinterfacemonitor
-        NCDInterfaceMonitor.c
+        extra/NCDInterfaceMonitor.c
     )
     target_link_libraries(ncdinterfacemonitor base system)
     
     add_library(ncdrequest
-        NCDRequestClient.c
+        extra/NCDRequestClient.c
     )
     target_link_libraries(ncdrequest base system ncdvalgenerator ncdvalparser)
 
@@ -126,7 +126,7 @@ add_library(ncdinterpreter
     NCDInterpProg.c
     NCDPlaceholderDb.c
     NCDMethodIndex.c
-    BEventLock.c
+    extra/BEventLock.c
     modules/var.c
     modules/list.c
     modules/depend.c

ncd/NCDInterfaceMonitor.c → ncd/extra/NCDInterfaceMonitor.c

@@ -43,7 +43,7 @@
 #include <misc/nonblocking.h>
 #include <base/BLog.h>
 
-#include <ncd/NCDInterfaceMonitor.h>
+#include <ncd/extra/NCDInterfaceMonitor.h>
 
 #include <generated/blog_channel_NCDInterfaceMonitor.h>
 

ncd/NCDRfkillMonitor.c → ncd/extra/NCDRfkillMonitor.c

@@ -36,7 +36,7 @@
 #include <misc/nonblocking.h>
 #include <base/BLog.h>
 
-#include <ncd/NCDRfkillMonitor.h>
+#include "NCDRfkillMonitor.h"
 
 #include <generated/blog_channel_NCDRfkillMonitor.h>
 

ncd/address_utils.h → ncd/extra/address_utils.h

@@ -40,7 +40,7 @@
 #include <system/BAddr.h>
 #include <system/BConnectionGeneric.h>
 #include <ncd/NCDVal.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 static int ncd_read_baddr (NCDValRef val, BAddr *out) WARN_UNUSED;
 static NCDValRef ncd_make_baddr (BAddr addr, NCDValMem *mem);

ncd/modules/arithmetic.c

@@ -72,7 +72,7 @@
 #include <misc/parse_number.h>
 #include <ncd/NCDModule.h>
 #include <ncd/static_strings.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <generated/blog_channel_ncd_arithmetic.h>
 

ncd/modules/call.c

@@ -69,7 +69,7 @@
 #include <misc/offset.h>
 #include <structure/LinkedList0.h>
 #include <ncd/NCDModule.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <generated/blog_channel_ncd_call.h>
 

ncd/modules/call2.c

@@ -45,7 +45,7 @@
 #include <misc/offset.h>
 #include <ncd/NCDModule.h>
 #include <ncd/static_strings.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <generated/blog_channel_ncd_call2.h>
 

ncd/modules/command_template.h

@@ -36,8 +36,8 @@
 #define BADVPN_NCD_MODULES_COMMAND_TEMPLATE_H
 
 #include <misc/cmdline.h>
-#include <ncd/BEventLock.h>
 #include <ncd/NCDModule.h>
+#include <ncd/extra/BEventLock.h>
 
 typedef int (*command_template_build_cmdline) (NCDModuleInst *i, NCDValRef args, int remove, char **exec, CmdLine *cl);
 typedef void (*command_template_free_func) (void *user, int is_error);

ncd/modules/daemon.c

@@ -49,7 +49,7 @@
 #include <misc/strdup.h>
 #include <system/BProcess.h>
 #include <ncd/NCDModule.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <generated/blog_channel_ncd_daemon.h>
 

ncd/modules/exit.c

@@ -40,7 +40,7 @@
 #include <limits.h>
 
 #include <ncd/NCDModule.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <generated/blog_channel_ncd_exit.h>
 

ncd/modules/explode.c

@@ -53,7 +53,7 @@
 #include <misc/balloc.h>
 #include <ncd/NCDModule.h>
 #include <ncd/static_strings.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <generated/blog_channel_ncd_explode.h>
 

ncd/modules/file_open.c

@@ -103,7 +103,7 @@
 #include <misc/parse_number.h>
 #include <ncd/NCDModule.h>
 #include <ncd/static_strings.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <generated/blog_channel_ncd_file_open.h>
 

ncd/modules/foreach.c

@@ -75,7 +75,7 @@
 #include <system/BReactor.h>
 #include <ncd/NCDModule.h>
 #include <ncd/static_strings.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <generated/blog_channel_ncd_foreach.h>
 

ncd/modules/imperative.c

@@ -55,7 +55,7 @@
 #include <misc/string_begins_with.h>
 #include <misc/offset.h>
 #include <ncd/NCDModule.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <generated/blog_channel_ncd_imperative.h>
 

ncd/modules/index.c

@@ -48,7 +48,7 @@
 #include <stddef.h>
 
 #include <ncd/NCDModule.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <generated/blog_channel_ncd_index.h>
 

ncd/modules/list.c

@@ -96,7 +96,7 @@
 #include <misc/parse_number.h>
 #include <structure/IndexedList.h>
 #include <ncd/NCDModule.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <generated/blog_channel_ncd_list.h>
 

ncd/modules/net_backend_rfkill.c

@@ -50,7 +50,7 @@
 
 #include <misc/string_begins_with.h>
 #include <ncd/NCDModule.h>
-#include <ncd/NCDRfkillMonitor.h>
+#include <ncd/extra/NCDRfkillMonitor.h>
 
 #include <generated/blog_channel_ncd_net_backend_rfkill.h>
 

ncd/modules/net_backend_waitlink.c

@@ -39,7 +39,7 @@
 #include <misc/get_iface_info.h>
 #include <ncd/NCDModule.h>
 #include <ncd/NCDIfConfig.h>
-#include <ncd/NCDInterfaceMonitor.h>
+#include <ncd/extra/NCDInterfaceMonitor.h>
 
 #include <generated/blog_channel_ncd_net_backend_waitlink.h>
 

ncd/modules/net_dns.c

@@ -44,7 +44,7 @@
 #include <structure/LinkedList1.h>
 #include <ncd/NCDModule.h>
 #include <ncd/NCDIfConfig.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <generated/blog_channel_ncd_net_dns.h>
 

ncd/modules/net_iptables.c

@@ -98,7 +98,7 @@
 
 #include <misc/debug.h>
 #include <misc/find_program.h>
-#include <ncd/BEventLock.h>
+#include <ncd/extra/BEventLock.h>
 
 #include <ncd/modules/command_template.h>
 

ncd/modules/net_ipv4_route.c

@@ -49,7 +49,7 @@
 #include <misc/debug.h>
 #include <ncd/NCDModule.h>
 #include <ncd/NCDIfConfig.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <generated/blog_channel_ncd_net_ipv4_route.h>
 

ncd/modules/net_ipv6_route.c

@@ -51,7 +51,7 @@
 #include <misc/debug.h>
 #include <ncd/NCDModule.h>
 #include <ncd/NCDIfConfig.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <generated/blog_channel_ncd_net_ipv6_route.h>
 

ncd/modules/net_ipv6_wait_dynamic_addr.c

@@ -50,7 +50,7 @@
 #include <misc/get_iface_info.h>
 #include <misc/ipaddr6.h>
 #include <ncd/NCDModule.h>
-#include <ncd/NCDInterfaceMonitor.h>
+#include <ncd/extra/NCDInterfaceMonitor.h>
 
 #include <generated/blog_channel_ncd_net_ipv6_wait_dynamic_addr.h>
 

ncd/modules/parse.c

@@ -59,7 +59,7 @@
 #include <ncd/NCDValParser.h>
 #include <ncd/NCDModule.h>
 #include <ncd/static_strings.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <generated/blog_channel_ncd_parse.h>
 

ncd/modules/process_manager.c

@@ -54,7 +54,7 @@
 #include <misc/strdup.h>
 #include <structure/LinkedList1.h>
 #include <ncd/NCDModule.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <generated/blog_channel_ncd_process_manager.h>
 

ncd/modules/run.c

@@ -44,7 +44,7 @@
 #include <string.h>
 
 #include <misc/strdup.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 #include <ncd/modules/command_template.h>
 
 #include <generated/blog_channel_ncd_run.h>

ncd/modules/runonce.c

@@ -56,7 +56,7 @@
 #include <misc/strdup.h>
 #include <system/BProcess.h>
 #include <ncd/NCDModule.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <generated/blog_channel_ncd_runonce.h>
 

ncd/modules/sleep.c

@@ -41,7 +41,7 @@
 #include <limits.h>
 
 #include <ncd/NCDModule.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <generated/blog_channel_ncd_sleep.h>
 

ncd/modules/socket.c

@@ -133,8 +133,8 @@
 #include <system/BConnection.h>
 #include <system/BConnectionGeneric.h>
 #include <ncd/NCDModule.h>
-#include <ncd/value_utils.h>
-#include <ncd/address_utils.h>
+#include <ncd/extra/value_utils.h>
+#include <ncd/extra/address_utils.h>
 
 #include <generated/blog_channel_ncd_socket.h>
 

ncd/modules/sys_evdev.c

@@ -58,7 +58,7 @@
 
 #include <misc/nonblocking.h>
 #include <misc/debug.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <ncd/NCDModule.h>
 

ncd/modules/sys_request_client.c

@@ -88,9 +88,9 @@
 #include <structure/LinkedList0.h>
 #include <structure/LinkedList1.h>
 #include <ncd/NCDModule.h>
-#include <ncd/NCDRequestClient.h>
-#include <ncd/value_utils.h>
-#include <ncd/address_utils.h>
+#include <ncd/extra/NCDRequestClient.h>
+#include <ncd/extra/value_utils.h>
+#include <ncd/extra/address_utils.h>
 
 #include <generated/blog_channel_ncd_sys_request_client.h>
 

ncd/modules/sys_request_server.c

@@ -85,8 +85,8 @@
 #include <ncd/NCDValParser.h>
 #include <ncd/NCDValGenerator.h>
 #include <ncd/NCDModule.h>
-#include <ncd/value_utils.h>
-#include <ncd/address_utils.h>
+#include <ncd/extra/value_utils.h>
+#include <ncd/extra/address_utils.h>
 
 #include <generated/blog_channel_ncd_sys_request_server.h>
 

ncd/modules/timer.c

@@ -41,7 +41,7 @@
 
 #include <misc/debug.h>
 #include <ncd/NCDModule.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <generated/blog_channel_ncd_timer.h>
 

ncd/modules/value.c

@@ -162,7 +162,7 @@
 #include <ncd/NCDModule.h>
 #include <ncd/NCDStringIndex.h>
 #include <ncd/static_strings.h>
-#include <ncd/value_utils.h>
+#include <ncd/extra/value_utils.h>
 
 #include <generated/blog_channel_ncd_value.h>