Skip to content

O
OpenXG-RAN
Commit 8c5976e2 authored by Robert Schmidt's avatar Robert Schmidt
Browse files
Options

Use "ip add" to add IP addresses 

This then only uses the "modern" ip tool instead of ifconfig, and the
command is more "homogeneous".
parent 29895650
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 16 deletions
openair3/NAS/UE/ESM/esm_ebr_context.c
View file @ 8c5976e2
...@@ -196,7 +196,7 @@ int esm_ebr_context_create( ...@@ -196,7 +196,7 @@ int esm_ebr_context_create(
char *tmp = NULL; char *tmp = NULL;
char ipv4_addr[INET_ADDRSTRLEN]; char ipv4_addr[INET_ADDRSTRLEN];
//char ipv6_addr[INET6_ADDRSTRLEN]; //char ipv6_addr[INET6_ADDRSTRLEN];
char *netmask = NULL; int netmask = 32;
char broadcast[INET_ADDRSTRLEN]; char broadcast[INET_ADDRSTRLEN];
struct in_addr in_addr; struct in_addr in_addr;
char command_line[500]; char command_line[500];
...@@ -223,7 +223,7 @@ int esm_ebr_context_create( ...@@ -223,7 +223,7 @@ int esm_ebr_context_create(
strcpy(ipv4_addr, tmp); strcpy(ipv4_addr, tmp);
if (IN_CLASSA(ntohl(in_addr.s_addr))) { if (IN_CLASSA(ntohl(in_addr.s_addr))) {
netmask = "255.0.0.0"; netmask = 8;
in_addr.s_addr = pdn->ip_addr[0] << 24 | in_addr.s_addr = pdn->ip_addr[0] << 24 |
((255 << 16) & 0x00FF0000) | ((255 << 16) & 0x00FF0000) |
((255 << 8) & 0x0000FF00) | ((255 << 8) & 0x0000FF00) |
...@@ -235,7 +235,7 @@ int esm_ebr_context_create( ...@@ -235,7 +235,7 @@ int esm_ebr_context_create(
// in_addr.s_addr); // in_addr.s_addr);
strcpy(broadcast, tmp); strcpy(broadcast, tmp);
} else if (IN_CLASSB(ntohl(in_addr.s_addr))) { } else if (IN_CLASSB(ntohl(in_addr.s_addr))) {
netmask = "255.255.0.0"; netmask = 16;
in_addr.s_addr = pdn->ip_addr[0] << 24 | in_addr.s_addr = pdn->ip_addr[0] << 24 |
((pdn->ip_addr[1] << 16) & 0x00FF0000) | ((pdn->ip_addr[1] << 16) & 0x00FF0000) |
((255 << 8) & 0x0000FF00) | ((255 << 8) & 0x0000FF00) |
...@@ -247,7 +247,7 @@ int esm_ebr_context_create( ...@@ -247,7 +247,7 @@ int esm_ebr_context_create(
// in_addr.s_addr); // in_addr.s_addr);
strcpy(broadcast, tmp); strcpy(broadcast, tmp);
} else if (IN_CLASSC(ntohl(in_addr.s_addr))) { } else if (IN_CLASSC(ntohl(in_addr.s_addr))) {
netmask = "255.255.255.0"; netmask = 24;
in_addr.s_addr = pdn->ip_addr[0] << 24 | in_addr.s_addr = pdn->ip_addr[0] << 24 |
((pdn->ip_addr[1] << 16) & 0x00FF0000) | ((pdn->ip_addr[1] << 16) & 0x00FF0000) |
((pdn->ip_addr[2] << 8) & 0x0000FF00) | ((pdn->ip_addr[2] << 8) & 0x0000FF00) |
...@@ -259,21 +259,24 @@ int esm_ebr_context_create( ...@@ -259,21 +259,24 @@ int esm_ebr_context_create(
// in_addr.s_addr); // in_addr.s_addr);
strcpy(broadcast, tmp); strcpy(broadcast, tmp);
} else { } else {
netmask = "255.255.255.255"; netmask = 32;
strcpy(broadcast, ipv4_addr); strcpy(broadcast, ipv4_addr);
} }
res = sprintf(command_line, uint8_t if_num = ueid % MAX_NUMBER_NETIF + 1;
"ifconfig %s%d %s netmask %s broadcast %s up && " res = sprintf(command_line,
"ip rule add from %s/32 table %d && " "ip address add %s/%d broadcast %s dev %s%d && "
"ip rule add to %s/32 table %d && " "ip link set %s%d up && "
"ip route add default dev %s%d table %d", "ip rule add from %s/32 table %d && "
UE_NAS_USE_TUN?"oaitun_ue":"oip", "ip rule add to %s/32 table %d && "
ueid + 1, ipv4_addr, netmask, broadcast, "ip route add default dev %s%d table %d",
ipv4_addr, ueid + 201, ipv4_addr, netmask, broadcast,
ipv4_addr, ueid + 201, UE_NAS_USE_TUN ? "oaitun_ue" : "oip", if_num,
UE_NAS_USE_TUN?"oaitun_ue":"oip", UE_NAS_USE_TUN ? "oaitun_ue" : "oip", if_num,
ueid + 1, ueid + 201); ipv4_addr, ueid + 10000,
ipv4_addr, ueid + 10000,
UE_NAS_USE_TUN ? "oaitun_ue" : "oip",
if_num, ueid + 10000);
if ( res<0 ) { if ( res<0 ) {
LOG_TRACE(WARNING, "ESM-PROC - Failed to system command string"); LOG_TRACE(WARNING, "ESM-PROC - Failed to system command string");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment