From 566dd7db5f231d0b488f942f737886d15413339a Mon Sep 17 00:00:00 2001
From: Lionel Gauthier <lionel.gauthier@eurecom.fr>
Date: Tue, 4 Feb 2014 14:14:19 +0000
Subject: [PATCH] bug fixes

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5020 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
 .../PROJECTS/GENERIC-LTE-EPC/start_lte-epc-vlan.bash  |  2 +-
 targets/PROJECTS/GENERIC-LTE-EPC/start_router.bash    | 11 +++++++----
 targets/PROJECTS/GENERIC-LTE-EPC/utils.bash           |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/start_lte-epc-vlan.bash b/targets/PROJECTS/GENERIC-LTE-EPC/start_lte-epc-vlan.bash
index 5bfb92c187..2eccc8d998 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/start_lte-epc-vlan.bash
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/start_lte-epc-vlan.bash
@@ -174,7 +174,7 @@ PGW_IPV4_ADDR_FOR_SGI=$(                     echo $PGW_IPV4_ADDR_FOR_SGI
 
 clean_epc_vlan_network
 build_mme_spgw_vlan_network
-test_epc_vlan_network
+#test_epc_vlan_network
 
 ##################################################..
 
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/start_router.bash b/targets/PROJECTS/GENERIC-LTE-EPC/start_router.bash
index c067ec0df8..95a57c100f 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/start_router.bash
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/start_router.bash
@@ -160,20 +160,23 @@ bash_exec "modprobe 8021q"
 
 for i in 5 6 7 8 9 10 11 12 13 14 15
 do
+    ifconfig $INTIF.$i down > /dev/null 2>&1
+    sync
     vconfig rem $INTIF.$i > /dev/null 2>&1
     sync
+done
+
+for i in 5 6 7 8 9 10 11 12 13 14 15
+do
     bash_exec "vconfig add $INTIF $i"
     sync
     NET=$(( $i + 200 ))
     CIDR='10.0.'$NET'.1/8'
-    bash_exec "ip -4 addr add $CIDR broadcast 192.174.$NET.255 dev $INTIF.$i"
+    bash_exec "ip -4 addr add $CIDR dev $INTIF.$i"
     bash_exec "iptables -A FORWARD -i $EXTIF -o $INTIF.$i -m state --state ESTABLISHED,RELATED -j ACCEPT"
     bash_exec "iptables -A FORWARD -i $INTIF.$i -o $EXTIF -m state --state NEW,ESTABLISHED,RELATED,INVALID -j ACCEPT"
     bash_exec "echo 1 > /proc/sys/net/ipv4/conf/$INTIF.$i/proxy_arp"
     bash_exec "echo 0 > /proc/sys/net/ipv4/conf/$INTIF.$i/rp_filter"
-    #assert "  `sysctl -n net.ipv4.conf.$INTIF.$i.proxy_arp` -eq 1" $LINENO
-    #assert "  `sysctl -n net.ipv4.conf.$INTIF.$i.rp_forward` -eq 0" $LINENO
-    #assert "  `sysctl -n net.ipv4.conf.$INTIF.$i.rp_filter` -eq 0" $LINENO
 done
 for i in 5 6 7 8 9 10 11 12 13 14 15
 do
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/utils.bash b/targets/PROJECTS/GENERIC-LTE-EPC/utils.bash
index af0f0b9a65..dd70d6015b 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/utils.bash
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/utils.bash
@@ -647,7 +647,7 @@ clean_epc_vlan_network() {
         ifconfig    $PGW_INTERFACE_NAME_FOR_SGI.$i down > /dev/null 2>&1
         vconfig rem $PGW_INTERFACE_NAME_FOR_SGI.$i      > /dev/null 2>&1
     done
-    ip link set $PGW_INTERFACE_NAME_FOR_SGI down > /dev/null 2>&1
+    #ip link set $PGW_INTERFACE_NAME_FOR_SGI down > /dev/null 2>&1
 }
 
 build_openvswitch_network() {