nat: perf improvement - replace branchy code

[vpp.git] / src / plugins / nat / nat_ipfix_logging.c

diff --git a/src/plugins/nat/nat_ipfix_logging.c b/src/plugins/nat/nat_ipfix_logging.c
index da8e1f2..7647742 100755 (executable)
--- a/src/plugins/nat/nat_ipfix_logging.c
+++ b/src/plugins/nat/nat_ipfix_logging.c
@@ -48,7 +48,7 @@ typedef struct
   u8 nat_event;
   u32 src_ip;
   u32 nat_src_ip;
-  snat_protocol_t snat_proto;
+  nat_protocol_t nat_proto;
   u16 src_port;
   u16 nat_src_port;
   u32 vrf_id;
@@ -573,7 +573,7 @@ snat_ipfix_send (u32 thread_index, flow_report_main_t * frm,
 
 static void
 snat_ipfix_logging_nat44_ses (u32 thread_index, u8 nat_event, u32 src_ip,
-                              u32 nat_src_ip, snat_protocol_t snat_proto,
+                              u32 nat_src_ip, nat_protocol_t nat_proto,
                               u16 src_port, u16 nat_src_port, u32 vrf_id,
                               int do_flush)
 {
@@ -586,10 +586,10 @@ snat_ipfix_logging_nat44_ses (u32 thread_index, u8 nat_event, u32 src_ip,
   u32 offset;
   vlib_main_t *vm = vlib_mains[thread_index];
   u64 now;
-  u8 proto = ~0;
+  u8 proto;
   u16 template_id;
 
-  proto = snat_proto_to_ip_proto (snat_proto);
+  proto = nat_proto_to_ip_proto (nat_proto);
 
   now = (u64) ((vlib_time_now (vm) - silm->vlib_time_0) * 1e3);
   now += silm->milisecond_time_0;
@@ -1299,7 +1299,7 @@ snat_ipfix_flush_from_main (void)
  * @param thread_index thread index
  * @param src_ip       source IPv4 address
  * @param nat_src_ip   transaltes source IPv4 address
- * @param snat_proto   NAT transport protocol
+ * @param nat_proto   NAT transport protocol
  * @param src_port     source port
  * @param nat_src_port translated source port
  * @param vrf_id       VRF ID
@@ -1308,14 +1308,14 @@ void
 snat_ipfix_logging_nat44_ses_create (u32 thread_index,
                                      u32 src_ip,
                                     u32 nat_src_ip,
-                                    snat_protocol_t snat_proto,
+                                    nat_protocol_t nat_proto,
                                     u16 src_port,
                                     u16 nat_src_port, u32 vrf_id)
 {
   skip_if_disabled ();
 
   snat_ipfix_logging_nat44_ses (thread_index, NAT44_SESSION_CREATE, src_ip,
-                                nat_src_ip, snat_proto, src_port, nat_src_port,
+                                nat_src_ip, nat_proto, src_port, nat_src_port,
                                vrf_id, 0);
 }
 
@@ -1325,7 +1325,7 @@ snat_ipfix_logging_nat44_ses_create (u32 thread_index,
  * @param thread_index thread index
  * @param src_ip       source IPv4 address
  * @param nat_src_ip   transaltes source IPv4 address
- * @param snat_proto   NAT transport protocol
+ * @param nat_proto   NAT transport protocol
  * @param src_port     source port
  * @param nat_src_port translated source port
  * @param vrf_id       VRF ID
@@ -1334,14 +1334,14 @@ void
 snat_ipfix_logging_nat44_ses_delete (u32 thread_index,
                                      u32 src_ip,
                                     u32 nat_src_ip,
-                                    snat_protocol_t snat_proto,
+                                    nat_protocol_t nat_proto,
                                     u16 src_port,
                                     u16 nat_src_port, u32 vrf_id)
 {
   skip_if_disabled ();
 
   snat_ipfix_logging_nat44_ses (thread_index, NAT44_SESSION_DELETE, src_ip,
-                                nat_src_ip, snat_proto, src_port, nat_src_port,
+                                nat_src_ip, nat_proto, src_port, nat_src_port,
                                vrf_id, 0);
 }