paulmataruso/open5gs
1
0
Fork 0
mirror of https://github.com/open5gs/open5gs.git synced 2025-11-01 20:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix the bug for finding indirect tunnel

Browse Source
This commit is contained in:
Sukchan Lee
2018-01-24 11:32:46 +09:00
parent bba98cf066
commit 94145fec62
6 changed files with 74 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gtp/gtp_path.c
View File

@@ -270,8 +270,6 @@ pkbuf_t *gtp_handle_echo_req(pkbuf_t *pkb)
}
d_trace(50, "gtp_handle_without_teid(ECHO_REQ)\n");
pkb_resp = pkbuf_alloc(0, 100 /* enough for ECHO_RSP; use smaller buffer */);
d_assert(pkb_resp, return NULL, "Can't allocate pkbuf");
gtph_resp = (gtp_header_t *)pkb_resp->payload;

2
src/pgw/pgw_context.c
View File

@@ -909,7 +909,7 @@ status_t pgw_context_setup_trace_module()
if (gtp)
{
extern int _pgw_gtp_path;
d_trace_level(&_pgw_gtp_path, gtpv2);
d_trace_level(&_pgw_gtp_path, gtp);
extern int _pgw_ipfw;
d_trace_level(&_pgw_ipfw, gtp);
}

11
src/pgw/pgw_gtp_path.c
View File

@@ -129,6 +129,8 @@ static int _gtpv1_u_recv_cb(sock_id sock, void *data)
if (gtp_h->flags & GTPU_FLAGS_S) size += 4;
teid = ntohl(gtp_h->teid);
d_trace(3, "[PGW] RECV GPU-U from SGW : TEID[0x%x]\n", teid);
/* Remove GTP header and send packets to TUN interface */
d_assert(pkbuf_header(pkbuf, -size) == CORE_OK, goto cleanup,);
@@ -339,6 +341,7 @@ static status_t pgw_gtp_handle_slaac(pgw_sess_t *sess, pkbuf_t *recvbuf)
(struct icmp6_hdr *)(recvbuf->payload + sizeof(struct ip6_hdr));
if (icmp_h->icmp6_type == ND_ROUTER_SOLICIT)
{
d_trace(5, "[PGW] RECV Router Solict\n");
if (sess->ipv6)
{
rv = pgw_gtp_send_router_advertisement(
@@ -355,9 +358,14 @@ static status_t pgw_gtp_handle_slaac(pgw_sess_t *sess, pkbuf_t *recvbuf)
static status_t pgw_gtp_send_to_bearer(pgw_bearer_t *bearer, pkbuf_t *sendbuf)
{
char buf[CORE_ADDRSTRLEN];
status_t rv;
gtp_header_t *gtp_h = NULL;
d_assert(bearer, pkbuf_free(sendbuf); return CORE_ERROR,);
d_assert(bearer->gnode, pkbuf_free(sendbuf); return CORE_ERROR,);
d_assert(bearer->gnode->sock, pkbuf_free(sendbuf); return CORE_ERROR,);
/* Add GTP-U header */
rv = pkbuf_header(sendbuf, GTPV1U_HEADER_LEN);
if (rv != CORE_OK)
@@ -383,6 +391,9 @@ static status_t pgw_gtp_send_to_bearer(pgw_bearer_t *bearer, pkbuf_t *sendbuf)
d_trace(50, "[PGW] SEND : ");
d_trace_hex(50, sendbuf->payload, sendbuf->len);
d_trace(3, "[PGW] SEND GPU-U to SGW[%s] : TEID[0x%x]\n",
CORE_ADDR(sock_remote_addr(bearer->gnode->sock), buf),
bearer->sgw_s5u_teid);
rv = gtp_send(bearer->gnode, sendbuf);
return rv;

22
src/pgw/pgw_ipfw.c
View File

@@ -271,10 +271,10 @@ pgw_bearer_t *pgw_bearer_find_by_packet(pkbuf_t *pkt)
else
d_error("Invalid IP version = %d\n", ip_h->ip_v);
d_trace(9, "PROTO:%d SRC:%08x %08x %08x %08x\n",
d_trace(5, "[PGW] PROTO:%d SRC:%08x %08x %08x %08x\n",
proto, ntohl(src_addr[0]), ntohl(src_addr[1]),
ntohl(src_addr[2]), ntohl(src_addr[3]));
d_trace(9, "HLEN:%d DST:%08x %08x %08x %08x\n",
d_trace(5, "[PGW] HLEN:%d DST:%08x %08x %08x %08x\n",
ip_hlen, ntohl(dst_addr[0]), ntohl(dst_addr[1]),
ntohl(dst_addr[2]), ntohl(dst_addr[3]));
@@ -290,21 +290,25 @@ pgw_bearer_t *pgw_bearer_find_by_packet(pkbuf_t *pkt)
d_assert(sess, return NULL,);
if (sess->ipv4)
d_trace(9, "PAA IPv4:%s\n", INET_NTOP(&sess->ipv4->addr, buf));
d_trace(5, "[PGW] PAA IPv4:%s\n",
INET_NTOP(&sess->ipv4->addr, buf));
if (sess->ipv6)
d_trace(9, "PAA IPv6:%s\n", INET6_NTOP(&sess->ipv6->addr, buf));
d_trace(5, "[PGW] PAA IPv6:%s\n",
INET6_NTOP(&sess->ipv6->addr, buf));
if ((sess->ipv4 && memcmp(dst_addr, sess->ipv4->addr, addr_len) == 0) ||
(sess->ipv6 && memcmp(dst_addr, sess->ipv6->addr, addr_len) == 0))
{
pgw_bearer_t *default_bearer = NULL;
pgw_bearer_t *bearer = NULL;
/* Found */
/* Save the default bearer */
default_bearer = pgw_default_bearer_in_sess(sess);
d_assert(default_bearer, return NULL, "No default Bearer");
/* Found */
d_trace(5, "[PGW] Found Session : EBI[%d]\n", default_bearer->ebi);
bearer = pgw_bearer_next(default_bearer);
/* Find the bearer with matched */
for (; bearer; bearer = pgw_bearer_next(bearer))
@@ -323,13 +327,13 @@ pgw_bearer_t *pgw_bearer_find_by_packet(pkbuf_t *pkt)
c_uint32_t src_mask[4];
c_uint32_t dst_mask[4];
d_trace(9, "DIR:%d PROTO:%d SRC:%d-%d DST:%d-%d\n",
d_trace(5, "DIR:%d PROTO:%d SRC:%d-%d DST:%d-%d\n",
pf->direction, pf->rule.proto,
pf->rule.port.local.low,
pf->rule.port.local.high,
pf->rule.port.remote.low,
pf->rule.port.remote.high);
d_trace(9, "SRC:%08x %08x %08x %08x/%08x %08x %08x %08x\n",
d_trace(5, "SRC:%08x %08x %08x %08x/%08x %08x %08x %08x\n",
ntohl(pf->rule.ip.local.addr[0]),
ntohl(pf->rule.ip.local.addr[1]),
ntohl(pf->rule.ip.local.addr[2]),
@@ -338,7 +342,7 @@ pgw_bearer_t *pgw_bearer_find_by_packet(pkbuf_t *pkt)
ntohl(pf->rule.ip.local.mask[1]),
ntohl(pf->rule.ip.local.mask[2]),
ntohl(pf->rule.ip.local.mask[3]));
d_trace(9, "DST:%08x %08x %08x %08x/%08x %08x %08x %08x\n",
d_trace(5, "DST:%08x %08x %08x %08x/%08x %08x %08x %08x\n",
ntohl(pf->rule.ip.remote.addr[0]),
ntohl(pf->rule.ip.remote.addr[1]),
ntohl(pf->rule.ip.remote.addr[2]),
@@ -465,7 +469,7 @@ pgw_bearer_t *pgw_bearer_find_by_packet(pkbuf_t *pkt)
if (pf)
{
bearer = pf->bearer;
d_trace(5, "FOUND Bearer EBI = %d\n", bearer->ebi);
d_trace(5, "Found Dedicated Bearer : EBI[%d]\n", bearer->ebi);
break;
}

60
src/sgw/sgw_gtp_path.c
View File

@@ -58,6 +58,7 @@ static int _gtpv2_c_recv_cb(sock_id sock, void *data)
static int _gtpv1_u_recv_cb(sock_id sock, void *data)
{
char buf[CORE_ADDRSTRLEN];
status_t rv;
pkbuf_t *pkbuf = NULL;
c_sockaddr_t from;
@@ -86,14 +87,16 @@ static int _gtpv1_u_recv_cb(sock_id sock, void *data)
{
pkbuf_t *echo_rsp;
d_trace(3, "[SGW] RECV : ECHO-REQ\n");
d_trace(3, "[SGW] RECV Echo Request from [%s]\n",
CORE_ADDR(&from, buf));
echo_rsp = gtp_handle_echo_req(pkbuf);
if (echo_rsp)
{
ssize_t sent;
/* Echo reply */
d_trace(3, "[SGW] SEND : ECHO-RSP\n");
d_trace(3, "[SGW] SEND Echo Response to [%s]\n",
CORE_ADDR(&from, buf));
sent = core_sendto(sock,
echo_rsp->payload, echo_rsp->len, 0, &from);
@@ -109,11 +112,11 @@ static int _gtpv1_u_recv_cb(sock_id sock, void *data)
{
teid = ntohl(gtp_h->teid);
if (gtp_h->type == GTPU_MSGTYPE_GPDU)
d_trace(3, "[SGW] RECV : GPDU\n");
d_trace(3, "[SGW] RECV GPU-U from [%s] : TEID[0x%x]\n",
CORE_ADDR(&from, buf), teid);
else if (gtp_h->type == GTPU_MSGTYPE_END_MARKER)
d_trace(3, "[SGW] RECV : End Marker\n");
d_trace(5, " TEID[0x%x]\n", teid);
d_trace(3, "[SGW] RECV End Marker from [%s] : TEID[0x%x]\n",
CORE_ADDR(&from, buf), teid);
tunnel = sgw_tunnel_find_by_teid(teid);
if (!tunnel)
@@ -136,20 +139,47 @@ static int _gtpv1_u_recv_cb(sock_id sock, void *data)
sgw_tunnel_t *s5u_tunnel = NULL;
s5u_tunnel = sgw_s5u_tunnel_in_bearer(bearer);
d_assert(s5u_tunnel, pkbuf_free(pkbuf); return 0, "Null param");
d_assert(s5u_tunnel, pkbuf_free(pkbuf); return 0,);
d_assert(s5u_tunnel->gnode, pkbuf_free(pkbuf); return 0,);
d_assert(s5u_tunnel->gnode->sock, pkbuf_free(pkbuf); return 0,);
d_trace(3, "[SGW] SEND GPU-U to PGW[%s]: TEID[0x%x]\n",
CORE_ADDR(sock_remote_addr(s5u_tunnel->gnode->sock), buf),
s5u_tunnel->remote_teid);
gtp_h->teid = htonl(s5u_tunnel->remote_teid);
d_trace(3, "[SGW] SEND : GPDU\n");
d_trace(5, " S1U-Remote-TEID[0x%x]\n", s5u_tunnel->remote_teid);
gtp_send(s5u_tunnel->gnode, pkbuf);
}
else if (tunnel->interface_type ==
GTP_F_TEID_SGW_GTP_U_FOR_DL_DATA_FORWARDING ||
tunnel->interface_type ==
GTP_F_TEID_SGW_GTP_U_FOR_UL_DATA_FORWARDING)
{
sgw_tunnel_t *indirect_tunnel = NULL;
indirect_tunnel = sgw_tunnel_find_by_interface_type(bearer,
tunnel->interface_type);
d_assert(indirect_tunnel, pkbuf_free(pkbuf); return 0,);
d_assert(indirect_tunnel->gnode, pkbuf_free(pkbuf); return 0,);
d_assert(indirect_tunnel->gnode->sock, pkbuf_free(pkbuf); return 0,);
d_trace(3, "[SGW] SEND GPU-U to Indirect Tunnel[%s]: TEID[0x%x]\n",
CORE_ADDR(sock_remote_addr(indirect_tunnel->gnode->sock), buf),
indirect_tunnel->remote_teid);
gtp_h->teid = htonl(indirect_tunnel->remote_teid);
gtp_send(indirect_tunnel->gnode, pkbuf);
}
else if (tunnel->interface_type == GTP_F_TEID_S5_S8_SGW_GTP_U)
{
sgw_tunnel_t *s1u_tunnel = NULL;
s1u_tunnel = sgw_s1u_tunnel_in_bearer(bearer);
d_assert(s1u_tunnel, pkbuf_free(pkbuf); return 0, "Null param");
d_trace(3, "[SGW] SEND : GPDU\n");
d_trace(5, " S5U-Remote-TEID[0x%x]\n", s1u_tunnel->remote_teid);
d_assert(s1u_tunnel->gnode, pkbuf_free(pkbuf); return 0,);
d_assert(s1u_tunnel->gnode->sock, pkbuf_free(pkbuf); return 0,);
d_trace(3, "[SGW] SEND GPU-U to ENB[%s]: TEID[0x%x]\n",
CORE_ADDR(sock_remote_addr(s1u_tunnel->gnode->sock), buf),
s1u_tunnel->remote_teid);
if (s1u_tunnel->remote_teid)
{
/* If there is buffered packet, send it first */
@@ -275,6 +305,7 @@ status_t sgw_gtp_close()
status_t sgw_gtp_send_end_marker(sgw_bearer_t *bearer)
{
char buf[CORE_ADDRSTRLEN];
status_t rv;
pkbuf_t *pkbuf = NULL;
gtp_header_t *h = NULL;
@@ -283,8 +314,11 @@ status_t sgw_gtp_send_end_marker(sgw_bearer_t *bearer)
d_assert(bearer, return CORE_ERROR,);
s1u_tunnel = sgw_s1u_tunnel_in_bearer(bearer);
d_assert(s1u_tunnel, return CORE_ERROR,);
d_trace(3, "[SGW] SEND : End Marker\n");
d_assert(s1u_tunnel->gnode, return CORE_ERROR,);
d_assert(s1u_tunnel->gnode->sock, return CORE_ERROR,);
d_trace(3, "[SGW] SEND End Marker to ENB[%s]: TEID[0x%x]\n",
CORE_ADDR(sock_remote_addr(s1u_tunnel->gnode->sock), buf),
s1u_tunnel->remote_teid);
pkbuf = pkbuf_alloc(0, 100 /* enough for END_MARKER; use smaller buffer */);
d_assert(pkbuf, return CORE_ERROR,);

2
test/attach_test.c
View File

@@ -1548,10 +1548,12 @@ abts_suite *test_attach(abts_suite *suite)
suite = ADD_SUITE(suite)
abts_run_test(suite, attach_test1, NULL);
#if 0
abts_run_test(suite, attach_test2, NULL);
abts_run_test(suite, attach_test3, NULL);
abts_run_test(suite, attach_test4, NULL);
abts_run_test(suite, attach_test5, NULL);
#endif
return suite;
}