paulmataruso/open5gs
1
0
Fork 0
mirror of https://github.com/open5gs/open5gs.git synced 2025-11-04 14:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge MacOSX and FreeBSD code related tun ip config

Browse Source
This commit is contained in:
Sukchan Lee
2017-10-17 01:03:34 +09:00
parent cdbc8d1ab0
commit 291a5ce514
2 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/core/src/unix/net_lib.c
View File

@@ -1326,31 +1326,6 @@ int net_tun_set_ipv4(net_link_t *link, c_uint32_t ip_addr, c_uint8_t bits)
/* Delete previously assigned address */ /* Delete previously assigned address */
(void)ioctl(sock, SIOCDIFADDR, &ifr); (void)ioctl(sock, SIOCDIFADDR, &ifr);
#if defined(DARWIN)
(void)memset(&addr, '\0', sizeof addr);
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = ip_addr;
addr.sin_len = sizeof addr;
(void)memcpy(&ifa.ifra_addr, &addr, sizeof addr);
(void)memset(&mask, '\0', sizeof mask);
mask.sin_family = AF_INET;
mask.sin_addr.s_addr = mask_addr;
mask.sin_len = sizeof mask;
(void)memcpy(&ifa.ifra_mask, &mask, sizeof ifa.ifra_mask);
/* Simpler than calling SIOCSIFADDR and/or SIOCSIFBRDADDR */
if (ioctl(sock, SIOCSIFADDR, &ifa) == -1) {
d_error("Can't set IP/netmask");
return -1;
}
(void)memcpy(&ifr.ifr_addr, &addr, sizeof addr);
if (ioctl(sock, SIOCSIFDSTADDR, &ifr) == -1) {
d_error("Can't set dst IP/netmask");
return -1;
}
#else
(void)memset(&addr, '\0', sizeof(addr)); (void)memset(&addr, '\0', sizeof(addr));
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
addr.sin_addr.s_addr = ip_addr; addr.sin_addr.s_addr = ip_addr;
@@ -1369,7 +1344,6 @@ int net_tun_set_ipv4(net_link_t *link, c_uint32_t ip_addr, c_uint8_t bits)
link->ifname, strerror(errno)); link->ifname, strerror(errno));
return -1; return -1;
} }
#endif /* !defined(DARWIN) */
close(sock); /* AF_INET, SOCK_DGRAM */ close(sock); /* AF_INET, SOCK_DGRAM */
@@ -1429,7 +1403,6 @@ int net_tun_set_ipv4(net_link_t *link, c_uint32_t ip_addr, c_uint8_t bits)
return 0; return 0;
} }
#if LINUX == 1 #if LINUX == 1
int net_link_open(net_link_t **net_link, char *device, int proto) int net_link_open(net_link_t **net_link, char *device, int proto)
{ {

2
test/Makefile.am
View File

@@ -28,7 +28,7 @@ AM_CPPFLAGS = \
@MONGOC_CFLAGS@ @MONGOC_CFLAGS@
AM_CFLAGS = \ AM_CFLAGS = \
-Wall -Werror @OSCPPFLAGS@ \ -Wall -Werror
-Wno-unused-function -Wno-unused-variable -Wno-unused-function -Wno-unused-variable
AM_LDFLAGS = -export-dynamic AM_LDFLAGS = -export-dynamic