acouzens
/
open5gs
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

gtp_node_t memset is added

This commit is contained in:
Sukchan Lee 2017-12-02 12:01:43 +09:00
parent 4a2604b52c
commit 3ae058dc63
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/gtp/gtp_path.c
View File

@ -151,14 +151,23 @@ status_t gtp_send(gtp_node_t *gnode, pkbuf_t *pkbuf)
sock = gnode->sock;
d_assert(sock, return CORE_ERROR, "Null param");
sent = core_sendto(sock, pkbuf->payload, pkbuf->len, 0, &gnode->old_addr);
d_trace(50, "Sent %d->%d bytes to [%s:%d]\n", pkbuf->len, sent,
CORE_ADDR(&gnode->old_addr, buf), CORE_PORT(&gnode->old_addr));
d_trace_hex(50, pkbuf->payload, pkbuf->len);
if (sent < 0 || sent != pkbuf->len)
if (gnode->addr)
{
d_error("core_sendto failed(%d:%s)", errno, strerror(errno));
return CORE_ERROR;
/* New interface */
d_assert(0, return CORE_ERROR,);
}
else
{
/* Old interface : Will be removed */
sent = core_sendto(sock, pkbuf->payload, pkbuf->len, 0, &gnode->old_addr);
d_trace(50, "Sent %d->%d bytes to [%s:%d]\n", pkbuf->len, sent,
CORE_ADDR(&gnode->old_addr, buf), CORE_PORT(&gnode->old_addr));
d_trace_hex(50, pkbuf->payload, pkbuf->len);
if (sent < 0 || sent != pkbuf->len)
{
d_error("core_sendto failed(%d:%s)", errno, strerror(errno));
return CORE_ERROR;
}
}
return CORE_OK;

2
src/pgw/pgw_gtp_path.c
View File

@ -40,6 +40,8 @@ static int _gtpv1_tun_recv_cb(sock_id sock, void *data)
gtp_node_t gnode;
char buf[INET_ADDRSTRLEN];
memset(&gnode, 0, sizeof(gtp_node_t));
/* Add GTP-U header */
rv = pkbuf_header(recvbuf, GTPV1U_HEADER_LEN);
if (rv != CORE_OK)

2
src/sgw/sgw_gtp_path.c
View File

@ -73,6 +73,7 @@ static int _gtpv1_u_recv_cb(sock_id sock, void *data)
int i;
d_assert(sock, return -1, "Null param");
memset(&gnode, 0, sizeof(gtp_node_t));
rv = gtp_recvfrom(sock, &pkbuf, &from);
if (rv != CORE_OK)
@ -295,6 +296,7 @@ status_t sgw_gtp_send_end_marker(sgw_bearer_t *bearer)
h->type = GTPU_MSGTYPE_END_MARKER;
h->teid = htonl(s1u_tunnel->remote_teid);
memset(&gnode, 0, sizeof(gtp_node_t));
gnode.old_addr.sin.sin_addr.s_addr = s1u_tunnel->remote_addr;
gnode.old_addr.c_sa_port = htons(GTPV1_U_UDP_PORT);
gnode.old_addr.c_sa_family = AF_INET;