-O3 warnings be gone

[vpp.git] / vnet / vnet / vcgn / vcgn_classify.c

diff --git a/vnet/vnet/vcgn/vcgn_classify.c b/vnet/vnet/vcgn/vcgn_classify.c
index 518f910..8db229e 100644 (file)
--- a/vnet/vnet/vcgn/vcgn_classify.c
+++ b/vnet/vnet/vcgn/vcgn_classify.c
@@ -397,7 +397,9 @@ clib_error_t *vcgn_classify_init (vlib_main_t *vm)
   mp->inside_sw_if_index = 1;
   mp->outside_sw_if_index = 0;
 
+#if DPDK==1
   dpdk_set_next_node (DPDK_RX_NEXT_IP4_INPUT, "vcgn-classify");
+#endif
 
   {
     pg_node_t * pn;
@@ -797,11 +799,6 @@ static inline u16 nfv9_get_max_length_minus_max_record_size(u16 path_mtu)
             * requires max number of bytes. If you add more records,
             * this needs to be re-checked */
         if (max_length_minus_max_record_size < CNAT_NFV9_MIN_RECORD_SIZE) {
-            printf(
-               "Resetting max_length_minus_max_record_size from %d to %ld\n",
-               max_length_minus_max_record_size,
-               CNAT_NFV9_MIN_RECORD_SIZE);
-
             max_length_minus_max_record_size = CNAT_NFV9_MIN_RECORD_SIZE;
         }
    return max_length_minus_max_record_size;
@@ -942,11 +939,10 @@ set_vcgn_nfv9_logging_cofig_command_fn (vlib_main_t * vm,
 /* vcgn changes start*/
     cnat_nfv9_logging_info_t *my_nfv9_logging_info = NULL;
     cnat_nfv9_logging_info_t *my_nfv9_logging_info_tmp = NULL;
-    cnat_vrfmap_t *my_vrfmap = 0, *my_vrfmap_temp; 
+    cnat_vrfmap_t *my_vrfmap = 0, *my_vrfmap_temp = 0; 
     u16           i_vrf;
     u32           i_vrf_id;
     u8            found;
-    u8            found_vrf;
     /*
      * Init NFv9 logging info as needed, this will be done only once
      */
@@ -981,6 +977,9 @@ set_vcgn_nfv9_logging_cofig_command_fn (vlib_main_t * vm,
                     ip_addr, port, refresh_rate, 
                     timeout, pmtu, enable);
     #endif
+    if (refresh_rate == 0) refresh_rate = 500; /* num of pkts */
+    if (timeout == 0) timeout = 30;  /* in mins */
+
     nfv9_conf.enable = enable;
     nfv9_conf.ipv4_address = ip_addr;
     nfv9_conf.i_vrf_id = vcm->inside_sw_if_index;
@@ -1007,16 +1006,11 @@ set_vcgn_nfv9_logging_cofig_command_fn (vlib_main_t * vm,
         /* Do we already have a map for this VRF? */
         pool_foreach (my_nfv9_logging_info, cnat_nfv9_logging_info_pool, ({
               if (my_nfv9_logging_info->i_vrf_id == i_vrf_id) {
-                  found_vrf = 1;
-                  printf("found_vrf %d\n", found_vrf);
                   nfv9_server_info_t *server =  nfv9_server_info_pool +
                       my_nfv9_logging_info->server_index;
-                  printf("server ip4 0x%x port %d\n", server->ipv4_address, server->port);
-                  printf("nfv9_conf v4 0x%x port %d\n", nfv9_conf.ipv4_address, nfv9_conf.port);
                   if((server->ipv4_address ==  (nfv9_conf.ipv4_address)) && (server->port == (nfv9_conf.port))) {
                       found = 1;
                       my_nfv9_logging_info_tmp = my_nfv9_logging_info;
-                      printf("found %d\n", found);
                       break;
                   }
               }
@@ -1278,7 +1272,6 @@ set_vcgn_nfv9_logging_cofig_command_fn (vlib_main_t * vm,
                 }
                 my_vrfmap->nf_logging_policy = nfv9_logging_policy;
             }
-        printf("After deleting the netflow server,Netflow logging policy = %d\n", my_vrfmap->nf_logging_policy);
     }
 
 done: