diff options
Diffstat (limited to 'src/connections')
| -rw-r--r-- | src/connections/ethernet | 60 | ||||
| -rw-r--r-- | src/connections/ethernet-iproute | 53 | ||||
| -rw-r--r-- | src/connections/wireless | 110 |
3 files changed, 166 insertions, 57 deletions
diff --git a/src/connections/ethernet b/src/connections/ethernet index e24e9f5..86d8b96 100644 --- a/src/connections/ethernet +++ b/src/connections/ethernet @@ -6,16 +6,16 @@ ethernet_up() { if [[ ! -e /sys/class/net/"$INTERFACE" ]]; then if ! echo "$INTERFACE"|grep ":"; then - err_append "interface $INTERFACE does not exist" + report_fail "interface $INTERFACE does not exist" return 1 fi fi - ip link set $INTERFACE up - sleep 1 + report_debug ethernet_up ifup + set_interface up $INTERFACE if ip link show $INTERFACE|grep -q "NO-CARRIER"; then - err_append "No connection" + report_fail "No connection" return 1 fi @@ -23,7 +23,11 @@ ethernet_up() { . "${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" + report_debug ethernet_up start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_OPTS" + if ! start_wpa $INTERFACE $WPA_CONF $WPA_OPTS; then + report_fail "wpa_supplicant did not start, possible configuration error" + return 1 + fi if ! wpa_check "$INTERFACE"; then ifconfig "$INTERFACE" down return 1 @@ -34,8 +38,9 @@ ethernet_up() { dhcp) if checkyesno "${DHCLIENT:-no}"; then rm -r /var/run/dhclient-${INTERFACE}.pid >/dev/null 2>&1 + report_debug ethernet_up dhclient -q -e TIMEOUT="${DHCP_TIMEOUT:-10}" -pf "/var/run/dhclient-$INTERFACE.pid" "$INTERFACE" if ! dhclient -q -e TIMEOUT="${DHCP_TIMEOUT:-10}" -pf /var/run/dhclient-${INTERFACE}.pid $INTERFACE; then - err_append "DHCP IP lease attempt failed." + report_fail "DHCP IP lease attempt failed." return 1 fi else @@ -44,37 +49,44 @@ ethernet_up() { # If using own dns, tell dhcpcd to NOT replace resolv.conf [[ -n "$DNS1" ]] && DHCP_OPTIONS="-C resolv.conf $DHCP_OPTIONS" # Start dhcpcd + report_debug ethernet_up dhcpcd -qL -t "${DHCP_TIMEOUT:-10}" $DHCP_OPTIONS "$INTERFACE" if ! dhcpcd -qL -t "${DHCP_TIMEOUT:-10}" $DHCP_OPTIONS "$INTERFACE"; then - err_append "DHCP IP lease attempt failed." + report_fail "DHCP IP lease attempt failed." return 1 fi fi - [[ -n "$IFOPTS" ]] && ifconfig "$INTERFACE" $IFOPTS + if [[ -n "$IFOPTS" ]]; then + report_debug ethernet_up ifup $IFOPTS + ifconfig "$INTERFACE" $IFOPTS + fi ;; static) + report_debug ethernet_up ifup $IFOPTS if ! ifconfig "$INTERFACE" $IFOPTS up; then - err_append "Bringing interface up failed." + report_fail "Bringing interface up failed." return 1 fi # bring up the default route (gateway) if [[ -n "$GATEWAY" ]]; then + report_debug ethernet_up route add default gw "$GATEWAY" if ! route add default gw $GATEWAY; then - err_append "Adding gateway failed." + report_fail "Adding gateway failed." return 1 fi fi ;; *) - err_append "IP=\"\" must be either 'dhcp' or 'static'." + report_fail "IP=\"\" must be either 'dhcp' or 'static'." return 1 ;; esac # set the hostname if [[ -n "$HOSTNAME" ]]; then + report_debug ethernet_up hostname "$HOSTNAME" if ! hostname "$HOSTNAME"; then - err_append "Setting hostname failed." + report_fail "Setting hostname failed." return 1 fi fi @@ -103,25 +115,33 @@ ethernet_down() { dhcp) if checkyesno "${DHCLIENT:-no}"; then if [[ -f /var/run/dhclient-${INTERFACE}.pid ]]; then - kill `cat /var/run/dhclient-${INTERFACE}.pid` + report_debug ethernet_down kill dhclient + kill $(cat /var/run/dhclient-${INTERFACE}.pid) fi else if [[ -f /var/run/dhcpcd-${INTERFACE}.pid ]]; then + report_debug ethernet_down dhcpcd -qx "$INTERFACE" dhcpcd -qx "$INTERFACE" fi fi ;; static) - [[ -n "$GATEWAY" ]] && route del default gw $GATEWAY + if [[ -n "$GATEWAY" ]]; then + report_debug ethernet_down route del default gw "$GATEWAY" + route del default gw $GATEWAY + fi ;; esac - ifconfig $INTERFACE 0.0.0.0 - case "$CONNECTION" in # Keep interface up for wireless - ethernet|ethernet-old) - quirk "nodown" || ifconfig $INTERFACE down - ;; - esac + report_debug ethernet_down ifdown + set_interface down $INTERFACE +} + +# Returns status of profile - is it still functional? +ethernet_status() { + if ! ip link show dev ra0|grep -q "state UP"; then + return 1 + fi } ethernet_$1 $2 diff --git a/src/connections/ethernet-iproute b/src/connections/ethernet-iproute index 1a4a6e4..2f0c485 100644 --- a/src/connections/ethernet-iproute +++ b/src/connections/ethernet-iproute @@ -1,9 +1,9 @@ #! /bin/bash . /usr/lib/network/network -error() +report_iproute() { - err_append "$*" + report_fail "$*" ip addr flush $INTERFACE &>/dev/null quirk "nodown" || ip link set $INTERFACE down &>/dev/null exit 1 @@ -14,15 +14,15 @@ ethernet_up() { if [[ ! -e /sys/class/net/$INTERFACE ]]; then if ! echo "$INTERFACE"|grep ":"; then - error "Interface $INTERFACE does not exist" + report_iproute "Interface $INTERFACE does not exist" fi fi - ip link set $INTERFACE up - sleep 1 + report_debug ethernet_iproute_up ifup + set_interface up $INTERFACE - if ip link show $INTERFACE|grep -q "NO-CARRIER"; then - err_append "No connection" + if ip link show $INTERFACE|grep -Fq "NO-CARRIER"; then + report_fail "No connection" return 1 fi @@ -31,7 +31,11 @@ ethernet_up() { [[ -z "$WPA_CONF" ]] && WPA_CONF="/etc/wpa_supplicant.conf" [[ -z "$WPA_OPTS" ]] && WPA_OPTS="-Dwired" - start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_OPTS" + if ! start_wpa $INTERFACE $WPA_CONF $WPA_OPTS; then + report_fail "wpa_supplicant did not start, possible configuration error" + return 1 + fi + if ! wpa_check "$INTERFACE"; then ip link set $INTERFACE down return 1 @@ -45,41 +49,46 @@ ethernet_up() { # If using own dns, tell dhcpcd to NOT replace resolv.conf [[ -n "$DNS" ]] && DHCP_OPTIONS="-C resolv.conf $DHCP_OPTIONS" - + + report_debug ethernet_iproute_up dhcpcd -qL -t "${DHCP_TIMEOUT:-10}" $DHCP_OPTIONS "$INTERFACE" if ! dhcpcd -qL -t ${DHCP_TIMEOUT:-10} $DHCP_OPTIONS $INTERFACE; then - error "DHCP IP lease attempt failed" + report_iproute "DHCP IP lease attempt failed" fi ;; static) if [[ -n "$ADDR" ]]; then + report_debug ethernet_iproute_up ip addr add "$ADDR/24" brd + dev "$INTERFACE" if ! ip addr add ${ADDR}/24 brd + dev $INTERFACE; then - error "Could not configure interface" + report_iproute "Could not configure interface" fi fi if [[ -n "$GATEWAY" ]]; then + report_debug ethernet_iproute_up ip route add default via "$GATEWAY" if ! ip route add default via $GATEWAY; then - error "Adding gateway failed" + report_iproute "Adding gateway failed" fi fi ;; *) - error "Profile error: IP must be either 'dhcp' or 'static'" + report_iproute "Profile report_iproute: IP must be either 'dhcp' or 'static'" ;; esac if [[ -n "$IPCFG" ]]; then for line in "${IPCFG[@]}"; do - + + report_debug ethernet_iproute_up ip "$line" if ! ip $line; then - error "Could not configure interface" + report_iproute "Could not configure interface" fi done fi # Set hostname if [[ -n "$HOSTNAME" ]]; then + report_debug ethernet_iproute_up hostname "$HOSTNAME" if ! hostname $HOSTNAME; then - error "Cannot set hostname" + report_iproute "Cannot set hostname" fi fi @@ -103,13 +112,21 @@ ethernet_down() { if [[ "$IP" == "dhcp" ]]; then if [[ -f /var/run/dhcpcd-${INTERFACE}.pid ]]; then + report_debug ethernet_iproute_down dhcpcd -qx "$INTERFACE" dhcpcd -qx $INTERFACE fi fi + + report_debug ethernet_iproute_down if_down + set_interface down $INTERFACE - ip addr flush $INTERFACE - quirk "nodown" || ip link set $INTERFACE down +} +# Returns status of profile - is it still functional? +ethernet_status() { + if ! ip link show dev ra0|grep -q "state UP"; then + return 1 + fi } ethernet_$1 $2 diff --git a/src/connections/wireless b/src/connections/wireless index 8b43ed1..10f751e 100644 --- a/src/connections/wireless +++ b/src/connections/wireless @@ -1,43 +1,73 @@ #! /bin/bash . /usr/lib/network/network + +rfkill_from_name() { + local name=$1 + for rfkill in /sys/class/rfkill/*; do + if [[ "$(cat $rfkill/name)" == $name ]]; then + echo $rfkill + return 0 + fi + done + echo "none" + return 1 +} + wireless_up() { load_profile $1 . ${SUBR_DIR}/8021x . ${SUBR_DIR}/wireless + # If rfkill is specified, enable device. + if [[ -n "$RFKILL_NAME" ]]; then + path=$(rfkill_from_name $RFKILL_NAME) + if [[ $? -ne 0 ]]; then + report_fail "no rfkill switch with the name $RFKILL_NAME"; + fi + echo 1 > ${path}/state + sleep 1 + fi + # Check if interface exists if [[ ! -e /sys/class/net/"$INTERFACE" ]]; then - if ! echo "$INTERFACE"|grep ":"; then - err_append "interface $INTERFACE does not exist" + if ! echo "$INTERFACE"|grep -Fq ":"; then + report_fail "interface $INTERFACE does not exist" return 1 fi fi # Kill any lingering wpa_supplicants. + report_debug wireless_up stop_wpa "$INTERFACE" stop_wpa $INTERFACE - + # Most drivers (mac80211) need mode set before device is brought up # Drivers generally default to managed, but set this to be sure. - if [[ "$(iwgetid -sm $INTERFACE)" -ne "Managed" ]]; then + if [[ $(iwgetid -sm $INTERFACE) -ne Managed ]]; then + report_debug wireless_up iwconfig "$INTERFACE" mode managed iwconfig $INTERFACE mode managed fi - ifconfig $INTERFACE up + report_debug wireless_up ifup + set_interface up $INTERFACE || return 1 quirk "prescan" && iwlist $INTERFACE scan &> /dev/null # bcm43xx quirk "preessid" && eval "iwconfig $INTERFACE mode managed essid \"$ESSID\"" # ipw3945 if checkyesno ${SCAN:-no}; then + report_debug wireless_up scanning if ! find_essid $INTERFACE "$ESSID"; then - err_append "Network not present." + report_fail "Network not present." return 1 fi fi # Manually set iwconfig options - [[ "$IWCONFIG" ]] && iwconfig $INTERFACE $IWCONFIG + if [[ "$IWCONFIG" ]]; then + report_debug wireless_up iwconfig "$INTERFACE" $IWCONFIG + iwconfig $INTERFACE $IWCONFIG + fi # Set to 'none' if not set [[ -z "$SECURITY" ]] && SECURITY="none" @@ -52,15 +82,21 @@ wireless_up() { fi quirk "predown" && ifconfig $INTERFACE down # madwifi FS#10585 - + + report_debug wireless_up iwconfig "$INTERFACE" $WEP_OPTS if ! eval iwconfig $INTERFACE $WEP_OPTS; then - err_append "Could not set wireless configuration." + report_fail "Could not set wireless configuration." return 1 fi quirk "predown" && ifconfig $INTERFACE up # madwifi FS#10585 - wep_check $INTERFACE $TIMEOUT||return 1 + report_debug ethernet_up wep_check + + if ! wep_check $INTERFACE $TIMEOUT; then + report_fail "WEP Association Failed" + return 1 + fi ;; wpa) @@ -76,14 +112,17 @@ wireless_up() { if [[ "${#KEY}" == "64" ]]; then echo -e "network={ \nssid=\"$ESSID\" \npsk=$KEY \n}">> $WPA_CONF elif ! echo "$KEY" | wpa_passphrase "$ESSID" >> $WPA_CONF; then - err_append "Configuration generation failed. $(cat $WPA_CONF)" + report_fail "Configuration generation failed. $(cat $WPA_CONF)" return 1 fi # Connect! [[ -z "$WPA_OPTS" ]] && WPA_OPTS="-Dwext" + report_debug wireless_up start_wpa "$INTERFACE" "$WPA_CONF/wpa.conf" "$WPA_OPTS" start_wpa $INTERFACE $WPA_CONF $WPA_OPTS || return 1 + report_debug wireless_up wpa_check if ! wpa_check $INTERFACE $TIMEOUT; then + report_fail "WPA Authentication/Association Failed" stop_wpa $INTERFACE return 1 fi @@ -92,31 +131,64 @@ wireless_up() { . ${SUBR_DIR}/8021x [[ -z "$WPA_CONF" ]] && WPA_CONF="/etc/wpa_supplicant.conf" # defaults [[ -z "$WPA_OPTS" ]] && WPA_OPTS="-Dwext" - start_wpa $INTERFACE $WPA_CONF $WPA_OPTS || return 1 + report_debug wireless_up start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_OPTS" + if ! start_wpa $INTERFACE $WPA_CONF $WPA_OPTS; then + report_fail "wpa_supplicant did not start, possible configuration error" + return 1 + fi + report_debug wireless_up wpa_check if ! wpa_check $INTERFACE $TIMEOUT; then + report_fail "WPA Authentication/Association Failed" stop_wpa $INTERFACE return 1 fi ;; esac - if ! ${CONN_DIR}/ethernet up $1; then + conn=ethernet + checkyesno ${IPROUTE:-no} && conn=ethernet-iproute + if ! ${CONN_DIR}/$conn up $1; then wireless_down $1 YES return 1 fi } wireless_down() { - load_profile $1 - . ${SUBR_DIR}/8021x PROFILE=$1 NOETHERNETDOWN=$2 - if ! checkyesno $2; then - ${CONN_DIR}/ethernet down $1 + load_profile $PROFILE + . ${SUBR_DIR}/8021x + if ! checkyesno $NOETHERNETDOWN; then + conn=ethernet + checkyesno ${IPROUTE:-no} && conn=ethernet-iproute + $CONN_DIR/$conn down $PROFILE fi + report_debug wireless_down stop_wpa "$INTERFACE" stop_wpa $INTERFACE - [[ "$SECURITY" == "wpa" ]] && rm -f "/tmp/wpa.${1// /}" # remove wpa config + [[ "$SECURITY" == "wpa" ]] && rm -f "/tmp/wpa.${PROFILE// /}" # remove wpa config + report_debug wireless_down iwconfig "$INTERFACE" essid off key off iwconfig $INTERFACE essid off key off &> /dev/null - ifconfig $INTERFACE down + set_interface down $INTERFACE + + # If rfkill is specified, disable device. + if [[ -n "$RFKILL_NAME" ]]; then + path=$(rfkill_from_name $RFKILL_NAME) + if [[ $? -ne 0 ]]; then + report_fail "no rfkill switch with the name $RFKILL_NAME"; + fi + echo 0 > ${path}/state + fi + +} + +# Returns status of profile - is it still functional? +wireless_status() { + load_profile $1 + if [[ "$(iwgetid -r)" -ne $ESSID ]]; then + return 1 + elif ! ip link show dev ra0|grep -q "state UP"; then + return 1 + fi + } wireless_$1 $2 |