ipfix-export: refactor fields in flow_report_main

[vpp.git] / src / plugins / nat / lib / inlines.h

diff --git a/src/plugins/nat/lib/inlines.h b/src/plugins/nat/lib/inlines.h
index f2bd5e0..46be64d 100644 (file)
--- a/src/plugins/nat/lib/inlines.h
+++ b/src/plugins/nat/lib/inlines.h
@@ -13,35 +13,12 @@
  * limitations under the License.
  */
 /**
- * @brief The NAT44 inline functions
+ * @brief Common NAT inline functions
  */
 #ifndef included_nat_inlines_h__
 #define included_nat_inlines_h__
 
-static_always_inline u32
-ip_proto_to_nat_proto (u8 ip_proto)
-{
-  u32 nat_proto = ~0;
-
-  nat_proto = (ip_proto == IP_PROTOCOL_UDP) ? NAT_PROTOCOL_UDP : nat_proto;
-  nat_proto = (ip_proto == IP_PROTOCOL_TCP) ? NAT_PROTOCOL_TCP : nat_proto;
-  nat_proto = (ip_proto == IP_PROTOCOL_ICMP) ? NAT_PROTOCOL_ICMP : nat_proto;
-  nat_proto = (ip_proto == IP_PROTOCOL_ICMP6) ? NAT_PROTOCOL_ICMP : nat_proto;
-
-  return nat_proto;
-}
-
-static_always_inline u8
-nat_proto_to_ip_proto (nat_protocol_t nat_proto)
-{
-  u8 ip_proto = ~0;
-
-  ip_proto = (nat_proto == NAT_PROTOCOL_UDP) ? IP_PROTOCOL_UDP : ip_proto;
-  ip_proto = (nat_proto == NAT_PROTOCOL_TCP) ? IP_PROTOCOL_TCP : ip_proto;
-  ip_proto = (nat_proto == NAT_PROTOCOL_ICMP) ? IP_PROTOCOL_ICMP : ip_proto;
-
-  return ip_proto;
-}
+#include <vnet/ip/icmp46_packet.h>
 
 static_always_inline u8
 icmp_type_is_error_message (u8 icmp_type)