Add support for igmp and multicast

[samplevnf.git] / VNFs / DPPD-PROX / prox_args.c

diff --git a/VNFs/DPPD-PROX/prox_args.c b/VNFs/DPPD-PROX/prox_args.c
index d77eab1..df69f97 100644 (file)
--- a/VNFs/DPPD-PROX/prox_args.c
+++ b/VNFs/DPPD-PROX/prox_args.c
@@ -242,7 +242,7 @@ const char *get_cfg_dir(void)
        while (end > 0 && cfg_file[end] != '/')
                end--;
 
-       strncpy(dir, cfg_file, end);
+       prox_strncpy(dir, cfg_file, end);
        return dir;
 }
 
@@ -263,7 +263,7 @@ static int get_lua_cfg(__attribute__((unused)) unsigned sindex, __attribute__((u
        struct lua_State *l = prox_lua();
 
        char str_cpy[1024];
-       strncpy(str_cpy, str, sizeof(str_cpy));
+       prox_strncpy(str_cpy, str, sizeof(str_cpy));
        uint32_t len = strlen(str_cpy);
        str_cpy[len++] = '\n';
        str_cpy[len++] = 0;
@@ -338,6 +338,9 @@ static int get_global_cfg(__attribute__((unused))unsigned sindex, char *str, voi
        if (STR_EQ(str, "enable bypass")) {
                return parse_flag(&pset->flags, DSF_ENABLE_BYPASS, pkey);
        }
+       if (STR_EQ(str, "heartbeat timeout")) {
+               return parse_int(&pset->heartbeat_timeout, pkey);
+       }
 
        if (STR_EQ(str, "cpe table map")) {
                /* The config defined ports through 0, 1, 2 ... which
@@ -514,7 +517,7 @@ static int get_port_cfg(unsigned sindex, char *str, void *data)
        }
        else if (STR_EQ(str, "name")) {
                uint32_t val;
-               strncpy(cfg->name, pkey, MAX_NAME_SIZE);
+               prox_strncpy(cfg->name, pkey, MAX_NAME_SIZE);
                PROX_ASSERT(cur_if < PROX_MAX_PORTS);
                return add_port_name(cur_if, pkey);
        }
@@ -531,6 +534,17 @@ static int get_port_cfg(unsigned sindex, char *str, void *data)
                }
                cfg->promiscuous = val;
        }
+       else if (STR_EQ(str, "multicast")) {
+               uint32_t val;
+               if (cfg->nb_mc_addr >= NB_MCAST_ADDR) {
+                       plog_err("too many multicast addresses\n");
+                       return -1;
+               }
+               if (parse_mac(&cfg->mc_addr[cfg->nb_mc_addr], pkey)) {
+                       return -1;
+               }
+               cfg->nb_mc_addr++ ;
+       }
        else if (STR_EQ(str, "lsc")) {
                cfg->lsc_set_explicitely = 1;
                uint32_t val;
@@ -853,9 +867,6 @@ static int get_core_cfg(unsigned sindex, char *str, void *data)
        if (STR_EQ(str, "fast path handle arp")) {
                return parse_flag(&targ->runtime_flags, TASK_FP_HANDLE_ARP, pkey);
        }
-       if (STR_EQ(str, "multiple arp")) {
-               return parse_flag(&targ->flags, TASK_MULTIPLE_MAC, pkey);
-       }
 
        /* Using tx port name, only a _single_ port can be assigned to a task. */
        if (STR_EQ(str, "tx port")) {
@@ -1262,6 +1273,9 @@ static int get_core_cfg(unsigned sindex, char *str, void *data)
                return parse_int(&targ->byte_offset, pkey);
        }
 
+       if (STR_EQ(str, "realtime scheduling")) {
+               return parse_flag(&lconf->flags, LCONF_FLAG_SCHED_RR, pkey);
+       }
        if (STR_EQ(str, "name")) {
                return parse_str(lconf->name, pkey, sizeof(lconf->name));
        }
@@ -1350,7 +1364,12 @@ static int get_core_cfg(unsigned sindex, char *str, void *data)
                targ->flags |= TASK_ARG_SRC_MAC_SET;
                return 0;
        }
+       if (STR_EQ(str, "igmp ipv4")) { /* IGMP Group */
+               return parse_ip(&targ->igmp_address, pkey);
+       }
        if (STR_EQ(str, "gateway ipv4")) { /* Gateway IP address used when generating */
+               if ((targ->flags & TASK_ARG_L3) == 0)
+                       plog_warn("gateway ipv4 configured but L3 sub mode not enabled\n");
                return parse_ip(&targ->gateway_ipv4, pkey);
        }
        if (STR_EQ(str, "local ipv4")) { /* source IP address to be used for packets */
@@ -1627,14 +1646,14 @@ int prox_parse_args(int argc, char **argv)
                                }
                        }
 
-                       strncpy(prox_cfg.name, cfg_file + offset, MAX_NAME_SIZE);
+                       prox_strncpy(prox_cfg.name, cfg_file + offset, MAX_NAME_SIZE);
                        break;
                case 'v':
                        plog_set_lvl(atoi(optarg));
                        break;
                case 'l':
                        prox_cfg.log_name_pid = 0;
-                       strncpy(prox_cfg.log_name, optarg, MAX_NAME_SIZE);
+                       prox_strncpy(prox_cfg.log_name, optarg, MAX_NAME_SIZE);
                        break;
                case 'p':
                        prox_cfg.log_name_pid = 1;
@@ -1656,7 +1675,7 @@ int prox_parse_args(int argc, char **argv)
                case 'r':
                        if (!str_is_number(optarg) || strlen(optarg) > 11)
                                return -1;
-                       strncpy(prox_cfg.update_interval_str, optarg, sizeof(prox_cfg.update_interval_str));
+                       prox_strncpy(prox_cfg.update_interval_str, optarg, sizeof(prox_cfg.update_interval_str));
                        break;
                case 'o':
                        if (prox_cfg.flags & DSF_DAEMON)
@@ -1721,7 +1740,7 @@ int prox_parse_args(int argc, char **argv)
                            (tmp2 = strchr(tmp, '='))) {
                                *tmp2 = 0;
                                tmp3[0] = '$';
-                               strncpy(tmp3 + 1, tmp, 63);
+                               prox_strncpy(tmp3 + 1, tmp, 63);
                                plog_info("\tAdding variable: %s = %s\n", tmp3, tmp2 + 1);
                                ret = add_var(tmp3, tmp2 + 1, 1);
                                if (ret == -2) {