fix libify

3 files changed, 259 insertions, 0 deletions

diff --git a/src/connections/ethernet b/src/connections/ethernet
new file mode 100644
index 0000000..3605663
--- /dev/null
+++ b/src/connections/ethernet
@@ -0,0 +1,122 @@
+#! /bin/bash
+
+
+ethernet_up() {
+    if [[ ! -e /sys/class/net/$INTERFACE ]]; then
+        if ! echo "$INTERFACE"|grep ":"; then
+            err_append "Interface $INTERFACE does not exist"
+        fi
+    fi  
+
+	if ip link show $INTERFACE|grep -q "NO-CARRIER"; then
+        err_append "No connection available"	
+    	return 1
+    fi
+
+	ifconfig $INTERFACE up
+     
+    if checkyesno ${AUTH8021X:-no}; then 
+        . ${SUBR_DIR}/8021x
+        [[ -z "$WPA_CONF" ]] && WPA_CONF="/etc/wpa_supplicant.conf"
+        [[ -z "$WPA_OPTS" ]] && WPA_OPTS="-Dwired"
+        start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_OPTS"
+        if ! wpa_check "$INTERFACE"; then
+            ifconfig $INTERFACE down
+            return 1
+        fi 
+    fi
+
+    case $IP in
+    dhcp)
+        # Check if DHCP_TIMEOUT was set if not set a default value
+        [[ -z "$DHCP_TIMEOUT" ]] && DHCP_TIMEOUT=10
+        
+        if checkyesno $DHCLIENT; then
+            rm -r /var/run/dhclient-${INTERFACE}.pid >/dev/null 2>&1
+            if ! dhclient -q -e TIMEOUT=$DHCP_TIMEOUT -pf /var/run/dhclient-${INTERFACE}.pid $INTERFACE; then
+                err_append "DHCP IP lease attempt failed"
+                return 1
+            fi
+        else
+            # Clear remaining pid files. 
+            rm -f /var/run/dhcpcd-${INTERFACE}.{pid,cache} >/dev/null 2>&1
+            # If using own dns, tell dhcpcd to NOT replace resolv.conf
+            [[ -n "$DNS1" ]] && DHCP_OPTIONS="-C resolv.conf $DHCP_OPTIONS"
+            # Start dhcpcd
+            if ! dhcpcd -qL -t $DHCP_TIMEOUT $DHCP_OPTIONS $INTERFACE; then
+                err_append "DHCP IP lease attempt failed"
+                return 1
+            fi 
+        fi
+        # TODO: add support for $section:ifconfig for other stuff, like mtu or mac?
+        ;;
+    static)
+        if ! ifconfig $INTERFACE $IFOPTS up; then
+            err_append "Could not bring interface up"
+            return 1
+        fi
+
+        # bring up the default route (gateway)
+        if [[ -n "$GATEWAY" ]]; then
+            if ! route add default gw $GATEWAY; then
+                err_append "Adding gateway $GATEWAY failed"
+                return 1
+            fi 
+        fi
+        ;;
+      *)
+        err_append "Profile error: IP must be either 'dhcp' or 'static'"
+        return 1
+        ;;
+    esac
+
+    # set the hostname
+    if [[ -n "$HOSTNAME" ]]; then
+        if ! hostname $HOSTNAME; then
+            err_append "Cannot set hostname"
+            return 1
+        fi
+    fi
+
+    # Generate a new resolv.conf
+    if [[ -n "$DNS1" ]] || [[ -n "$DNS" ]]; then
+
+        : >/etc/resolv.conf 
+        [[ -n "$DOMAIN" ]] && echo "domain $DOMAIN"   >>/etc/resolv.conf
+        [[ -n "$SEARCH" ]] && echo "search $SEARCH"   >>/etc/resolv.conf
+        [[ -n "$DNS1" ]]   && echo "nameserver $DNS1" >>/etc/resolv.conf
+        [[ -n "$DNS2" ]]   && echo "nameserver $DNS2" >>/etc/resolv.conf
+
+        if [[ -n "$DNS" ]]; then
+            for dns in ${DNS[@]}; do
+                echo "nameserver $dns" >>/etc/resolv.conf
+            done
+        fi
+    fi
+    return 0
+}
+
+ethernet_down() {
+    case $IP in
+    dhcp)
+        if checkyesno $DHCLIENT; then
+            if [[ -f /var/run/dhclient-${INTERFACE}.pid ]]; then
+                kill `cat /var/run/dhclient-${INTERFACE}.pid`
+            fi
+        else
+            if [[ -f /var/run/dhcpcd-${INTERFACE}.pid ]]; then
+                dhcpcd -qx $INTERFACE
+            fi
+        fi
+        ;;
+    static)
+        [[ -n "$GATEWAY" ]] && route del default gw $GATEWAY
+        ;;
+    esac
+    ifconfig $INTERFACE 0.0.0.0
+    
+    quirk "nodown" || ifconfig $INTERFACE down
+
+}
+
+# vim: set ts=4 et sw=4:
diff --git a/src/connections/ppp b/src/connections/ppp
new file mode 100644
index 0000000..ecefd63
--- /dev/null
+++ b/src/connections/ppp
@@ -0,0 +1,18 @@
+#! /bin/bash
+ppp_up() {
+    [[ -z "$PEER" ]] && PEER="provider"
+    [[ -z "$PPP_TIMEOUT" ]] && PPP_TIMEOUT=30
+
+    /usr/sbin/pppd call $PEER updetach child-timeout $PPP_TIMEOUT linkname $PEER
+
+    if [[ $? -ne 0 ]]; then
+       err_append "pppd connection failed"
+       exit 1
+    fi
+}
+
+ppp_down() {
+    kill $(head -1 /var/run/ppp-$(basename $PEER).pid)
+}
+
+# vim: set ts=4 et sw=4:
diff --git a/src/connections/wireless b/src/connections/wireless
new file mode 100644
index 0000000..dbc2a29
--- /dev/null
+++ b/src/connections/wireless
@@ -0,0 +1,119 @@
+#! /bin/bash
+
+wireless_up() {
+
+    load_profile $1
+    
+    . ${SUBR_DIR}/wireless
+
+    if [[ ! -d /sys/class/net/$INTERFACE/wireless ]]; then 
+        err_append "Interface $INTERFACE is not a wireless interface"
+        return 1
+    fi
+ 
+    # Required by atheros and others (mac80211?) to enable device
+    ifconfig $INTERFACE up 
+
+    # Hack that has been required by some broadcom
+    quirk "prescan" && iwlist $INTERFACE scan &> /dev/null
+
+    # Required by ipw3945 to properly re-associate
+    quirk "preessid" && eval "iwconfig $INTERFACE mode managed essid \"$ESSID\""
+
+    # Kill any lingering wpa_supplicants.
+    if [[ -f /var/run/wpa_supplicant_$INTERFACE.pid ]]; then
+        kill $(cat /var/run/wpa_supplicant_$INTERFACE.pid)
+    fi
+
+    # Default scan off as it won't see hidden networks and some hardware's scanning is dodgy
+    [[ ! "$SCAN" ]] && SCAN="no" 
+    if checkyesno $SCAN; then
+        if ! find_essid $INTERFACE "$ESSID"; then
+            err_append "Network unavailable"
+            return 1
+        fi 
+    fi
+  
+    # Manually set iwconfig options
+    if [[ "$IWCONFIG" ]]; then
+        iwconfig $INTERFACE $IWCONFIG
+    fi
+
+    case $SECURITY in
+    wep|none)
+        # 'none' security uses iwconfig, like wep, so use same code, minus keysetting.
+        # Use sane default if no alternative is specified
+        if [[ "$SECURITY" = "wep" && "$WEP_OPTS" = "" ]]; then 
+            WEP_OPTS="mode managed essid \"$ESSID\" key $KEY"
+        elif [[ "$SECURITY" = "none" && "$WEP_OPTS" = "" ]]; then
+            WEP_OPTS="mode managed essid \"$ESSID\""
+        fi 
+        
+        # Add wierd quirk for some Atheros in response to FS#10585
+        quirk "predown" && ifconfig $INTERFACE down
+
+        if ! eval iwconfig $INTERFACE $WEP_OPTS; then
+            err_append "Could not set wireless configuration"
+            return 1
+        fi
+
+        quirk "postsleep" && sleep 1
+        quirk "postscan" && sleep 1 && iwlist $INTERFACE scan &>/dev/null
+        quirk "predown" && ifconfig $INTERFACE up
+
+        wep_check $INTERFACE $TIMEOUT|| return 1
+        ;;    
+    wpa)
+        . ${SUBR_DIR}/8021x
+
+        # Quirk for broken drivers... http://bbs.archlinux.org/viewtopic.php?id=36384
+        quirk "wpaessid" && eval iwconfig $INTERFACE mode managed essid "\"$ESSID\""
+         
+        local WPA_CONF="/tmp/wpa.${1// /}" # substitute spaces out 
+        echo "ctrl_interface=/var/run/wpa_supplicant" >> $WPA_CONF
+        echo "ctrl_interface_group=0" >> $WPA_CONF        
+        chmod 600 $WPA_CONF
+        
+        # Generate configuration
+        if [[ "${#KEY}" == "64" ]]; then
+            echo -e 'network={ \nssid="$ESSID" \npsk=$KEY \n}'> $WPA_CONF
+        elif ! wpa_passphrase "$ESSID" "$KEY" >> $WPA_CONF; then
+            err_append "Configuration generation failed: `cat $WPA_CONF`"
+            return 1
+        fi
+
+        # Connect!
+        [[ "$WPA_OPTS" == "" ]] && WPA_OPTS="-Dwext"
+        start_wpa $INTERFACE $WPA_CONF $WPA_OPTS || return 1
+        wpa_check $INTERFACE $TIMEOUT || return 1
+        ;;
+    wpa-config)
+        . ${SUBR_DIR}/8021x
+        # If user hasnt defined one, use stock config.
+        [[ -z "$WPA_CONF" ]] && WPA_CONF="/etc/wpa_supplicant.conf"
+        [[ "$WPA_OPTS" == "" ]] && WPA_OPTS="-Dwext"
+        start_wpa $INTERFACE $WPA_CONF $WPA_OPTS || return 1
+        wpa_check $INTERFACE $TIMEOUT || return 1
+        ;;        
+    esac
+    
+    . $CONN_DIR/ethernet
+    if ! ethernet_up $1; then
+        wireless_down $1 YES
+        return 1
+    fi
+}
+ 
+wireless_down() {
+    PROFILE=$1 NOETHERNETDOWN=$2
+    if ! checkyesno $2; then
+        . $CONN_DIR/ethernet
+        ethernet_down $1
+       fi
+    wpa_cli terminate &> /dev/null 
+	[[ "$SECURITY" == "wpa" ]] && rm -f "/tmp/wpa.${1// /}" # remove wpa config
+    iwconfig $INTERFACE essid off key off &> /dev/null 
+
+}
+
+# vim: set ts=4 et sw=4: