From 10d1c069a4e38ccbcaaa893d2d9e28ad5e05aae1 Mon Sep 17 00:00:00 2001
From: James Rayner <james@archlinux.org>
Date: Fri, 30 May 2008 22:22:35 +1000
Subject: FS9953 FS9644

---
 contrib/netcfg-auto-wireless | 40 +++++++++++++++++++++-------------------
 examples/ppp.example         |  2 +-
 src/network.subr             |  7 +++++++
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/contrib/netcfg-auto-wireless b/contrib/netcfg-auto-wireless
index 5660dcd..e5e4fc1 100755
--- a/contrib/netcfg-auto-wireless
+++ b/contrib/netcfg-auto-wireless
@@ -5,17 +5,17 @@
 . /usr/lib/network/wireless.subr
 . /etc/rc.conf
 . /etc/rc.d/functions
+
 # wifi_auto
 #   autoconnect wireless interface
 #   $1 - wireless interface
-
 wifi_auto()
 {
-    INTERFACE=$1; RETRIES=6
+    interface=$1; RETRIES=6
     stat_busy "Scanning for networks"
 
-    ifconfig $INTERFACE up
-    networks="$(list_networks $INTERFACE)"
+    ifconfig $interface up
+    networks="$(list_networks $interface)"
 
     if [[ ! "$networks" ]]; then
         stat_append "- No networks available."
@@ -23,25 +23,27 @@ wifi_auto()
         exit 1
     fi
 
+    # Loop through all the found essid's, then find a matching profile.
     while read essid; do
-        # awfully long grep that finds a file which has: 
-        # CONNECTION=wireless, ESSID=$essid, INTERFACE=$INTERFACE
-        profile=$(grep -rlP --exclude=/etc/network.d/last "CONNECTION=\"?wireless\"?(\n|.)*INTERFACE=\"?$INTERFACE\"?(\n|.)*ESSID=\"?$essid\"?" $PROFILE_DIR/|head -n 1)
-        if [[ -n "$profile" ]]; then
-            break # If we found a profile, use it.
-        fi
+	for network in $(list_profiles); do
+            load_profile $network
+            if [[ "$CONNECTION" = "wireless" && "$essid" = "$ESSID" && "$interface" = "$INTERFACE" ]]; then
+                found=$network
+            fi
+	    # Clear out any variables set by the profile
+	    . /usr/lib/network/${CONNECTION}.subr
+            ${CONNECTION}_clean_scope
+        done
     done < $networks
     
-    # If there's a profile, connect, else fail.
-    if [[ -n "$profile" ]]; then
-        stat_done
-        netcfg2 $(basename $profile)  
-        exit $?                                                
-    else
-        stat_append "- No profiles matched the found networks"
-        stat_fail
-        exit 1
+    if [[ "$found" ]]; then
+        netcfg2 $found
+	exit $?
     fi
+    
+    stat_append "- No profiles matched the found networks"
+    stat_fail
+    exit 1
 }
 
 if [[ $(id -u) -ne 0 ]]; then
diff --git a/examples/ppp.example b/examples/ppp.example
index f26bb03..ca8d167 100644
--- a/examples/ppp.example
+++ b/examples/ppp.example
@@ -1,4 +1,4 @@
 CONNECTION="ppp"
 INTERFACE="ignore"
-PEER="/etc/ppp/peers/provider"
+PEER="provider"
 PPP_TIMEOUT=10
diff --git a/src/network.subr b/src/network.subr
index 85dfc55..bfcfe45 100644
--- a/src/network.subr
+++ b/src/network.subr
@@ -1,5 +1,6 @@
 ### Globals
 PROFILE_DIR="/etc/network.d"
+SUBR_DIR="/usr/lib/network/"
 
 ### Messages
 ##
@@ -193,6 +194,12 @@ get_iface_prof() {
     fi
 }
 
+# list_profiles
+#  Outputs a list of all profiles
+list_profiles() {
+ find $PROFILE_DIR/ -maxdepth 1 -type f -printf "%f\n"
+}
+
 # check_profile profile
 #   Return 0 if profile up
 #   Return 1 if profile down
-- 
cgit v1.2.3-24-g4f1b