ncd: modules: add net.ipv6.addr()

blog_channels.txt

@@ -125,3 +125,4 @@ ncd_reboot 4
 ncd_explode 4
 NCDPlaceholderDb 4
 NCDVal 4
+ncd_net_ipv6_addr 4

generated/blog_channel_ncd_net_ipv6_addr.h

@@ -0,0 +1,4 @@
+#ifdef BLOG_CURRENT_CHANNEL
+#undef BLOG_CURRENT_CHANNEL
+#endif
+#define BLOG_CURRENT_CHANNEL BLOG_CHANNEL_ncd_net_ipv6_addr

generated/blog_channels_defines.h

@@ -125,4 +125,5 @@
 #define BLOG_CHANNEL_ncd_explode 124
 #define BLOG_CHANNEL_NCDPlaceholderDb 125
 #define BLOG_CHANNEL_NCDVal 126
-#define BLOG_NUM_CHANNELS 127
+#define BLOG_CHANNEL_ncd_net_ipv6_addr 127
+#define BLOG_NUM_CHANNELS 128

generated/blog_channels_list.h

@@ -125,3 +125,4 @@
 {"ncd_explode", 4},
 {"NCDPlaceholderDb", 4},
 {"NCDVal", 4},
+{"ncd_net_ipv6_addr", 4},

ncd/CMakeLists.txt

@@ -149,6 +149,7 @@ add_executable(badvpn-ncd
     modules/assert.c
     modules/reboot.c
     modules/explode.c
+    modules/net_ipv6_addr.c
     ${NCD_ADDITIONAL_SOURCES}
 )
 target_link_libraries(badvpn-ncd system flow flowextra dhcpclient arpprobe ncdvalue ncdval ncdvalcompat ncdvaluegenerator ncdvalueparser ncdconfigparser ncdsugar udevmonitor ncdinterfacemonitor ncdrequest)

ncd/modules/modules.h

@@ -104,6 +104,7 @@ extern const struct NCDModuleGroup ncdmodule_call2;
 extern const struct NCDModuleGroup ncdmodule_assert;
 extern const struct NCDModuleGroup ncdmodule_reboot;
 extern const struct NCDModuleGroup ncdmodule_explode;
+extern const struct NCDModuleGroup ncdmodule_net_ipv6_addr;
 
 static const struct NCDModuleGroup *ncd_modules[] = {
     &ncdmodule_var,
@@ -176,6 +177,7 @@ static const struct NCDModuleGroup *ncd_modules[] = {
     &ncdmodule_assert,
     &ncdmodule_reboot,
     &ncdmodule_explode,
+    &ncdmodule_net_ipv6_addr,
     NULL
 };
 

ncd/modules/net_ipv6_addr.c

@@ -0,0 +1,140 @@
+/**
+ * @file net_ipv6_addr.c
+ * @author Ambroz Bizjak <ambrop7@gmail.com>
+ * 
+ * @section LICENSE
+ * 
+ * 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.
+ * 3. Neither the name of the author nor the
+ *    names of its contributors may be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ * 
+ * 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 AUTHOR 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.
+ * 
+ * @section DESCRIPTION
+ * 
+ * IPv6 address module.
+ * 
+ * Synopsis:
+ *     net.ipv6.addr(string ifname, string addr, string prefix)
+ *     net.ipv6.addr(string ifname, string cidr_addr)
+ * 
+ * Description:
+ *     Adds the given address to the given network interface on initialization,
+ *     and removes it on deinitialization. The second form takes the address and
+ *     prefix in CIDR notation (a.b.c.d/n).
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <ncd/NCDModule.h>
+#include <ncd/NCDIfConfig.h>
+
+#include <generated/blog_channel_ncd_net_ipv6_addr.h>
+
+#define ModuleLog(i, ...) NCDModuleInst_Backend_Log((i), BLOG_CURRENT_CHANNEL, __VA_ARGS__)
+
+struct instance {
+    NCDModuleInst *i;
+    const char *ifname;
+    struct ipv6_ifaddr ifaddr;
+};
+
+static void func_new (void *vo, NCDModuleInst *i)
+{
+    struct instance *o = vo;
+    o->i = i;
+    
+    // read arguments
+    NCDValRef ifname_arg;
+    NCDValRef addr_arg;
+    NCDValRef prefix_arg = NCDVal_NewInvalid();
+    if (!NCDVal_ListRead(i->args, 2, &ifname_arg, &addr_arg) &&
+        !NCDVal_ListRead(i->args, 3, &ifname_arg, &addr_arg, &prefix_arg)
+    ) {
+        ModuleLog(o->i, BLOG_ERROR, "wrong arity");
+        goto fail0;
+    }
+    if (!NCDVal_IsStringNoNulls(ifname_arg) || !NCDVal_IsStringNoNulls(addr_arg) ||
+        (!NCDVal_IsInvalid(prefix_arg) && !NCDVal_IsStringNoNulls(prefix_arg))
+    ) {
+        ModuleLog(o->i, BLOG_ERROR, "wrong type");
+        goto fail0;
+    }
+    
+    o->ifname = NCDVal_StringValue(ifname_arg);
+    
+    if (NCDVal_IsInvalid(prefix_arg)) {
+        if (!ipaddr6_parse_ipv6_ifaddr(NCDVal_StringValue(addr_arg), &o->ifaddr)) {
+            ModuleLog(o->i, BLOG_ERROR, "wrong CIDR notation address");
+            goto fail0;
+        }
+    } else {
+        if (!ipaddr6_parse_ipv6_addr(NCDVal_StringValue(addr_arg), &o->ifaddr.addr)) {
+            ModuleLog(o->i, BLOG_ERROR, "wrong address");
+            goto fail0;
+        }
+        
+        if (!ipaddr6_parse_ipv6_prefix(NCDVal_StringValue(prefix_arg), &o->ifaddr.prefix)) {
+            ModuleLog(o->i, BLOG_ERROR, "wrong prefix");
+            goto fail0;
+        }
+    }
+    
+    // add address
+    if (!NCDIfConfig_add_ipv6_addr(o->ifname, o->ifaddr)) {
+        ModuleLog(o->i, BLOG_ERROR, "failed to add IP address");
+        goto fail0;
+    }
+    
+    // signal up
+    NCDModuleInst_Backend_Up(o->i);
+    return;
+    
+fail0:
+    NCDModuleInst_Backend_SetError(i);
+    NCDModuleInst_Backend_Dead(i);
+}
+
+static void func_die (void *vo)
+{
+    struct instance *o = vo;
+    
+    // remove address
+    if (!NCDIfConfig_remove_ipv6_addr(o->ifname, o->ifaddr)) {
+        ModuleLog(o->i, BLOG_ERROR, "failed to remove IP address");
+    }
+    
+    NCDModuleInst_Backend_Dead(o->i);
+}
+
+static const struct NCDModule modules[] = {
+    {
+        .type = "net.ipv6.addr",
+        .func_new2 = func_new,
+        .func_die = func_die,
+        .alloc_size = sizeof(struct instance)
+    }, {
+        .type = NULL
+    }
+};
+
+const struct NCDModuleGroup ncdmodule_net_ipv6_addr = {
+    .modules = modules
+};