Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
sr: SRv6 uN behavior
[vpp.git]
/
src
/
plugins
/
srv6-mobile
/
node.c
diff --git
a/src/plugins/srv6-mobile/node.c
b/src/plugins/srv6-mobile/node.c
index
08357bb
..
6eafefd
100644
(file)
--- a/
src/plugins/srv6-mobile/node.c
+++ b/
src/plugins/srv6-mobile/node.c
@@
-372,8
+372,8
@@
VLIB_NODE_FN (srv6_end_m_gtp4_e) (vlib_main_t * vm,
len0 = vlib_buffer_length_in_chain (vm, b0);
len0 = vlib_buffer_length_in_chain (vm, b0);
- offset = ls0->localsid_len / 8;
- shift = ls0->localsid_len % 8;
+ offset = ls0->localsid_
prefix_
len / 8;
+ shift = ls0->localsid_
prefix_
len % 8;
gtpu_type = gtpu_type_get (tag);
gtpu_type = gtpu_type_get (tag);
@@
-939,12
+939,12
@@
VLIB_NODE_FN (srv6_t_m_gtp4_d) (vlib_main_t * vm,
}
else if (ls_param->nhtype == SRV6_NHTYPE_NON_IP)
{
}
else if (ls_param->nhtype == SRV6_NHTYPE_NON_IP)
{
- ip6srv->sr.protocol = IP_PROTOCOL_
NONE
;
+ ip6srv->sr.protocol = IP_PROTOCOL_
IP6_ETHERNET
;
}
}
else
{
}
}
else
{
- ip6srv->sr.protocol = IP_PROTOCOL_
NONE
;
+ ip6srv->sr.protocol = IP_PROTOCOL_
IP6_ETHERNET
;
}
}
else
}
}
else
@@
-958,7
+958,7
@@
VLIB_NODE_FN (srv6_t_m_gtp4_d) (vlib_main_t * vm,
{
ip6srv->ip.protocol = IP_PROTOCOL_IPV6_ROUTE;
{
ip6srv->ip.protocol = IP_PROTOCOL_IPV6_ROUTE;
- ip6srv->sr.protocol = IP_PROTOCOL_
NONE
;
+ ip6srv->sr.protocol = IP_PROTOCOL_
IP6_ETHERNET
;
ip6srv->sr.tag =
clib_host_to_net_u16 (srh_tagfield[gtpu_type]);
ip6srv->sr.tag =
clib_host_to_net_u16 (srh_tagfield[gtpu_type]);
@@
-1008,7
+1008,7
@@
VLIB_NODE_FN (srv6_t_m_gtp4_d) (vlib_main_t * vm,
}
else if (ls_param->nhtype == SRV6_NHTYPE_NON_IP)
{
}
else if (ls_param->nhtype == SRV6_NHTYPE_NON_IP)
{
- ip6srv->ip.protocol = IP_PROTOCOL_
NONE
;
+ ip6srv->ip.protocol = IP_PROTOCOL_
IP6_ETHERNET
;
}
}
}
}
}
}
@@
-1169,7
+1169,7
@@
VLIB_NODE_FN (srv6_end_m_gtp6_e) (vlib_main_t * vm,
u16 offset, shift;
u32 hdrlen = 0;
u16 offset, shift;
u32 hdrlen = 0;
- index = ls0->localsid_len;
+ index = ls0->localsid_
prefix_
len;
index += 8;
offset = index / 8;
shift = index % 8;
index += 8;
offset = index / 8;
shift = index % 8;
@@
-1680,12
+1680,12
@@
VLIB_NODE_FN (srv6_end_m_gtp6_d) (vlib_main_t * vm,
}
else if (ls_param->nhtype == SRV6_NHTYPE_NON_IP)
{
}
else if (ls_param->nhtype == SRV6_NHTYPE_NON_IP)
{
- ip6srv->sr.protocol = IP_PROTOCOL_
NONE
;
+ ip6srv->sr.protocol = IP_PROTOCOL_
IP6_ETHERNET
;
}
}
else
{
}
}
else
{
- ip6srv->sr.protocol = IP_PROTOCOL_
NONE
;
+ ip6srv->sr.protocol = IP_PROTOCOL_
IP6_ETHERNET
;
}
}
else
}
}
else
@@
-1700,7
+1700,7
@@
VLIB_NODE_FN (srv6_end_m_gtp6_d) (vlib_main_t * vm,
{
ip6srv->ip.protocol = IP_PROTOCOL_IPV6_ROUTE;
{
ip6srv->ip.protocol = IP_PROTOCOL_IPV6_ROUTE;
- ip6srv->sr.protocol = IP_PROTOCOL_
NONE
;
+ ip6srv->sr.protocol = IP_PROTOCOL_
IP6_ETHERNET
;
ip6srv->sr.tag =
clib_host_to_net_u16 (srh_tagfield[gtpu_type]);
ip6srv->sr.tag =
clib_host_to_net_u16 (srh_tagfield[gtpu_type]);
@@
-1748,7
+1748,7
@@
VLIB_NODE_FN (srv6_end_m_gtp6_d) (vlib_main_t * vm,
}
else if (ls_param->nhtype == SRV6_NHTYPE_NON_IP)
{
}
else if (ls_param->nhtype == SRV6_NHTYPE_NON_IP)
{
- ip6srv->ip.protocol = IP_PROTOCOL_
NONE
;
+ ip6srv->ip.protocol = IP_PROTOCOL_
IP6_ETHERNET
;
}
}
}
}
}
}
@@
-2152,12
+2152,12
@@
VLIB_NODE_FN (srv6_end_m_gtp6_d_di) (vlib_main_t * vm,
}
else if (ls_param->nhtype == SRV6_NHTYPE_NON_IP)
{
}
else if (ls_param->nhtype == SRV6_NHTYPE_NON_IP)
{
- ip6srv->sr.protocol = IP_PROTOCOL_
NONE
;
+ ip6srv->sr.protocol = IP_PROTOCOL_
IP6_ETHERNET
;
}
}
else
{
}
}
else
{
- ip6srv->sr.protocol = IP_PROTOCOL_
NONE
;
+ ip6srv->sr.protocol = IP_PROTOCOL_
IP6_ETHERNET
;
}
good_n++;
}
good_n++;