Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
MAP: Add API support for MAP input feature.
[vpp.git]
/
src
/
plugins
/
gtpu
/
gtpu.c
diff --git
a/src/plugins/gtpu/gtpu.c
b/src/plugins/gtpu/gtpu.c
old mode 100755
(executable)
new mode 100644
(file)
index
eba0fa0
..
dcdbc51
--- a/
src/plugins/gtpu/gtpu.c
+++ b/
src/plugins/gtpu/gtpu.c
@@
-356,12
+356,6
@@
mcast_shared_remove (ip46_address_t * dst)
hash_unset_mem_free (>pu_main.mcast_shared, dst);
}
hash_unset_mem_free (>pu_main.mcast_shared, dst);
}
-static inline fib_protocol_t
-fib_ip_proto (bool is_ip6)
-{
- return (is_ip6) ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4;
-}
-
int vnet_gtpu_add_del_tunnel
(vnet_gtpu_add_del_tunnel_args_t * a, u32 * sw_if_indexp)
{
int vnet_gtpu_add_del_tunnel
(vnet_gtpu_add_del_tunnel_args_t * a, u32 * sw_if_indexp)
{
@@
-403,7
+397,7
@@
int vnet_gtpu_add_del_tunnel
return VNET_API_ERROR_INVALID_DECAP_NEXT;
pool_get_aligned (gtm->tunnels, t, CLIB_CACHE_LINE_BYTES);
return VNET_API_ERROR_INVALID_DECAP_NEXT;
pool_get_aligned (gtm->tunnels, t, CLIB_CACHE_LINE_BYTES);
- memset (t, 0, sizeof (*t));
+
clib_
memset (t, 0, sizeof (*t));
/* copy from arg structure */
#define _(x) t->x = a->x;
/* copy from arg structure */
#define _(x) t->x = a->x;
@@
-499,8
+493,8
@@
int vnet_gtpu_add_del_tunnel
else
{
/* Multicast tunnel -
else
{
/* Multicast tunnel -
- * as the same mcast group can be used for mutiple mcast tunnels
- * with different VNIs, create the output
fib adje
cency only if
+ * as the same mcast group can be used for mu
l
tiple mcast tunnels
+ * with different VNIs, create the output
adja
cency only if
* it does not already exist
*/
fib_protocol_t fp = fib_ip_proto (is_ip6);
* it does not already exist
*/
fib_protocol_t fp = fib_ip_proto (is_ip6);
@@
-584,8
+578,8
@@
int vnet_gtpu_add_del_tunnel
si->flags |= VNET_SW_INTERFACE_FLAG_HIDDEN;
/* make sure tunnel is removed from l2 bd or xconnect */
si->flags |= VNET_SW_INTERFACE_FLAG_HIDDEN;
/* make sure tunnel is removed from l2 bd or xconnect */
- set_int_l2_mode (gtm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0,
0, 0,
- 0);
+ set_int_l2_mode (gtm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0,
+
L2_BD_PORT_TYPE_NORMAL, 0,
0);
vec_add1 (gtm->free_gtpu_tunnel_hw_if_indices, t->hw_if_index);
gtm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0;
vec_add1 (gtm->free_gtpu_tunnel_hw_if_indices, t->hw_if_index);
gtm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0;
@@
-678,8
+672,8
@@
gtpu_add_del_tunnel_command_fn (vlib_main_t * vm,
clib_error_t *error = NULL;
/* Cant "universally zero init" (={0}) due to GCC bug 53119 */
clib_error_t *error = NULL;
/* Cant "universally zero init" (={0}) due to GCC bug 53119 */
- memset (&src, 0, sizeof src);
- memset (&dst, 0, sizeof dst);
+
clib_
memset (&src, 0, sizeof src);
+
clib_
memset (&dst, 0, sizeof dst);
/* Get a line of input. */
if (!unformat_user (input, unformat_line_input, line_input))
/* Get a line of input. */
if (!unformat_user (input, unformat_line_input, line_input))
@@
-802,7
+796,7
@@
gtpu_add_del_tunnel_command_fn (vlib_main_t * vm,
goto done;
}
goto done;
}
- memset (a, 0, sizeof (*a));
+
clib_
memset (a, 0, sizeof (*a));
a->is_add = is_add;
a->is_ip6 = ipv6_set;
a->is_add = is_add;
a->is_ip6 = ipv6_set;
@@
-1000,7
+994,7
@@
set_ip4_gtpu_bypass (vlib_main_t * vm,
* ip4-lookup [2]
* @cliexend
*
* ip4-lookup [2]
* @cliexend
*
- * Example of how to display the feature enabed on an interface:
+ * Example of how to display the feature enab
l
ed on an interface:
* @cliexstart{show ip interface features GigabitEthernet2/0/0}
* IP feature paths configured on GigabitEthernet2/0/0...
* ...
* @cliexstart{show ip interface features GigabitEthernet2/0/0}
* IP feature paths configured on GigabitEthernet2/0/0...
* ...
@@
-1057,7
+1051,7
@@
set_ip6_gtpu_bypass (vlib_main_t * vm,
* ip6-lookup [2]
* @cliexend
*
* ip6-lookup [2]
* @cliexend
*
- * Example of how to display the feature enabed on an interface:
+ * Example of how to display the feature enab
l
ed on an interface:
* @cliexstart{show ip interface features GigabitEthernet2/0/0}
* IP feature paths configured on GigabitEthernet2/0/0...
* ...
* @cliexstart{show ip interface features GigabitEthernet2/0/0}
* IP feature paths configured on GigabitEthernet2/0/0...
* ...