u16 ie_size = 0;
u8 ie_buf[GTPU_IE_MAX_SIZ];
void *p;
+ uword plen;
if (ip6srv0->ip.protocol == IPPROTO_IPV6_ROUTE)
{
tag = ip6srv0->sr.tag;
}
- 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);
for (index = 0; index < 2; index++)
{
sp[index] = dst0.as_u8[offset + 5 + index] << shift;
- sp[index] =
+ sp[index] |=
dst0.as_u8[offset + 6 + index] >> (8 - shift);
}
}
// get length of encapsulated IPv6 packet (the remaining part)
p = vlib_buffer_get_current (b0);
- len0 = vlib_buffer_length_in_chain (vm, b0);
+ plen = len0 = vlib_buffer_length_in_chain (vm, b0);
len0 += hdrlen;
}
}
- key = hash_memory (p, len0, 0);
+ key = hash_memory (p, plen < 40 ? plen : 40, 0);
port = hash_uword_to_u16 (&key);
hdr0->udp.src_port = port;
u8 qfi = 0;
u8 *qfip = NULL;
u16 seq = 0;
- u8 *seqp = NULL;
+ u8 *seqp;
u32 offset, shift, index;
ip6srv_combo_header_t *ip6srv;
gtpu_pdu_session_t *sess = NULL;
- u16 ie_size = 0;
+ int ie_size = 0;
u16 tlv_siz = 0;
u8 ie_buf[GTPU_IE_MAX_SIZ];
teid = hdr->gtpu.teid;
teidp = (u8 *) & teid;
+ seqp = (u8 *) & seq;
+
gtpu_type = hdr->gtpu.type;
if (hdr->gtpu.ver_flags & (GTPU_EXTHDR_FLAG | GTPU_SEQ_FLAG))
hdr_len += sizeof (gtpu_exthdr_t);
seq = hdr->gtpu.ext->seq;
- seqp = (u8 *) & seq;
if (hdr->gtpu.ext->nextexthdr == GTPU_EXTHDR_PDU_SESSION)
{
u16 payload_len;
payload_len = clib_net_to_host_u16 (hdr->gtpu.length);
- if (payload_len != 0
- && payload_len > hdr_len - sizeof (ip4_gtpu_header_t))
+ if (payload_len != 0)
{
- u8 *ies;
-
- ies = (u8 *) ((u8 *) hdr + hdr_len);
ie_size =
payload_len - (hdr_len - sizeof (ip4_gtpu_header_t));
- clib_memcpy_fast (ie_buf, ies, ie_size);
- hdr_len += ie_size;
+ if (ie_size > 0)
+ {
+ u8 *ies;
+
+ ies = (u8 *) ((u8 *) hdr + hdr_len);
+ clib_memcpy_fast (ie_buf, ies, ie_size);
+ hdr_len += ie_size;
+ }
}
}
}
else if (ls_param->nhtype == SRV6_NHTYPE_NON_IP)
{
- ip6srv->sr.protocol = IP_PROTOCOL_NONE;
+ ip6srv->sr.protocol = IP_PROTOCOL_IP6_ETHERNET;
}
}
else
{
- ip6srv->sr.protocol = IP_PROTOCOL_NONE;
+ ip6srv->sr.protocol = IP_PROTOCOL_IP6_ETHERNET;
}
}
else
{
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]);
}
else if (ls_param->nhtype == SRV6_NHTYPE_NON_IP)
{
- ip6srv->ip.protocol = IP_PROTOCOL_NONE;
+ ip6srv->ip.protocol = IP_PROTOCOL_IP6_ETHERNET;
}
}
}
tlv =
(ip6_sr_tlv_t *) ((u8 *) ip6srv + (hdr_len - tlv_siz));
tlv->type = SRH_TLV_USER_PLANE_CONTAINER;
- tlv->length = tlv_siz - sizeof (ip6_sr_tlv_t);
+ tlv->length = (u8) (tlv_siz - sizeof (ip6_sr_tlv_t));
clib_memset (tlv->value, 0, tlv->length);
sub_tlv = (user_plane_sub_tlv_t *) tlv->value;
sub_tlv->type = USER_PLANE_SUB_TLV_IE;
- sub_tlv->length = ie_size;
+ sub_tlv->length = (u8) ie_size;
clib_memcpy_fast (sub_tlv->value, ie_buf, ie_size);
- ip6srv->sr.length += tlv_siz / 8;
+ ip6srv->sr.length += (u8) (tlv_siz / 8);
}
ip6srv->ip.payload_length =
u16 port;
u16 tag;
void *p;
+ uword plen;
u32 next0 = SRV6_END_M_GTP6_E_NEXT_LOOKUP;
u16 ie_size = 0;
u8 ie_buf[GTPU_IE_MAX_SIZ];
- index = ls0->localsid_len;
+ index = ls0->localsid_prefix_len;
index += 8;
offset = index / 8;
shift = index % 8;
for (index = 0; index < 2; index++)
{
sp[index] = dst0.as_u8[offset + index] << shift;
- sp[index] =
+ sp[index] |=
dst0.as_u8[offset + index + 1] >> (8 - shift);
}
}
}
}
- if (ip6srv0->ip.protocol == IPPROTO_IPV6_ROUTE)
- {
- vlib_buffer_advance (b0,
- (word) sizeof (ip6srv_combo_header_t) +
- ip6srv0->sr.length * 8);
- }
- else
- {
- vlib_buffer_advance (b0, (word) sizeof (ip6_header_t));
- }
+ vlib_buffer_advance (b0,
+ (word) sizeof (ip6srv_combo_header_t) +
+ ip6srv0->sr.length * 8);
// get length of encapsulated IPv6 packet (the remaining part)
p = vlib_buffer_get_current (b0);
- len0 = vlib_buffer_length_in_chain (vm, b0);
+ plen = len0 = vlib_buffer_length_in_chain (vm, b0);
len0 += hdrlen;
(gtpu_header_t));
// UDP source port.
- key = hash_memory (p, len0, 0);
+ key = hash_memory (p, plen < 40 ? plen : 40, 0);
port = hash_uword_to_u16 (&key);
hdr0->udp.src_port = port;
u8 qfi;
u8 *qfip = NULL;
u16 seq = 0;
- u8 *seqp = NULL;
+ u8 *seqp;
u32 offset, shift;
u32 hdrlen;
ip6_header_t *encap = NULL;
gtpu_pdu_session_t *sess = NULL;
- u16 ie_size = 0;
+ int ie_size = 0;
u16 tlv_siz = 0;
u8 ie_buf[GTPU_IE_MAX_SIZ];
teid = hdr0->gtpu.teid;
teidp = (u8 *) & teid;
+ seqp = (u8 *) & seq;
+
if (hdr0->gtpu.ver_flags & (GTPU_EXTHDR_FLAG | GTPU_SEQ_FLAG))
{
// Extention header.
hdrlen += sizeof (gtpu_exthdr_t);
seq = hdr0->gtpu.ext->seq;
- seqp = (u8 *) & seq;
if (hdr0->gtpu.ext->nextexthdr == GTPU_EXTHDR_PDU_SESSION)
{
|| gtpu_type == GTPU_TYPE_ECHO_REPLY
|| gtpu_type == GTPU_TYPE_ERROR_INDICATION)
{
- if (seqp)
- clib_memcpy_fast (&seg0.as_u8[offset], seqp, 2);
+ clib_memcpy_fast (&seg0.as_u8[offset], seqp, 2);
}
else
{
|| gtpu_type == GTPU_TYPE_ECHO_REPLY
|| gtpu_type == GTPU_TYPE_ERROR_INDICATION)
{
- if (seqp)
+ for (idx = 0; idx < 2; idx++)
{
- for (idx = 0; idx < 2; idx++)
- {
- seg0.as_u8[offset + idx] |= seqp[idx] >> shift;
- seg0.as_u8[offset + idx + 1] |=
- seqp[idx] << (8 - shift);
- }
+ seg0.as_u8[offset + idx] |= seqp[idx] >> shift;
+ seg0.as_u8[offset + idx + 1] |=
+ seqp[idx] << (8 - shift);
}
}
else
u16 payload_len;
payload_len = clib_net_to_host_u16 (hdr0->gtpu.length);
- if (payload_len != 0
- && payload_len > hdrlen - sizeof (ip6_gtpu_header_t))
+ if (payload_len != 0)
{
- u8 *ies;
-
- ies = (u8 *) ((u8 *) hdr0 + hdrlen);
ie_size =
payload_len - (hdrlen - sizeof (ip6_gtpu_header_t));
- clib_memcpy_fast (ie_buf, ies, ie_size);
- hdrlen += ie_size;
+ if (ie_size > 0)
+ {
+ u8 *ies;
+
+ ies = (u8 *) ((u8 *) hdr0 + hdrlen);
+ clib_memcpy_fast (ie_buf, ies, ie_size);
+ hdrlen += ie_size;
+ }
}
}
}
else if (ls_param->nhtype == SRV6_NHTYPE_NON_IP)
{
- ip6srv->sr.protocol = IP_PROTOCOL_NONE;
+ ip6srv->sr.protocol = IP_PROTOCOL_IP6_ETHERNET;
}
}
else
{
- ip6srv->sr.protocol = IP_PROTOCOL_NONE;
+ ip6srv->sr.protocol = IP_PROTOCOL_IP6_ETHERNET;
}
}
else
{
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]);
}
else if (ls_param->nhtype == SRV6_NHTYPE_NON_IP)
{
- ip6srv->ip.protocol = IP_PROTOCOL_NONE;
+ ip6srv->ip.protocol = IP_PROTOCOL_IP6_ETHERNET;
}
}
}
tlv =
(ip6_sr_tlv_t *) ((u8 *) ip6srv + (hdr_len - tlv_siz));
tlv->type = SRH_TLV_USER_PLANE_CONTAINER;
- tlv->length = tlv_siz - sizeof (ip6_sr_tlv_t);
+ tlv->length = (u8) (tlv_siz - sizeof (ip6_sr_tlv_t));
clib_memset (tlv->value, 0, tlv->length);
sub_tlv = (user_plane_sub_tlv_t *) tlv->value;
sub_tlv->type = USER_PLANE_SUB_TLV_IE;
- sub_tlv->length = ie_size;
+ sub_tlv->length = (u8) ie_size;
clib_memcpy_fast (sub_tlv->value, ie_buf, ie_size);
- ip6srv->sr.length += tlv_siz / 8;
+ ip6srv->sr.length += (u8) (tlv_siz / 8);
}
ip6srv->ip.payload_length =
u8 qfi = 0;
u8 *qfip = NULL;
u16 seq = 0;
- u8 *seqp = NULL;
+ u8 *seqp;
u32 offset, shift;
u32 hdrlen;
ip6_header_t *encap = NULL;
gtpu_pdu_session_t *sess;
- u16 ie_size = 0;
+ int ie_size = 0;
u16 tlv_siz = 0;
u8 ie_buf[GTPU_IE_MAX_SIZ];
teid = hdr0->gtpu.teid;
teidp = (u8 *) & teid;
+ seqp = (u8 *) & seq;
+
if (hdr0->gtpu.ver_flags & (GTPU_EXTHDR_FLAG | GTPU_SEQ_FLAG))
{
// Extention header.
hdrlen += sizeof (gtpu_exthdr_t);
seq = hdr0->gtpu.ext->seq;
- seqp = (u8 *) & seq;
if (hdr0->gtpu.ext->nextexthdr == GTPU_EXTHDR_PDU_SESSION)
{
|| gtpu_type == GTPU_TYPE_ECHO_REPLY
|| gtpu_type == GTPU_TYPE_ERROR_INDICATION)
{
- if (seqp)
- clib_memcpy_fast (&seg0.as_u8[offset], seqp, 2);
+ clib_memcpy_fast (&seg0.as_u8[offset], seqp, 2);
}
else
{
|| gtpu_type == GTPU_TYPE_ECHO_REPLY
|| gtpu_type == GTPU_TYPE_ERROR_INDICATION)
{
- if (seqp)
+ for (idx = 0; idx < 2; idx++)
{
- for (idx = 0; idx < 2; idx++)
- {
- seg0.as_u8[offset + idx] |= seqp[idx] >> shift;
- seg0.as_u8[offset + idx + 1] |=
- seqp[idx] << (8 - shift);
- }
+ seg0.as_u8[offset + idx] |= seqp[idx] >> shift;
+ seg0.as_u8[offset + idx + 1] |=
+ seqp[idx] << (8 - shift);
}
}
else
u16 payload_len;
payload_len = clib_net_to_host_u16 (hdr0->gtpu.length);
- if (payload_len != 0
- && payload_len > hdrlen - sizeof (ip6_gtpu_header_t))
+ if (payload_len != 0)
{
- u8 *ies;
-
- ies = (u8 *) ((u8 *) hdr0 + hdrlen);
ie_size =
payload_len - (hdrlen - sizeof (ip6_gtpu_header_t));
- clib_memcpy_fast (ie_buf, ies, ie_size);
- hdrlen += ie_size;
+ if (ie_size > 0)
+ {
+ u8 *ies;
+
+ ies = (u8 *) ((u8 *) hdr0 + hdrlen);
+ clib_memcpy_fast (ie_buf, ies, ie_size);
+ hdrlen += ie_size;
+ }
}
}
tlv =
(ip6_sr_tlv_t *) ((u8 *) ip6srv + (hdr_len - tlv_siz));
tlv->type = SRH_TLV_USER_PLANE_CONTAINER;
- tlv->length = tlv_siz - sizeof (ip6_sr_tlv_t);
+ tlv->length = (u8) (tlv_siz - sizeof (ip6_sr_tlv_t));
clib_memset (tlv->value, 0, tlv->length);
sub_tlv = (user_plane_sub_tlv_t *) tlv->value;
- sub_tlv->length = ie_size;
+ sub_tlv->length = (u8) (ie_size);
clib_memcpy_fast (sub_tlv->value, ie_buf, ie_size);
- ip6srv->sr.length += tlv_siz / 8;
+ ip6srv->sr.length += (u8) (tlv_siz / 8);
}
ip6srv->ip.payload_length =
}
else if (ls_param->nhtype == SRV6_NHTYPE_NON_IP)
{
- ip6srv->sr.protocol = IP_PROTOCOL_NONE;
+ ip6srv->sr.protocol = IP_PROTOCOL_IP6_ETHERNET;
}
}
else
{
- ip6srv->sr.protocol = IP_PROTOCOL_NONE;
+ ip6srv->sr.protocol = IP_PROTOCOL_IP6_ETHERNET;
}
good_n++;
}
next0 = SRV6_END_M_GTP6_DT_NEXT_LOOKUP6;
- if ((ip6->dst_address.as_u8[0] == 0xfe)
+ if ((ip6->dst_address.as_u8[0] == 0xff)
&& ((ip6->dst_address.as_u8[1] & 0xc0) == 0x80))
{
vnet_buffer (b0)->sw_if_index[VLIB_TX] =
== 6)
{
next0 = SRV6_END_M_GTP6_DT_NEXT_LOOKUP6;
- if ((ip6->dst_address.as_u8[0] == 0xfe)
+ if ((ip6->dst_address.as_u8[0] == 0xff)
&& ((ip6->dst_address.as_u8[1] & 0xc0) == 0x80))
{
vnet_buffer (b0)->sw_if_index[VLIB_TX] =
}
next0 = SRV6_T_M_GTP4_DT_NEXT_LOOKUP6;
- if ((ip6->dst_address.as_u8[0] == 0xfe)
+ if ((ip6->dst_address.as_u8[0] == 0xff)
&& ((ip6->dst_address.as_u8[1] & 0xc0) == 0x80))
{
next0 = SRV6_T_M_GTP4_DT_NEXT_LOOKUP4;
== 6)
{
next0 = SRV6_T_M_GTP4_DT_NEXT_LOOKUP6;
- if ((ip6->dst_address.as_u8[0] == 0xfe)
+ if ((ip6->dst_address.as_u8[0] == 0xff)
&& ((ip6->dst_address.as_u8[1] & 0xc0) == 0x80))
{
next0 = SRV6_T_M_GTP4_DT_NEXT_LOOKUP4;