summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2019-02-18 12:11:51 -0800
committerFlorin Coras <florin.coras@gmail.com>2019-02-18 22:32:00 +0000
commit25cfb775e38b1d245e9c2cee75a77086f8f80913 (patch)
tree59cf0151185e03d51b861d325bcd8533a4256d7a
parentf4647ed885c47a72d94dd63e0903b6c1ae649813 (diff)
NAT: fix: multiple definition of nat64_cleaner_process_event_e
Change-Id: Idcff6108f4f965344afce9ff614018239819dc95 Signed-off-by: Neale Ranns <nranns@cisco.com>
-rwxr-xr-xsrc/plugins/nat/in2out.c2
-rw-r--r--src/plugins/nat/nat64.h2
-rwxr-xr-xsrc/plugins/nat/out2in.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/nat/in2out.c b/src/plugins/nat/in2out.c
index 403d23c3565..7ed375d46e5 100755
--- a/src/plugins/nat/in2out.c
+++ b/src/plugins/nat/in2out.c
@@ -383,6 +383,7 @@ slow_path (snat_main_t * sm, vlib_buffer_t * b0,
return next0;
}
+#ifndef CLIB_MARCH_VARIANT
static_always_inline
snat_in2out_error_t icmp_get_key (ip4_header_t * ip0,
snat_session_key_t * p_key0)
@@ -428,7 +429,6 @@ static_always_inline
return -1; /* success */
}
-#ifndef CLIB_MARCH_VARIANT
/**
* Get address and port values to be used for ICMP packet translation
* and create session if needed
diff --git a/src/plugins/nat/nat64.h b/src/plugins/nat/nat64.h
index e805a10f29b..2bca1f9b73b 100644
--- a/src/plugins/nat/nat64.h
+++ b/src/plugins/nat/nat64.h
@@ -39,7 +39,7 @@ typedef enum
#undef _
} nat64_tcp_ses_state_t;
-enum
+typedef enum
{
NAT64_CLEANER_RESCHEDULE = 1,
} nat64_cleaner_process_event_e;
diff --git a/src/plugins/nat/out2in.c b/src/plugins/nat/out2in.c
index 347d41a2d46..b743c08c3a7 100755
--- a/src/plugins/nat/out2in.c
+++ b/src/plugins/nat/out2in.c
@@ -250,6 +250,7 @@ create_session_for_static_mapping (snat_main_t * sm,
return s;
}
+#ifndef CLIB_MARCH_VARIANT
static_always_inline
snat_out2in_error_t icmp_get_key (ip4_header_t * ip0,
snat_session_key_t * p_key0)
@@ -295,7 +296,6 @@ static_always_inline
return -1; /* success */
}
-#ifndef CLIB_MARCH_VARIANT
/**
* Get address and port values to be used for ICMP packet translation
* and create session if needed