zebra: pass ERR_STR_SZ in zebra_vxlan_process_vrf_vni_cmd

Signed-off-by: Mitesh Kanjariya <mitesh@cumulusnetworks.com>

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index ec7e2adcc1fd6d09ac4f5a54d9dfdb7374762848..da9a35a5d58faa8883a85ee350c5c3fe190db139 100644 (file)
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -1913,7 +1913,7 @@ DEFUN (vrf_vni_mapping,
        assert(vrf);
        assert(zvrf);
 
-       ret = zebra_vxlan_process_vrf_vni_cmd(zvrf, vni, err, 1);
+       ret = zebra_vxlan_process_vrf_vni_cmd(zvrf, vni, err, ERR_STR_SZ, 1);
        if (ret != 0) {
                vty_out(vty, "%s\n", err);
                return CMD_WARNING;
@@ -1938,7 +1938,7 @@ DEFUN (no_vrf_vni_mapping,
        assert(vrf);
        assert(zvrf);
 
-       ret = zebra_vxlan_process_vrf_vni_cmd(zvrf, vni, err, 0);
+       ret = zebra_vxlan_process_vrf_vni_cmd(zvrf, vni, err, ERR_STR_SZ, 0);
        if (ret != 0) {
                vty_out(vty, "%s\n", err);
                return CMD_WARNING;

diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index 93a136e9aac629bcdcc6578cc4373314096919f2..1d59148b601e05222dd5fa05aa9502ae99a4aade 100644 (file)
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -6293,7 +6293,8 @@ int zebra_vxlan_if_add(struct interface *ifp)
 }
 
 int zebra_vxlan_process_vrf_vni_cmd(struct zebra_vrf *zvrf,
-                                   vni_t vni, char *err,
+                                   vni_t vni,
+                                   char *err, int err_str_sz,
                                    int add)
 {
        zebra_l3vni_t *zl3vni = NULL;
@@ -6315,7 +6316,7 @@ int zebra_vxlan_process_vrf_vni_cmd(struct zebra_vrf *zvrf,
 
                /* check if the vni is already present under zvrf */
                if (zvrf->l3vni) {
-                       snprintf(err, ERR_STR_SZ,
+                       snprintf(err, err_str_sz,
                                 "VNI is already configured under the vrf");
                        return -1;
                }
@@ -6323,7 +6324,7 @@ int zebra_vxlan_process_vrf_vni_cmd(struct zebra_vrf *zvrf,
                /* check if this VNI is already present in the system */
                zl3vni = zl3vni_lookup(vni);
                if (zl3vni) {
-                       snprintf(err, ERR_STR_SZ,
+                       snprintf(err, err_str_sz,
                                 "VNI is already configured as L3-VNI");
                        return -1;
                }
@@ -6331,7 +6332,7 @@ int zebra_vxlan_process_vrf_vni_cmd(struct zebra_vrf *zvrf,
                /* add the L3-VNI to the global table */
                zl3vni = zl3vni_add(vni, zvrf_id(zvrf));
                if (!zl3vni) {
-                       snprintf(err, ERR_STR_SZ,
+                       snprintf(err, err_str_sz,
                                 "Could not add L3-VNI");
                        return -1;
                }
@@ -6358,7 +6359,7 @@ int zebra_vxlan_process_vrf_vni_cmd(struct zebra_vrf *zvrf,
        } else {
                zl3vni = zl3vni_lookup(vni);
                if (!zl3vni) {
-                       snprintf(err, ERR_STR_SZ, "VNI doesn't exist");
+                       snprintf(err, err_str_sz, "VNI doesn't exist");
                        return -1;
                }
 

diff --git a/zebra/zebra_vxlan.h b/zebra/zebra_vxlan.h
index cfa6c6ce7107aa2f81be3ae4a5b6d172f99f0b86..d2ace241e9b0ee2315832e2ad860e48c85000ff9 100644 (file)
--- a/zebra/zebra_vxlan.h
+++ b/zebra/zebra_vxlan.h
@@ -145,7 +145,7 @@ extern int zebra_vxlan_advertise_all_vni(struct zserv *client,
                                         u_short length,
                                         struct zebra_vrf *zvrf);
 extern int zebra_vxlan_process_vrf_vni_cmd(struct zebra_vrf*, vni_t, char*,
-                                          int);
+                                          int, int);
 extern void zebra_vxlan_init_tables(struct zebra_vrf *zvrf);
 extern void zebra_vxlan_close_tables(struct zebra_vrf *);
 extern void zebra_vxlan_ns_init(struct zebra_ns *zns);