ncd: modules: add parse

blog_channels.txt

@@ -114,3 +114,4 @@ ncd_sys_request_client 4
 ncd_exit 4
 ncd_getargs 4
 ncd_arithmetic 4
+ncd_parse 4

generated/blog_channel_ncd_parse.h

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

generated/blog_channels_defines.h

@@ -114,4 +114,5 @@
 #define BLOG_CHANNEL_ncd_exit 113
 #define BLOG_CHANNEL_ncd_getargs 114
 #define BLOG_CHANNEL_ncd_arithmetic 115
-#define BLOG_NUM_CHANNELS 116
+#define BLOG_CHANNEL_ncd_parse 116
+#define BLOG_NUM_CHANNELS 117

generated/blog_channels_list.h

@@ -114,3 +114,4 @@
 {.name = "ncd_exit", .loglevel = 4},
 {.name = "ncd_getargs", .loglevel = 4},
 {.name = "ncd_arithmetic", .loglevel = 4},
+{.name = "ncd_parse", .loglevel = 4},

ncd/CMakeLists.txt

@@ -106,6 +106,7 @@ add_executable(badvpn-ncd
     modules/exit.c
     modules/getargs.c
     modules/arithmetic.c
+    modules/parse.c
     ${NCD_ADDITIONAL_SOURCES}
 )
 target_link_libraries(badvpn-ncd system flow flowextra dhcpclient arpprobe ncdconfig ncdvalue udevmonitor ncdinterfacemonitor ncdrequest)

ncd/modules/modules.h

@@ -95,6 +95,7 @@ extern const struct NCDModuleGroup ncdmodule_sys_request_client;
 extern const struct NCDModuleGroup ncdmodule_exit;
 extern const struct NCDModuleGroup ncdmodule_getargs;
 extern const struct NCDModuleGroup ncdmodule_arithmetic;
