acl-plugin: fix coverity error 188909 in unit-test code

[vpp.git] / src / plugins / acl / acl_test.c

diff --git a/src/plugins/acl/acl_test.c b/src/plugins/acl/acl_test.c
index 572a0e7..ef98f79 100644 (file)
--- a/src/plugins/acl/acl_test.c
+++ b/src/plugins/acl/acl_test.c
@@ -313,7 +313,7 @@ static int api_acl_plugin_get_version (vat_main_t * vam)
 
     vam->result_ready = 0;
     mp = vl_msg_api_alloc_as_if_client(msg_size);
-    memset (mp, 0, msg_size);
+    clib_memset (mp, 0, msg_size);
     mp->_vl_msg_id = ntohs (VL_API_ACL_PLUGIN_GET_VERSION + sm->msg_id_base);
     mp->client_index = vam->my_client_index;
 
@@ -334,7 +334,7 @@ static int api_macip_acl_interface_get (vat_main_t * vam)
 
     vam->result_ready = 0;
     mp = vl_msg_api_alloc_as_if_client(msg_size);
-    memset (mp, 0, msg_size);
+    clib_memset (mp, 0, msg_size);
     mp->_vl_msg_id = ntohs (VL_API_MACIP_ACL_INTERFACE_GET + sm->msg_id_base);
     mp->client_index = vam->my_client_index;
 
@@ -519,7 +519,7 @@ static int api_acl_add_replace (vat_main_t * vam)
     msg_size += n_rules*sizeof(rules[0]);
 
     mp = vl_msg_api_alloc_as_if_client(msg_size);
-    memset (mp, 0, msg_size);
+    clib_memset (mp, 0, msg_size);
     mp->_vl_msg_id = ntohs (VL_API_ACL_ADD_REPLACE + sm->msg_id_base);
     mp->client_index = vam->my_client_index;
     if ((n_rules > 0) && rules)
@@ -573,12 +573,10 @@ api_acl_add_replace_from_file (vat_main_t * vam)
     vl_api_acl_rule_t *rules = 0;
     int rule_idx = -1;
     int n_rules = 0;
-    int n_rules_override = -1;
     int is_permit = 0;
     int append_default_permit = 0;
     u32 tcpflags = 0, tcpmask = 0;
     ip4_address_t src_v4address, dst_v4address;
-    u8 *tag = 0;
     int fd = -1;
 
     char *file_name = NULL;
@@ -654,7 +652,6 @@ api_acl_add_replace_from_file (vat_main_t * vam)
            rules[rule_idx].proto = proto;
 
       }
-    rules[rule_idx].is_permit = is_permit;
 
     if (append_default_permit) {
        rule_idx++;
@@ -690,33 +687,16 @@ api_acl_add_replace_from_file (vat_main_t * vam)
 
     vam->result_ready = 0;
 
-    if(rules)
-      n_rules = vec_len(rules);
-    else
-      n_rules = 0;
-
-    if (n_rules_override >= 0)
-      n_rules = n_rules_override;
+    n_rules = vec_len(rules);
 
     msg_size += n_rules*sizeof(rules[0]);
 
     mp = vl_msg_api_alloc_as_if_client(msg_size);
-    memset (mp, 0, msg_size);
+    clib_memset (mp, 0, msg_size);
     mp->_vl_msg_id = ntohs (VL_API_ACL_ADD_REPLACE + sm->msg_id_base);
     mp->client_index = vam->my_client_index;
-    mp->client_index = 0;
     if (n_rules > 0)
       clib_memcpy(mp->r, rules, n_rules*sizeof (vl_api_acl_rule_t));
-    if (tag)
-      {
-        if (vec_len(tag) >= sizeof(mp->tag))
-          {
-            tag[sizeof(mp->tag)-1] = 0;
-            _vec_len(tag) = sizeof(mp->tag);
-          }
-        clib_memcpy(mp->tag, tag, vec_len(tag));
-        vec_free(tag);
-      }
     mp->acl_index = ntohl(acl_index);
     mp->count = htonl(n_rules);
 
@@ -1276,7 +1256,7 @@ static int api_macip_acl_add (vat_main_t * vam)
     msg_size += n_rules*sizeof(rules[0]);
 
     mp = vl_msg_api_alloc_as_if_client(msg_size);
-    memset (mp, 0, msg_size);
+    clib_memset (mp, 0, msg_size);
     mp->_vl_msg_id = ntohs (VL_API_MACIP_ACL_ADD + sm->msg_id_base);
     mp->client_index = vam->my_client_index;
     if ((n_rules > 0) && rules)
@@ -1428,7 +1408,7 @@ static int api_macip_acl_add_replace (vat_main_t * vam)
     msg_size += n_rules*sizeof(rules[0]);
 
     mp = vl_msg_api_alloc_as_if_client(msg_size);
-    memset (mp, 0, msg_size);
+    clib_memset (mp, 0, msg_size);
     mp->_vl_msg_id = ntohs (VL_API_MACIP_ACL_ADD_REPLACE + sm->msg_id_base);
     mp->client_index = vam->my_client_index;
     if ((n_rules > 0) && rules)