git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6293 818b1a75-f10b-46b9-bf7c-635c3b92a50f

openair-cn/SGW-LITE/sgw_lite_handlers.c

@@ -671,7 +671,7 @@ sgw_lite_handle_sgi_endpoint_updated(
 #if defined (ENABLE_USE_GTPU_IN_KERNEL)
             ret = snprintf(cmd,
                     256,
-                    "iptables -t mangle -A POSTROUTING -d %u.%u.%u.%u -m mark --mark %u -j GTPUAH --own-ip %u.%u.%u.%u --own-tun %u --peer-ip %u.%u.%u.%u --peer-tun %u --action add",
+                    "iptables -t mangle -I POSTROUTING -d %u.%u.%u.%u -m mark --mark %u -j GTPUAH --own-ip %u.%u.%u.%u --own-tun %u --peer-ip %u.%u.%u.%u --peer-tun %u --action add",
                     eps_bearer_entry_p->paa.ipv4_address[0],
                     eps_bearer_entry_p->paa.ipv4_address[1],
                     eps_bearer_entry_p->paa.ipv4_address[2],
@@ -736,7 +736,7 @@ sgw_lite_handle_sgi_endpoint_updated(
 
                 ret = snprintf(cmd,
                                    256,
-                                   "iptables -t raw -A %s -s %u.%u.%u.%u -d %u.%u.%u.%u -p udp --dport 2152 -j GTPURH --own-ip %u.%u.%u.%u --own-tun %u --peer-ip %u.%u.%u.%u --peer-tun %u --action remove",
+                                   "iptables -t raw -I %s -s %u.%u.%u.%u -d %u.%u.%u.%u -p udp --dport 2152 -j GTPURH --own-ip %u.%u.%u.%u --own-tun %u --peer-ip %u.%u.%u.%u --peer-tun %u --action remove",
                                    chain,
                                    eps_bearer_entry_p->enb_ip_address_for_S1u.address.ipv4_address[0],
                                    eps_bearer_entry_p->enb_ip_address_for_S1u.address.ipv4_address[1],

openair-cn/SGW-LITE/spgw_config.c

@@ -272,7 +272,6 @@ int spgw_config_process(spgw_config_t* config_pP) {
     }
 #if defined (ENABLE_USE_GTPU_IN_KERNEL)
     if (snprintf(system_cmd, 256,
-                 //"iptables -I POSTROUTING -t mangle -o %s -m state --state NEW  -m mark ! --mark 0 ! --protocol sctp  -j CONNMARK --save-mark",
                  "iptables -I POSTROUTING -t mangle -o %s -m mark ! --mark 0 ! --protocol sctp  -j CONNMARK --save-mark",
                  config_pP->pgw_config.ipv4.pgw_interface_name_for_SGI) > 0) {
         ret += spgw_system(system_cmd, SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
@@ -297,54 +296,6 @@ int spgw_config_process(spgw_config_t* config_pP) {
         SPGW_APP_ERROR("Restore mark\n");
         ret = -1;
     }
-
-    /*// Mark already there
-    if (snprintf(system_cmd, 256,
-                     "iptables -I INPUT -t mangle  ! --protocol sctp  -j CONNMARK --restore-mark") > 0) {
-            ret += spgw_system(system_cmd, SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
-    } else {
-            SPGW_APP_ERROR("iptables -I INPUT -t mangle  ! --protocol sctp  -j CONNMARK --restore-mark\n");
-            ret = -1;
-    }*/
-
-    ret += spgw_system("iptables -X INGTPU", SPGW_WARN_ON_ERROR, __FILE__, __LINE__);
-    ret += spgw_system("iptables -N INGTPU", SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
-    if (snprintf(system_cmd, 256,
-                 "iptables -I INPUT  --protocol udp --destination-port 2152  -j INGTPU") > 0) {
-        ret += spgw_system(system_cmd, SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
-    } else {
-        SPGW_APP_ERROR("Trace IP traffic mark\n");
-        ret = -1;
-    }
-    ret += spgw_system("iptables -A INGTPU  -j LOG --log-prefix ' INGTPU ' --log-ip-options --log-level 4", SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
-    //ret += spgw_system("iptables -A INGTPU  -j ACCEPT", SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
-
-
-    ret += spgw_system("iptables -X OUTGTPU", SPGW_WARN_ON_ERROR, __FILE__, __LINE__);
-    ret += spgw_system("iptables -N OUTGTPU", SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
-    if (snprintf(system_cmd, 256,
-                 "iptables -I OUTPUT  --protocol udp --destination-port 2152  -j OUTGTPU") > 0) {
-        ret += spgw_system(system_cmd, SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
-    } else {
-        SPGW_APP_ERROR("Trace IP traffic mark\n");
-        ret = -1;
-    }
-    ret += spgw_system("iptables -A OUTGTPU  -j LOG --log-prefix ' OUTGTPU ' --log-ip-options --log-level 4", SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
-    //ret += spgw_system("iptables -A OUTGTPU  -j ACCEPT", SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
-
-
-    ret += spgw_system("iptables -X FW", SPGW_WARN_ON_ERROR, __FILE__, __LINE__);
-    ret += spgw_system("iptables -N FW", SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
-    if (snprintf(system_cmd, 256,
-                 "iptables -I FORWARD   -j FW") > 0) {
-        ret += spgw_system(system_cmd, SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
-    } else {
-        SPGW_APP_ERROR("Trace IP traffic mark\n");
-        ret = -1;
-    }
-    ret += spgw_system("iptables -A FW  -j LOG --log-prefix ' FW ' --log-ip-options --log-level 4", SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
-    //ret += spgw_system("iptables -A FW  -j ACCEPT", SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
-
 #endif
    return ret;
 }
@@ -594,7 +545,6 @@ int spgw_config_init(char* lib_config_file_name_pP, spgw_config_t* config_pP) {
                   astring = config_setting_get_string_elem(sub2setting,i);
                   if (astring != NULL) {
                       trim(astring, strlen(astring)+1);
-                      if (inet_pton(AF_INET, astring, buf_in_addr) < 1) {
                       // failure, test if there is a range specified in the string
                       atoken = strtok(astring, PGW_CONFIG_STRING_IPV4_PREFIX_DELIMITER);
                       if (inet_pton(AF_INET, atoken, buf_in_addr) == 1) {
@@ -657,24 +607,6 @@ int spgw_config_init(char* lib_config_file_name_pP, spgw_config_t* config_pP) {
                           } else {
                               SPGW_APP_ERROR("CONFIG POOL ADDR IPV4: BAD MASQ: %s\n", atoken2);
                           }
-                          } else {
-                              SPGW_APP_ERROR("CONFIG POOL ADDR IPV4: ADDR not recognized: %s\n", atoken);
-                          }
-                      } else {
-                          memcpy (&addr_start, buf_in_addr, sizeof(struct in_addr));
-                          ip4_ref = calloc(1, sizeof(pgw_lite_conf_ipv4_list_elm_t));
-                          ip4_ref->addr = addr_start;
-                          STAILQ_INSERT_TAIL(&config_pP->pgw_config.pgw_lite_ipv4_pool_list, ip4_ref, ipv4_entries);
-#if defined (ENABLE_USE_GTPU_IN_KERNEL)
-                          /*if (snprintf(system_cmd, 128, "ip route add %s dev %s",
-                                  buf_in_addr,
-                                  config_pP->sgw_config.ipv4.sgw_interface_name_for_S1u_S12_S4_up) > 0) {
-                              SPGW_APP_INFO("Add route: %s\n",system_cmd);
-                              spgw_system(system_cmd, SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
-                          } else {
-                              SPGW_APP_ERROR("Add route: for %s\n", buf_in_addr);
-                          }*/
-#endif
                       }
                   }
               }