Rework of GTPU in kernel (now use UDP socket, kthread for rx),

No need for GTPURH kernel module (work done in GTPUAH, will change module name later).
still classification with iptables mark, conntrack.
Tested with EPC local to eNB, test with remote EPC after this commit.

Added srb1 parameters in enb config file,

Correction of mscgen traces

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

cmake_targets/tools/build_epc

@@ -215,35 +215,12 @@ function main()
     $SUDO rm -f /usr/etc/freeDiameter/epc*    2>&1
     $SUDO rm -f $OPENAIR_DIR/targets/bin/xt_GTPU*.ko    2>&1
     (cd $OPENAIRCN_DIR/GTPV1-U/GTPUAH && $SUDO make clean)
-    (cd $OPENAIRCN_DIR/GTPV1-U/GTPURH && $SUDO make clean)
     $SUDO rm -f $OPENAIRCN_DIR/GTPV1-U/GTPUAH/Bin/* 2>&1
     $SUDO rm -f /lib/xtables/libxt_GTPU*.so             2>&1
     mkdir -m 777 -p -v build
   fi
   
-  ##############################################################################
-  # Compile kernel modules
-  ##############################################################################
-  # NO CMAKE FOR THAT, THIS CODE CAN DISAPEAR
-  #cd $OPENAIRCN_DIR/GTPV1-U/GTPUAH;
-  #make
-  #if [ $? -ne 0 ]; then
-  #  echo_error "Build GTPUAH module failed, exiting"
-  #  return 1
-  #else 
-  #  $SUDO cp -pfv ./Bin/libxt_*.so /lib/xtables
-  #  $SUDO cp -pfv ./Bin/*.ko $OPENAIR_TARGETS/bin
-  #fi
-    
-  #cd $OPENAIRCN_DIR/GTPV1-U/GTPURH;
-  #make
-  #if [ $? -ne 0 ]; then
-  #  echo_error "Build GTPURH module failed, exiting"
-  #  return 1
-  #else 
-  #  $SUDO cp -pfv ./Bin/libxt_*.so /lib/xtables
-  #  $SUDO cp -pfv ./Bin/*.ko $OPENAIR_TARGETS/bin
-  #fi
+
   
   
   
@@ -272,20 +249,13 @@ function main()
   compilations \
     epc_build_oai xt_GTPUAH_lib \
     libxt_GTPUAH_lib.so $dbin
-  compilations \
-    epc_build_oai xt_GTPURH_lib \
-    libxt_GTPURH_lib.so $dbin
-  compilations \
-    epc_build_oai xt_GTPURH \
-    CMakeFiles/xt_GTPURH/xt_GTPURH.ko $dbin
   compilations \
     epc_build_oai xt_GTPUAH \
     CMakeFiles/xt_GTPUAH/xt_GTPUAH.ko $dbin
     
   echo_info "Copying iptables libraries into system directory: /lib/xtables"
-  if [ -f  $dbin/libxt_GTPURH_lib.so ] ; then
-    $SUDO rm -f /lib/xtables/libxt_GTPURH.so /lib/xtables/libxt_GTPUAH.so
-    $SUDO ln -s $dbin/libxt_GTPURH_lib.so /lib/xtables/libxt_GTPURH.so
+  if [ -f  $dbin/libxt_GTPUAH_lib.so ] ; then
+    $SUDO rm -f /lib/xtables/libxt_GTPUAH.so
     $SUDO ln -s $dbin/libxt_GTPUAH_lib.so /lib/xtables/libxt_GTPUAH.so
   else
     echo_fatal "not installed GTP-U iptables: binaries not found"

cmake_targets/tools/epc.conf.in

@@ -92,7 +92,6 @@ S-GW :
         SGW_IPV4_ADDRESS_FOR_S11                = "0.0.0.0/24";
 
         SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP    = "eth2";
-        SGW_INTERFACE_MTU_FOR_S1U_S12_S4_UP     = 1564
 
         SGW_IPV4_ADDRESS_FOR_S1U_S12_S4_UP      = "192.168.27.101/24";
         # TODO  PORT NUMBER
@@ -115,7 +114,7 @@ P-GW =
         PGW_IPV4_ADDRESS_FOR_S5_S8            = "0.0.0.0/24";
 
         PGW_INTERFACE_NAME_FOR_SGI            = "eth0";
-        PGW_IPV4_ADDRESS_FOR_SGI              = "192.168.12.101/24";
+        PGW_IPV4_ADDRESS_FOR_SGI              = "192.168.12.213/24";
         # Option available only if GTPU in kernel configured
         PGW_MASQUERADE_SGI                    = "yes";
     };

cmake_targets/tools/epc.local.enb.conf.in

@@ -62,7 +62,7 @@ MME :
         # max values = 999.999:65535
         # maximum of 32 values, comma separated
         PLMN = ( 
-             {MCC="208" ; MNC="92";  TAC = "1"; }
+             {MCC="208" ; MNC="93";  TAC = "1"; }
         );
     };
     
@@ -91,9 +91,8 @@ S-GW :
         SGW_INTERFACE_NAME_FOR_S11              = "none";
         SGW_IPV4_ADDRESS_FOR_S11                = "0.0.0.0/24";
 
-        SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP    = "tun3";
-        SGW_INTERFACE_MTU_FOR_S1U_S12_S4_UP     = 1564
-        SGW_IPV4_ADDRESS_FOR_S1U_S12_S4_UP      = "192.188.3.3/24";
+        SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP    = "lo";
+        SGW_IPV4_ADDRESS_FOR_S1U_S12_S4_UP      = "127.0.0.1/24";
         # TODO  PORT NUMBER
         SGW_IPV4_PORT_FOR_S1U_S12_S4_UP         = 2152;
 

cmake_targets/tools/run_enb_ue_virt_noS1

@@ -201,7 +201,7 @@ function main()
   if [ $run_mscgen -eq 1 ]; then 
     cd $MSC_DIR
     last_created_file=`ls -t mscgen* | head -1 | tr -d ':'`
-    $OPENAIR_DIR/targets/SCRIPTS/msc_gen.py
+    $OPENAIR_DIR/targets/SCRIPTS/msc_gen.py  --profile E_UTRAN
     sync
     last_created_file2=`ls -t mscgen* | head -1 | tr -d ':'`
         

cmake_targets/tools/run_enb_ue_virt_s1

@@ -257,7 +257,7 @@ function main()
   if [ $run_mscgen -eq 1 ]; then 
     cd $MSC_DIR
     last_created_file=`ls -t mscgen* | head -1 | tr -d ':'`
-    $OPENAIR_DIR/targets/SCRIPTS/msc_gen.py
+    $OPENAIR_DIR/targets/SCRIPTS/msc_gen.py  --profile E_UTRAN
     sync
     last_created_file2=`ls -t mscgen* | head -1 | tr -d ':'`