sysmocom
/
open5gs
forked from acouzens/open5gs
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename sa_family and sin_port

This commit is contained in:
Sukchan Lee 2019-05-30 13:50:53 +09:00
parent 8b782eb370
commit 3da632dd1e
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/gtp/gtp_conv.c
View File

@ -66,13 +66,13 @@ int gtp_f_teid_to_sockaddr(
addr = ogs_calloc(1, sizeof(ogs_sockaddr_t));
ogs_assert(addr);
addr->c_sa_family = AF_INET;
addr->c_sa_port = htons(port);
addr->ogs_sa_family = AF_INET;
addr->ogs_sin_port = htons(port);
addr6 = ogs_calloc(1, sizeof(ogs_sockaddr_t));
ogs_assert(addr6);
addr6->c_sa_family = AF_INET6;
addr6->c_sa_port = htons(port);
addr6->ogs_sa_family = AF_INET6;
addr6->ogs_sin_port = htons(port);
if (f_teid->ipv4 && f_teid->ipv6)
{

4
lib/gtp/gtp_path.c
View File

@ -66,8 +66,8 @@ int gtp_connect(ogs_sock_t *ipv4, ogs_sock_t *ipv6, gtp_node_t *gnode)
{
ogs_sock_t *sock = NULL;
if (addr->c_sa_family == AF_INET) sock = ipv4;
else if (addr->c_sa_family == AF_INET6) sock = ipv6;
if (addr->ogs_sa_family == AF_INET) sock = ipv4;
else if (addr->ogs_sa_family == AF_INET6) sock = ipv6;
else
ogs_assert_if_reached();

2
lib/ogslib

@ -1 +1 @@
Subproject commit 2a14ee683e2ac95203644d9d6ac7c852d473288d
Subproject commit 524af14708debad9be486bcfac62c8d1e719ebd5

2
src/mme/mme_context.c
View File

@ -1379,7 +1379,7 @@ ogs_sockaddr_t *mme_pgw_addr_find_by_apn(
ogs_sockaddr_t *addr = pgw->gnode->sa_list;
while (addr) {
if (addr->c_sa_family == family &&
if (addr->ogs_sa_family == family &&
(!apn || (pgw->apn && !strcmp(apn, pgw->apn)))) {
return addr;
}

6
src/mme/mme_fd_path.c
View File

@ -926,13 +926,13 @@ static void mme_s6a_ula_cb(void *data, struct msg **msg)
ret = fd_msg_avp_value_interpret(avpch4,
&addr.sa);
ogs_assert(ret == 0);
if (addr.c_sa_family == AF_INET)
if (addr.ogs_sa_family == AF_INET)
{
pdn->pgw_ip.ipv4 = 1;
pdn->pgw_ip.both.addr =
addr.sin.sin_addr.s_addr;
}
else if (addr.c_sa_family == AF_INET6)
else if (addr.ogs_sa_family == AF_INET6)
{
pdn->pgw_ip.ipv6 = 1;
memcpy(pdn->pgw_ip.both.addr6,
@ -942,7 +942,7 @@ static void mme_s6a_ula_cb(void *data, struct msg **msg)
else
{
ogs_error("Invald family:%d",
addr.c_sa_family);
addr.ogs_sa_family);
error++;
}
break;

8
src/mme/s1ap_usrsctp.c
View File

@ -94,7 +94,7 @@ ogs_sock_t *ogs_sctp_server(int type, ogs_sockaddr_t *sa_list)
while(addr)
{
sock = s1ap_usrsctp_socket(
addr->c_sa_family, type, s1ap_usrsctp_recv_handler);
addr->ogs_sa_family, type, s1ap_usrsctp_recv_handler);
if (sock)
{
if (s1ap_usrsctp_bind(sock, addr) == OGS_OK)
@ -132,7 +132,7 @@ ogs_sock_t *ogs_sctp_client(int type, ogs_sockaddr_t *sa_list)
addr = sa_list;
while(addr)
{
sock = s1ap_usrsctp_socket(addr->c_sa_family, type, NULL);
sock = s1ap_usrsctp_socket(addr->ogs_sa_family, type, NULL);
if (sock)
{
if (s1ap_usrsctp_connect(sock, addr) == OGS_OK)
@ -564,8 +564,8 @@ static ogs_sockaddr_t *usrsctp_remote_addr(union sctp_sockstore *store)
addr = ogs_calloc(1, sizeof(ogs_sockaddr_t));
ogs_assert(addr);
addr->c_sa_family = store->sin.sin_family;
switch(addr->c_sa_family)
addr->ogs_sa_family = store->sin.sin_family;
switch(addr->ogs_sa_family)
{
case AF_INET:
memcpy(&addr->sin, &store->sin, sizeof(struct sockaddr_in));

6
test/common/testpacket.c
View File

@ -148,10 +148,10 @@ int testenb_gtpu_send(ogs_sock_t *sock, ogs_pkbuf_t *sendbuf)
ogs_assert(bearer);
memset(&sgw, 0, sizeof(ogs_sockaddr_t));
sgw.c_sa_port = htons(GTPV1_U_UDP_PORT);
sgw.ogs_sin_port = htons(GTPV1_U_UDP_PORT);
if (bearer->sgw_s1u_ip.ipv6)
{
sgw.c_sa_family = AF_INET6;
sgw.ogs_sa_family = AF_INET6;
if (bearer->sgw_s1u_ip.ipv4)
memcpy(sgw.sin6.sin6_addr.s6_addr,
bearer->sgw_s1u_ip.both.addr6, IPV6_LEN);
@ -163,7 +163,7 @@ int testenb_gtpu_send(ogs_sock_t *sock, ogs_pkbuf_t *sendbuf)
}
else
{
sgw.c_sa_family = AF_INET;
sgw.ogs_sa_family = AF_INET;
sgw.sin.sin_addr.s_addr = bearer->sgw_s1u_ip.addr;
}