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

Change default to bindtodevice:false

This commit is contained in:
Sukchan Lee 2022-03-08 19:49:16 +09:00
parent 914bb0a40f
commit c1fc25958c
13 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/open5gs/amf.yaml.in
View File

@ -290,7 +290,7 @@ pool:
# #
# sockopt: # sockopt:
# no_delay : true # no_delay : true
# so_bindtodevice : true # bindtodevice : false
# #
sockopt: sockopt:

2
configs/open5gs/mme.yaml.in
View File

@ -388,7 +388,7 @@ pool:
# #
# sockopt: # sockopt:
# no_delay : true # no_delay : true
# so_bindtodevice : true # bindtodevice : false
# #
sockopt: sockopt:

2
configs/open5gs/sgwc.yaml.in
View File

@ -162,7 +162,7 @@ pool:
# #
# sockopt: # sockopt:
# so_bindtodevice : true # bindtodevice : false
# #
sockopt: sockopt:

2
configs/open5gs/sgwu.yaml.in
View File

@ -152,7 +152,7 @@ pool:
# #
# sockopt: # sockopt:
# no_delay : true # no_delay : true
# so_bindtodevice : true # bindtodevice : false
# #
sockopt: sockopt:

2
configs/open5gs/smf.yaml.in
View File

@ -500,7 +500,7 @@ pool:
# #
# sockopt: # sockopt:
# so_bindtodevice : true # bindtodevice : false
# #
sockopt: sockopt:

2
configs/open5gs/upf.yaml.in
View File

@ -222,7 +222,7 @@ pool:
# #
# sockopt: # sockopt:
# so_bindtodevice : true # bindtodevice : false
# #
sockopt: sockopt:

6
lib/app/ogs-context.c
View File

@ -187,7 +187,7 @@ static void app_context_prepare(void)
self.sctp.max_initial_timeout = 8000; /* 8 seconds */ self.sctp.max_initial_timeout = 8000; /* 8 seconds */
self.sockopt.no_delay = true; self.sockopt.no_delay = true;
self.sockopt.so_bindtodevice = true; self.sockopt.bindtodevice = false;
#define MAX_NUM_OF_UE 1024 /* Num of UE per AMF/MME */ #define MAX_NUM_OF_UE 1024 /* Num of UE per AMF/MME */
#define MAX_NUM_OF_GNB 64 /* Num of gNB per AMF/MME */ #define MAX_NUM_OF_GNB 64 /* Num of gNB per AMF/MME */
@ -377,8 +377,8 @@ int ogs_app_context_parse_config(void)
const char *v = ogs_yaml_iter_value(&sockopt_iter); const char *v = ogs_yaml_iter_value(&sockopt_iter);
if (v) self.sockopt.l_linger = atoi(v); if (v) self.sockopt.l_linger = atoi(v);
self.sockopt.l_onoff = true; self.sockopt.l_onoff = true;
} else if (!strcmp(sockopt_key, "so_bindtodevice")) { } else if (!strcmp(sockopt_key, "bindtodevice")) {
self.sockopt.so_bindtodevice = self.sockopt.bindtodevice =
ogs_yaml_iter_bool(&sockopt_iter); ogs_yaml_iter_bool(&sockopt_iter);
} else } else
ogs_warn("unknown key `%s`", sockopt_key); ogs_warn("unknown key `%s`", sockopt_key);

2
lib/app/ogs-context.h
View File

@ -84,7 +84,7 @@ typedef struct ogs_app_context_s {
int no_delay; int no_delay;
int l_onoff; int l_onoff;
int l_linger; int l_linger;
int so_bindtodevice; int bindtodevice;
} sockopt; } sockopt;
struct { struct {

2
lib/core/ogs-socket.c
View File

@ -347,7 +347,7 @@ int ogs_bind_to_device(ogs_socket_t fd, const char *device)
ogs_error("OR disable SO_BINDTODEVICE " ogs_error("OR disable SO_BINDTODEVICE "
"in the configuration file as below."); "in the configuration file as below.");
ogs_log_print(OGS_LOG_ERROR, "\nsockopt:\n"); ogs_log_print(OGS_LOG_ERROR, "\nsockopt:\n");
ogs_log_print(OGS_LOG_ERROR, " so_bindtodevice : false\n\n"); ogs_log_print(OGS_LOG_ERROR, " bindtodevice : false\n\n");
return OGS_ERROR; return OGS_ERROR;
} }
#endif #endif

