mr scripts: v1.2

8 files changed, 34 insertions, 10 deletions

diff --git a/mr/aGO_add.sh b/mr/aGO_add.sh
index bd46d1e..c8653ed 100755..100644
--- a/mr/aGO_add.sh
+++ b/mr/aGO_add.sh
@@ -1,5 +1,7 @@
 #!/system/bin/sh
-# System Test ; Script version = 1.1
+# System Test ; Script version = 1.2
+# Change in 1.1 : Added support for band A.
+# Change in 1.2 : p2p_supplicant.conf renamed into p2p.conf
 
 if [ "$1" == "" -o "$2" == "" ] ; then 
         echo "Please insert parameters <IP> <NEW_aGO_CHANNEL> [MAC]" 
@@ -14,7 +16,7 @@ HOSTAPD=/system/bin/hostapd
 IW=/system/bin/iw
 WPA_CLI=/system/bin/wpa_cli
 HOSTAPD_CONF=/data/misc/wifi/hostapd.conf
-P2P_CONF=/data/misc/wifi/p2p_supplicant.conf
+P2P_CONF=/data/misc/wifi/p2p.conf
 SOCKET_PATH=/data/misc/wifi
 
 SERVICE_SUPPLICANT=wpa_supplicant
@@ -55,7 +57,16 @@ $IFCONFIG $WLAN_IF_aGO up $WLAN_IP netmask $WLAN_NETMASK
 sleep 1
 
 if [ ! -f $P2P_CONF ] ; then 
-        cp /etc/wifi/p2p_supplicant.conf $P2P_CONF 
+        touch $P2P_CONF
+        echo "update_config=1" >> $P2P_CONF
+        echo "ctrl_interface=/data/misc/wifi" >> $P2P_CONF
+        echo "ap_scan=1" >> $P2P_CONF
+        echo "fast_reauth=1" >> $P2P_CONF
+        echo "device_name=Blaze" >> $P2P_CONF
+        echo "manufacturer=TexasInstruments" >> $P2P_CONF
+        echo "model_name=TI_Connectivity_module" >> $P2P_CONF
+        echo "model_number=wl12xx" >> $P2P_CONF
+        echo "serial_number=12345" >> $P2P_CONF
 fi
 chmod 777 $P2P_CONF 
 
diff --git a/mr/aGO_remove.sh b/mr/aGO_remove.sh
index bc4a497..fa52ccf 100755..100644
--- a/mr/aGO_remove.sh
+++ b/mr/aGO_remove.sh
@@ -1,5 +1,6 @@
 #!/system/bin/sh
-# System Test ; Script version = 1.1
+# System Test ; Script version = 1.2
+# Change in 1.2 : Get PID function improved
 
 INSMOD=/system/bin/insmod
 RMMOD=/system/bin/rmmod
@@ -9,7 +10,7 @@ IW=/system/bin/iw
 
 WLAN_IF=p2p_wlan0
 WLAN_IF_MON=mon.$WLAN_IF
-WLAN_PID=`ps | grep [p2p_]wlan0 | cut -f2 -d' '`
+WLAN_PID=`ps | grep [p2p_]wlan0 | cut -c1-5`
 
 SERVICE_SUPPLICANT=wpa_supplicant
 
diff --git a/mr/ap_add.sh b/mr/ap_add.sh
index 2562acb..2562acb 100755..100644
--- a/mr/ap_add.sh
+++ b/mr/ap_add.sh
diff --git a/mr/ap_remove.sh b/mr/ap_remove.sh
index 547e188..547e188 100755..100644
--- a/mr/ap_remove.sh
+++ b/mr/ap_remove.sh
diff --git a/mr/p2p_add.sh b/mr/p2p_add.sh
index 5c0aa4b..38b5e70 100755..100644
--- a/mr/p2p_add.sh
+++ b/mr/p2p_add.sh
@@ -1,5 +1,8 @@
 #!/system/bin/sh
-# System Test ; Script version = 1.1
+# System Test ; Script version = 1.3
+# Change in 1.1 : Added support for band A.
+# Change in 1.2 : p2p_supplicant.conf renamed into p2p.conf
+# Change in 1.3 : WLAN_NETMASK parameter changed from 255.255.255.02 to 255.255.255.00
 
 if [ "$1" == "" -o "$2" == "" ] ; then 
         echo "Please insert parameters <IP> [MAC]" 
@@ -14,7 +17,7 @@ HOSTAPD=/system/bin/hostapd
 IW=/system/bin/iw
 WPA_CLI=/system/bin/wpa_cli
 HOSTAPD_CONF=/data/misc/wifi/hostapd.conf
-P2P_CONF=/data/misc/wifi/p2p_supplicant.conf
+P2P_CONF=/data/misc/wifi/p2p.conf
 SOCKET_PATH=/data/misc/wifi
 
 SERVICE_SUPPLICANT=wpa_supplicant
@@ -23,7 +26,7 @@ SERVICE_HOSTAPD=hostapd_bin
 WLAN_IF_SUT=wlan0
 WLAN_IF_aGO=p2p_wlan0
 WLAN_IP=$1
-WLAN_NETMASK=255.255.255.02
+WLAN_NETMASK=255.255.255.0
 MAC=$2
 PHY=`ls /sys/class/ieee80211/`
 
@@ -42,7 +45,16 @@ $IFCONFIG $WLAN_IF_aGO up $WLAN_IP netmask $WLAN_NETMASK
 sleep 1
 
 if [ ! -f $P2P_CONF ] ; then 
-        cp /etc/wifi/p2p_supplicant.conf $P2P_CONF 
+        touch $P2P_CONF
+        echo "update_config=1" >> $P2P_CONF
+        echo "ctrl_interface=/data/misc/wifi" >> $P2P_CONF
+        echo "ap_scan=1" >> $P2P_CONF
+        echo "fast_reauth=1" >> $P2P_CONF
+        echo "device_name=Blaze" >> $P2P_CONF
+        echo "manufacturer=TexasInstruments" >> $P2P_CONF
+        echo "model_name=TI_Connectivity_module" >> $P2P_CONF
+        echo "model_number=wl12xx" >> $P2P_CONF
+        echo "serial_number=12345" >> $P2P_CONF
 fi
 chmod 777 $P2P_CONF 
 
diff --git a/mr/p2p_remove.sh b/mr/p2p_remove.sh
index bc4a497..65c3152 100755..100644
--- a/mr/p2p_remove.sh
+++ b/mr/p2p_remove.sh
@@ -9,7 +9,7 @@ IW=/system/bin/iw
 
 WLAN_IF=p2p_wlan0
 WLAN_IF_MON=mon.$WLAN_IF
-WLAN_PID=`ps | grep [p2p_]wlan0 | cut -f2 -d' '`
+WLAN_PID=`ps | grep [p2p_]wlan0 | cut -f3 -d' '`
 
 SERVICE_SUPPLICANT=wpa_supplicant
 
diff --git a/mr/sta_add.sh b/mr/sta_add.sh
index 27482ef..27482ef 100755..100644
--- a/mr/sta_add.sh
+++ b/mr/sta_add.sh
diff --git a/mr/sta_remove.sh b/mr/sta_remove.sh
index 8a9e4e4..8a9e4e4 100755..100644
--- a/mr/sta_remove.sh
+++ b/mr/sta_remove.sh