Revert "nat: static mappings in flow hash"

[vpp.git] / src / plugins / nat / nat44-ed / nat44_ed_cli.c

diff --git a/src/plugins/nat/nat44-ed/nat44_ed_cli.c b/src/plugins/nat/nat44-ed/nat44_ed_cli.c
index 5ab14a6..413c795 100644 (file)
--- a/src/plugins/nat/nat44-ed/nat44_ed_cli.c
+++ b/src/plugins/nat/nat44-ed/nat44_ed_cli.c
@@ -283,7 +283,12 @@ nat44_show_hash_command_fn (vlib_main_t * vm, unformat_input_t * input,
   else if (unformat (input, "verbose"))
     verbose = 2;
 
-  vlib_cli_output (vm, "%U", format_bihash_16_8, &sm->flow_hash, verbose);
+  vlib_cli_output (vm, "%U", format_bihash_8_8, &sm->static_mapping_by_local,
+                  verbose);
+  vlib_cli_output (vm, "%U",
+                  format_bihash_8_8, &sm->static_mapping_by_external,
+                  verbose);
+      vlib_cli_output (vm, "%U", format_bihash_16_8, &sm->flow_hash, verbose);
   vec_foreach_index (i, sm->per_thread_data)
   {
     vlib_cli_output (vm, "-------- thread %d %s --------\n",
@@ -291,7 +296,8 @@ nat44_show_hash_command_fn (vlib_main_t * vm, unformat_input_t * input,
     vlib_cli_output (vm, "%U", format_bihash_16_8, &sm->flow_hash, verbose);
   }
 
-  vlib_cli_output (vm, "%U", format_bihash_16_8, &nam->affinity_hash, verbose);
+      vlib_cli_output (vm, "%U", format_bihash_16_8, &nam->affinity_hash,
+                      verbose);
 
   vlib_cli_output (vm, "-------- hash table parameters --------\n");
   vlib_cli_output (vm, "translation buckets: %u", sm->translation_buckets);
@@ -496,7 +502,6 @@ nat44_show_summary_command_fn (vlib_main_t * vm, unformat_input_t * input,
   u32 udp_sessions = 0;
   u32 tcp_sessions = 0;
   u32 icmp_sessions = 0;
-  u32 other_sessions = 0;
 
   u32 timed_out = 0;
   u32 transitory = 0;
@@ -521,42 +526,40 @@ nat44_show_summary_command_fn (vlib_main_t * vm, unformat_input_t * input,
             if (now >= sess_timeout_time)
               timed_out++;
 
-           switch (s->proto)
-             {
-             case IP_PROTOCOL_ICMP:
-               icmp_sessions++;
-               break;
-             case IP_PROTOCOL_TCP:
-               tcp_sessions++;
-               if (s->state)
-                 {
-                   if (s->tcp_closed_timestamp)
-                     {
-                       if (now >= s->tcp_closed_timestamp)
-                         {
-                           ++transitory_closed;
-                         }
-                       else
-                         {
-                           ++transitory_wait_closed;
-                         }
-                     }
-                   transitory++;
-                 }
-               else
-                 established++;
-               break;
-             case IP_PROTOCOL_UDP:
-               udp_sessions++;
-               break;
-             default:
-               ++other_sessions;
-               break;
-             }
-          }
-         nat44_show_lru_summary (vm, tsm, now, sess_timeout_time);
-         count += pool_elts (tsm->sessions);
-       }
+            switch (s->nat_proto)
+              {
+              case NAT_PROTOCOL_ICMP:
+                icmp_sessions++;
+                break;
+              case NAT_PROTOCOL_TCP:
+                tcp_sessions++;
+                if (s->state)
+                  {
+                    if (s->tcp_closed_timestamp)
+                      {
+                        if (now >= s->tcp_closed_timestamp)
+                          {
+                            ++transitory_closed;
+                          }
+                        else
+                          {
+                            ++transitory_wait_closed;
+                          }
+                      }
+                    transitory++;
+                  }
+                else
+                  established++;
+                break;
+              case NAT_PROTOCOL_UDP:
+              default:
+                udp_sessions++;
+                break;
+              }
+          }
+          nat44_show_lru_summary (vm, tsm, now, sess_timeout_time);
+          count += pool_elts (tsm->sessions);
+        }
     }
   else
     {
@@ -568,38 +571,36 @@ nat44_show_summary_command_fn (vlib_main_t * vm, unformat_input_t * input,
         if (now >= sess_timeout_time)
           timed_out++;
 
-       switch (s->proto)
-         {
-         case IP_PROTOCOL_ICMP:
-           icmp_sessions++;
-           break;
-         case IP_PROTOCOL_TCP:
-           tcp_sessions++;
-           if (s->state)
-             {
-               if (s->tcp_closed_timestamp)
-                 {
-                   if (now >= s->tcp_closed_timestamp)
-                     {
-                       ++transitory_closed;
-                     }
-                   else
-                     {
-                       ++transitory_wait_closed;
-                     }
-                 }
-               transitory++;
-             }
-           else
-             established++;
-           break;
-         case IP_PROTOCOL_UDP:
-           udp_sessions++;
-           break;
-         default:
-           ++other_sessions;
-           break;
-         }
+        switch (s->nat_proto)
+          {
+          case NAT_PROTOCOL_ICMP:
+            icmp_sessions++;
+            break;
+          case NAT_PROTOCOL_TCP:
+            tcp_sessions++;
+            if (s->state)
+              {
+                if (s->tcp_closed_timestamp)
+                  {
+                    if (now >= s->tcp_closed_timestamp)
+                      {
+                        ++transitory_closed;
+                      }
+                    else
+                      {
+                        ++transitory_wait_closed;
+                      }
+                  }
+                transitory++;
+              }
+            else
+              established++;
+            break;
+          case NAT_PROTOCOL_UDP:
+          default:
+            udp_sessions++;
+            break;
+          }
       }
       nat44_show_lru_summary (vm, tsm, now, sess_timeout_time);
       count = pool_elts (tsm->sessions);
@@ -616,7 +617,6 @@ nat44_show_summary_command_fn (vlib_main_t * vm, unformat_input_t * input,
                   transitory_closed);
   vlib_cli_output (vm, "total udp sessions: %u", udp_sessions);
   vlib_cli_output (vm, "total icmp sessions: %u", icmp_sessions);
-  vlib_cli_output (vm, "total other sessions: %u", other_sessions);
   return 0;
 }
 
@@ -636,6 +636,10 @@ nat44_show_addresses_command_fn (vlib_main_t * vm, unformat_input_t * input,
             fib_table_get(ap->fib_index, FIB_PROTOCOL_IP4)->ft_table_id);
       else
         vlib_cli_output (vm, "  tenant VRF independent");
+    #define _(N, i, n, s) \
+      vlib_cli_output (vm, "  %d busy %s ports", ap->busy_##n##_ports, s);
+      foreach_nat_protocol
+    #undef _
     }
   vlib_cli_output (vm, "NAT44 twice-nat pool addresses:");
   vec_foreach (ap, sm->twice_nat_addresses)
@@ -646,6 +650,10 @@ nat44_show_addresses_command_fn (vlib_main_t * vm, unformat_input_t * input,
             fib_table_get(ap->fib_index, FIB_PROTOCOL_IP4)->ft_table_id);
       else
         vlib_cli_output (vm, "  tenant VRF independent");
+    #define _(N, i, n, s) \
+      vlib_cli_output (vm, "  %d busy %s ports", ap->busy_##n##_ports, s);
+      foreach_nat_protocol
+    #undef _
     }
   return 0;
 }
@@ -829,13 +837,14 @@ add_static_mapping_command_fn (vlib_main_t * vm,
   unformat_input_t _line_input, *line_input = &_line_input;
   vnet_main_t *vnm = vnet_get_main ();
   clib_error_t *error = 0;
+  int rv;
+
+  nat_protocol_t proto = NAT_PROTOCOL_OTHER;
   ip4_address_t l_addr, e_addr, pool_addr;
   u32 l_port = 0, e_port = 0, vrf_id = ~0;
   u8 l_port_set = 0, e_port_set = 0;
-  int is_add = 1, rv;
-  u32 flags = 0;
-  u32 sw_if_index = ~0;
-  ip_protocol_t proto = 0;
+  u32 sw_if_index, flags = 0;
+  int is_add = 1;
 
   if (!unformat_user (input, unformat_line_input, line_input))
     return clib_error_return (0, NAT44_ED_EXPECTED_ARGUMENT);
@@ -877,7 +886,7 @@ add_static_mapping_command_fn (vlib_main_t * vm,
        }
       else if (unformat (line_input, "vrf %u", &vrf_id))
        ;
-      else if (unformat (line_input, "%U", unformat_ip_protocol, &proto))
+      else if (unformat (line_input, "%U", unformat_nat_protocol, &proto))
        ;
       else if (unformat (line_input, "self-twice-nat"))
        {
@@ -974,7 +983,7 @@ add_identity_mapping_command_fn (vlib_main_t * vm,
 
   int rv, is_add = 1, port_set = 0;
   u32 sw_if_index, port, flags, vrf_id = ~0;
-  ip_protocol_t proto;
+  nat_protocol_t proto;
   ip4_address_t addr;
 
   flags = NAT_SM_FLAG_IDENTITY_NAT;
@@ -994,7 +1003,7 @@ add_identity_mapping_command_fn (vlib_main_t * vm,
        }
       else if (unformat (line_input, "vrf %u", &vrf_id))
        ;
-      else if (unformat (line_input, "%U %u", unformat_ip_protocol, &proto,
+      else if (unformat (line_input, "%U %u", unformat_nat_protocol, &proto,
                         &port))
        {
          port_set = 1;
@@ -1071,7 +1080,7 @@ add_lb_static_mapping_command_fn (vlib_main_t * vm,
   ip4_address_t l_addr, e_addr;
   u32 l_port = 0, e_port = 0, vrf_id = 0, probability = 0, affinity = 0;
   u8 proto_set = 0;
-  ip_protocol_t proto;
+  nat_protocol_t proto;
   nat44_lb_addr_port_t *locals = 0, local;
   int rv, is_add = 1;
   u32 flags = 0;
@@ -1105,7 +1114,7 @@ add_lb_static_mapping_command_fn (vlib_main_t * vm,
       else if (unformat (line_input, "external %U:%u", unformat_ip4_address,
                         &e_addr, &e_port))
        ;
-      else if (unformat (line_input, "protocol %U", unformat_ip_protocol,
+      else if (unformat (line_input, "protocol %U", unformat_nat_protocol,
                         &proto))
        {
          proto_set = 1;
@@ -1193,7 +1202,7 @@ add_lb_backend_command_fn (vlib_main_t * vm,
   u32 l_port = 0, e_port = 0, vrf_id = 0, probability = 0;
   int is_add = 1;
   int rv;
-  ip_protocol_t proto;
+  nat_protocol_t proto;
   u8 proto_set = 0;
 
   /* Get a line of input. */
@@ -1212,7 +1221,7 @@ add_lb_backend_command_fn (vlib_main_t * vm,
       else if (unformat (line_input, "external %U:%u", unformat_ip4_address,
                         &e_addr, &e_port))
        ;
-      else if (unformat (line_input, "protocol %U", unformat_ip_protocol,
+      else if (unformat (line_input, "protocol %U", unformat_nat_protocol,
                         &proto))
        proto_set = 1;
       else if (unformat (line_input, "del"))
@@ -1538,7 +1547,7 @@ nat44_del_session_command_fn (vlib_main_t * vm,
   u32 port = 0, eh_port = 0, vrf_id = sm->outside_vrf_id;
   clib_error_t *error = 0;
   ip4_address_t addr, eh_addr;
-  ip_protocol_t proto;
+  nat_protocol_t proto;
   int is_in = 0;
   int rv;
 
@@ -1547,8 +1556,9 @@ nat44_del_session_command_fn (vlib_main_t * vm,
 
   while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
-      if (unformat (line_input, "%U:%u %U", unformat_ip4_address, &addr, &port,
-                   unformat_ip_protocol, &proto))
+      if (unformat
+         (line_input, "%U:%u %U", unformat_ip4_address, &addr, &port,
+          unformat_nat_protocol, &proto))
        ;
       else if (unformat (line_input, "in"))
        {
@@ -1574,8 +1584,8 @@ nat44_del_session_command_fn (vlib_main_t * vm,
     }
 
   rv = nat44_ed_del_session (sm, &addr, clib_host_to_net_u16 (port), &eh_addr,
-                            clib_host_to_net_u16 (eh_port), proto, vrf_id,
-                            is_in);
+                            clib_host_to_net_u16 (eh_port),
+                            nat_proto_to_ip_proto (proto), vrf_id, is_in);
 
   switch (rv)
     {