4
lib/core/ogs-udp.c
View File

@ -33,7 +33,7 @@ ogs_sock_t *ogs_udp_socket(int family, ogs_socknode_t *node)
return sock; return sock;
} }
ogs_sock_t *ogs_udp_server(ogs_socknode_t *node, bool so_bindtodevice) ogs_sock_t *ogs_udp_server(ogs_socknode_t *node, bool bindtodevice)
{ {
ogs_sock_t *new = NULL; ogs_sock_t *new = NULL;
ogs_sockaddr_t *addr; ogs_sockaddr_t *addr;
@ -55,7 +55,7 @@ ogs_sock_t *ogs_udp_server(ogs_socknode_t *node, bool so_bindtodevice)
continue; continue;
} }
ogs_debug("udp_server() [%s]:%d", OGS_ADDR(addr, buf), OGS_PORT(addr)); ogs_debug("udp_server() [%s]:%d", OGS_ADDR(addr, buf), OGS_PORT(addr));
if (so_bindtodevice == true && node->dev) { if (bindtodevice == true && node->dev) {
if (ogs_bind_to_device(new->fd, node->dev) != OGS_OK) { if (ogs_bind_to_device(new->fd, node->dev) != OGS_OK) {
ogs_sock_destroy(new); ogs_sock_destroy(new);
addr = addr->next; addr = addr->next;

2
lib/core/ogs-udp.h
View File

@ -29,7 +29,7 @@ extern "C" {
#endif #endif
ogs_sock_t *ogs_udp_socket(int family, ogs_socknode_t *node); ogs_sock_t *ogs_udp_socket(int family, ogs_socknode_t *node);
ogs_sock_t *ogs_udp_server(ogs_socknode_t *node, bool so_bindtodevice); ogs_sock_t *ogs_udp_server(ogs_socknode_t *node, bool bindtodevice);
ogs_sock_t *ogs_udp_client(ogs_socknode_t *node); ogs_sock_t *ogs_udp_client(ogs_socknode_t *node);
int ogs_udp_connect(ogs_sock_t *sock, ogs_sockaddr_t *sa_list); int ogs_udp_connect(ogs_sock_t *sock, ogs_sockaddr_t *sa_list);

2
lib/gtp/path.c
View File

@ -25,7 +25,7 @@ ogs_sock_t *ogs_gtp_server(ogs_socknode_t *node)
ogs_sock_t *gtp; ogs_sock_t *gtp;
ogs_assert(node); ogs_assert(node);
gtp = ogs_udp_server(node, ogs_app()->sockopt.so_bindtodevice); gtp = ogs_udp_server(node, ogs_app()->sockopt.bindtodevice);
if (gtp) { if (gtp) {
ogs_info("gtp_server() [%s]:%d", ogs_info("gtp_server() [%s]:%d",
OGS_ADDR(node->addr, buf), OGS_PORT(node->addr)); OGS_ADDR(node->addr, buf), OGS_PORT(node->addr));

2
lib/pfcp/path.c
View File

@ -25,7 +25,7 @@ ogs_sock_t *ogs_pfcp_server(ogs_socknode_t *node)
ogs_sock_t *pfcp; ogs_sock_t *pfcp;
ogs_assert(node); ogs_assert(node);
pfcp = ogs_udp_server(node, ogs_app()->sockopt.so_bindtodevice); pfcp = ogs_udp_server(node, ogs_app()->sockopt.bindtodevice);
if (pfcp) { if (pfcp) {
ogs_info("pfcp_server() [%s]:%d", ogs_info("pfcp_server() [%s]:%d",
OGS_ADDR(node->addr, buf), OGS_PORT(node->addr)); OGS_ADDR(node->addr, buf), OGS_PORT(node->addr));