From a449a6e47897833b01ec529f9316cdbc3616a975 Mon Sep 17 00:00:00 2001
From: Lionel Gauthier <lionel.gauthier@eurecom.fr>
Date: Fri, 15 May 2015 10:08:07 +0000
Subject: [PATCH] Do not rmmod GTPUAH kernel module, it hang (TODO)
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7422 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair-cn/SGW-LITE/sgw_lite_task.c | 1 -
openair-cn/SGW-LITE/spgw_config.c | 10 +++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/openair-cn/SGW-LITE/sgw_lite_task.c b/openair-cn/SGW-LITE/sgw_lite_task.c
index 7d1c658478..9d5698b4b6 100644
--- a/openair-cn/SGW-LITE/sgw_lite_task.c
+++ b/openair-cn/SGW-LITE/sgw_lite_task.c
@@ -155,7 +155,6 @@ int sgw_lite_init(char* config_file_name_pP)
spgw_system("iptables -t filter -Z", SPGW_WARN_ON_ERROR, __FILE__, __LINE__);
spgw_system("iptables -t raw -Z", SPGW_WARN_ON_ERROR, __FILE__, __LINE__);
spgw_system("ip route flush cache", SPGW_WARN_ON_ERROR, __FILE__, __LINE__);
- spgw_system("rmmod xt_GTPUAH xt_GTPURH > /dev/null 2>&1", SPGW_WARN_ON_ERROR, __FILE__, __LINE__);
spgw_system("rmmod iptable_raw > /dev/null 2>&1", SPGW_WARN_ON_ERROR, __FILE__, __LINE__);
spgw_system("rmmod iptable_mangle > /dev/null 2>&1", SPGW_WARN_ON_ERROR, __FILE__, __LINE__);
spgw_system("rmmod iptable_nat > /dev/null 2>&1", SPGW_WARN_ON_ERROR, __FILE__, __LINE__);
diff --git a/openair-cn/SGW-LITE/spgw_config.c b/openair-cn/SGW-LITE/spgw_config.c
index e7a21149c5..57e2569a72 100755
--- a/openair-cn/SGW-LITE/spgw_config.c
+++ b/openair-cn/SGW-LITE/spgw_config.c
@@ -173,7 +173,7 @@ int spgw_config_process(spgw_config_t* config_pP)
"insmod $OPENAIR_TARGETS/bin/xt_GTPUAH.ko gtpu_enb_port=2152 gtpu_sgw_port=%u sgw_addr=\"%s\" ",
config_pP->sgw_config.sgw_udp_port_for_S1u_S12_S4_up,
inet_ntoa(inaddr)) > 0) {
- ret += spgw_system(system_cmd, SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
+ ret += spgw_system(system_cmd, SPGW_WARN_ON_ERROR, __FILE__, __LINE__);
} else {
SPGW_APP_ERROR("GTPUAH kernel module\n");
ret = -1;
@@ -192,9 +192,9 @@ int spgw_config_process(spgw_config_t* config_pP)
}
if (snprintf(system_cmd, 256,
- "iptables -t filter -I INPUT -i lo -s %s --protocol sctp -j DROP",
- inet_ntoa(inaddr)) > 0) {
- ret += spgw_system(system_cmd, SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
+ "iptables -t filter -I INPUT -i lo -s %s --protocol sctp -j DROP",
+ inet_ntoa(inaddr)) > 0) {
+ ret += spgw_system(system_cmd, SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
} else {
SPGW_APP_ERROR("Drop SCTP traffic on S1U\n");
ret = -1;
@@ -204,7 +204,7 @@ int spgw_config_process(spgw_config_t* config_pP)
"insmod $OPENAIR_TARGETS/bin/xt_GTPUAH.ko gtpu_enb_port=2153 gtpu_sgw_port=%u sgw_addr=\"%s\" ",
config_pP->sgw_config.sgw_udp_port_for_S1u_S12_S4_up,
inet_ntoa(inaddr)) > 0) {
- ret += spgw_system(system_cmd, SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
+ ret += spgw_system(system_cmd, SPGW_WARN_ON_ERROR, __FILE__, __LINE__);
} else {
SPGW_APP_ERROR("GTPUAH kernel module\n");
ret = -1;
--
GitLab