+extern const struct NCDModuleGroup ncdmodule_parse;
 
 static const struct NCDModuleGroup *ncd_modules[] = {
     &ncdmodule_var,
@@ -158,6 +159,7 @@ static const struct NCDModuleGroup *ncd_modules[] = {
     &ncdmodule_exit,
     &ncdmodule_getargs,
     &ncdmodule_arithmetic,
+    &ncdmodule_parse,
     NULL
 };
 

ncd/modules/parse.c

@@ -0,0 +1,227 @@
+/**
+ * @file parse.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
+ * 
+ * Synopsis:
+ *   parse_number(string str)
+ *   parse_value(string str)
+ *   parse_ipv4_addr(string str)
+ *   
+ * Variables:
+ *   succeeded - "true" or "false", reflecting success of the parsing
+ *   (empty) - normalized parsed value (only if succeeded)
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <inttypes.h>
+
+#include <misc/parse_number.h>
+#include <misc/ipaddr.h>
+#include <ncd/NCDValueParser.h>
+#include <ncd/NCDModule.h>
+
+#include <generated/blog_channel_ncd_parse.h>
+
+#define ModuleLog(i, ...) NCDModuleInst_Backend_Log((i), BLOG_CURRENT_CHANNEL, __VA_ARGS__)
+
+struct instance {
+    NCDModuleInst *i;
+    NCDValue value;
+    int succeeded;
+};
+
+typedef int (*parse_func) (NCDModuleInst *i, const char *str, NCDValue *out_value);
+
+static int parse_number (NCDModuleInst *i, const char *str, NCDValue *out_value)
+{
+    uintmax_t n;
+    if (!parse_unsigned_integer(str, &n)) {
+        ModuleLog(i, BLOG_ERROR, "failed to parse number");
+        return 0;
+    }
+    
+    char buf[25];
+    sprintf(buf, "%"PRIuMAX, n);
+    
+    if (!NCDValue_InitString(out_value, buf)) {
+        ModuleLog(i, BLOG_ERROR, "NCDValue_InitString failed");
+        return 0;
+    }
+    
+    return 1;
+}
+
+static int parse_value (NCDModuleInst *i, const char *str, NCDValue *out_value)
+{
+    if (!NCDValueParser_Parse(str, strlen(str), out_value)) {
+        ModuleLog(i, BLOG_ERROR, "failed to parse value");
+        return 0;
+    }
+    
+    return 1;
+}
+
+static int parse_ipv4_addr (NCDModuleInst *i, const char *str, NCDValue *out_value)
+{
+    uint32_t addr;
+    if (!ipaddr_parse_ipv4_addr((char *)str, &addr)) {
+        ModuleLog(i, BLOG_ERROR, "failed to parse ipv4 addresss");
+        return 0;
+    }
+    
+    uint8_t *x = (void *)&addr;
+    
+    char buf[20];
+    sprintf(buf, "%"PRIu8".%"PRIu8".%"PRIu8".%"PRIu8, x[0], x[1], x[2], x[3]);
+    
+    if (!NCDValue_InitString(out_value, buf)) {
+        ModuleLog(i, BLOG_ERROR, "NCDValue_InitString failed");
+        return 0;
+    }
+    
+    return 1;
+}
+
+static void new_templ (NCDModuleInst *i, parse_func pfunc)
+{
+    // allocate structure
+    struct instance *o = malloc(sizeof(*o));
+    if (!o) {
+        ModuleLog(i, BLOG_ERROR, "malloc failed");
+        goto fail0;
+    }
+    o->i = i;
+    NCDModuleInst_Backend_SetUser(i, o);
+    
+    // read arguments
+    NCDValue *str_arg;
+    if (!NCDValue_ListRead(i->args, 1, &str_arg)) {
+        ModuleLog(i, BLOG_ERROR, "wrong arity");
+        goto fail1;
+    }
+    if (NCDValue_Type(str_arg) != NCDVALUE_STRING) {
+        ModuleLog(o->i, BLOG_ERROR, "wrong type");
+        goto fail1;
+    }
+    
+    // parse
+    o->succeeded = pfunc(i, NCDValue_StringValue(str_arg), &o->value);
+    
+    // signal up
+    NCDModuleInst_Backend_Up(i);
+    return;
+    
+fail1:
+    free(o);
+fail0:
+    NCDModuleInst_Backend_SetError(i);
+    NCDModuleInst_Backend_Dead(i);
+}
+
+static void func_die (void *vo)
+{
+    struct instance *o = vo;
+    NCDModuleInst *i = o->i;
+    
+    // free value
+    if (o->succeeded) {
+        NCDValue_Free(&o->value);
+    }
+    
+    // free instance
+    free(o);
+    
+    NCDModuleInst_Backend_Dead(i);
+}
+
+static int func_getvar (void *vo, const char *name, NCDValue *out_value)
+{
+    struct instance *o = vo;
+    
+    if (!strcmp(name, "succeeded")) {
+        const char *str = o->succeeded ? "true" : "false";
+        if (!NCDValue_InitString(out_value, str)) {
+            ModuleLog(o->i, BLOG_ERROR, "NCDValue_InitString failed");
+            return 0;
+        }
+        return 1;
+    }
+    
+    if (o->succeeded && !strcmp(name, "")) {
+        if (!NCDValue_InitCopy(out_value, &o->value)) {
+            ModuleLog(o->i, BLOG_ERROR, "NCDValue_InitCopy failed");
+            return 0;
+        }
+        return 1;
+    }
+    
+    return 0;
+}
+
+static void func_new_parse_number (NCDModuleInst *i)
+{
+    new_templ(i, parse_number);
+}
+
+static void func_new_parse_value (NCDModuleInst *i)
+{
+    new_templ(i, parse_value);
+}
+
+static void func_new_parse_ipv4_addr (NCDModuleInst *i)
+{
+    new_templ(i, parse_ipv4_addr);
+}
+
+static const struct NCDModule modules[] = {
+    {
+        .type = "parse_number",
+        .func_new = func_new_parse_number,
+        .func_die = func_die,
+        .func_getvar = func_getvar
+    }, {
+        .type = "parse_value",
+        .func_new = func_new_parse_value,
+        .func_die = func_die,
+        .func_getvar = func_getvar
+    }, {
+        .type = "parse_ipv4_addr",
+        .func_new = func_new_parse_ipv4_addr,
+        .func_die = func_die,
+        .func_getvar = func_getvar
+    }, {
+        .type = NULL
+    }
+};
+
+const struct NCDModuleGroup ncdmodule_parse = {
+    .modules = modules
+};