X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b1b6a61f9c6ed77a31ef34adbd45c0014aaf6e3e..5e235f254fb2d618414a9bbe86789815b7d1df2d:/root/etc/functions.sh?ds=sidebyside

diff --git a/root/etc/functions.sh b/root/etc/functions.sh
index 8befcde51..155e30be3 100755
--- a/root/etc/functions.sh
+++ b/root/etc/functions.sh
@@ -1,10 +1,8 @@
-#!/bin/sh
+#!/bin/ash
 
-debug () {
- [ -z "$DEBUG" ] || echo $1
-}
+alias debug=${DEBUG:-:}
 
-# allow env to override nvram 
+# allow env to override nvram
 nvram_get () {
  eval "echo \${$1:-\$(nvram get $1)}"
 }
@@ -13,7 +11,7 @@ nvram_get () {
 # valid interface?
 if_valid () (
   [ "${1%%[0-9]}" = "vlan" ] && {
-    i=${1#vlan} 
+    i=${1#vlan}
     hwname=$(nvram_get vlan${i}hwname)
     hwaddr=$(nvram_get ${hwname}macaddr)
     [ -z "$hwaddr" ] && return 1
@@ -24,62 +22,53 @@ if_valid () (
     $DEBUG ifconfig $vif up
     $DEBUG vconfig add $vif $i 2>/dev/null
   }
-  ifconfig "$1" >/dev/null 2>&1 || [ "${1%%[0-9]}" = "br" ] 
-  return $?
+  ifconfig "$1" >/dev/null 2>&1 || [ "${1%%[0-9]}" = "br" ]
 )
 
-mac () {
-  echo $2|awk -F ":" '{for(x=6,y='$1';x;x--){y+=int("0x"$x);$x=sprintf("%02x",y%256);y/=256}gsub(" ",":");print$0}'
-}                                                                                                                  
 wifi () (
   debug "### wifi $1 ###"
   if=$(awk 'gsub(":","") {print $1}' /proc/net/wireless)
-  $DEBUG ifconfig $if hw ether $(mac 2 $(nvram get et0macaddr))
-  $DEBUG wlconf $if $1 
+  $DEBUG wlconf $if $1
 )
 
 ifup () (
   type=$1
   debug "### ifup $type ###"
-  
+
   if=$(nvram_get ${type}_ifname)
   if [ "${if%%[0-9]}" = "ppp" ]; then
-    if=$(nvram_get pppoe_ifname) 
+    if=$(nvram_get pppoe_ifname)
   fi
-  
+
   if_valid $if || return
-  
+
   $DEBUG ifconfig $if down
   if [ "${if%%[0-9]}" = "br" ]; then
     stp=$(nvram_get ${type}_stp)
     $DEBUG brctl delbr $if
     $DEBUG brctl addbr $if
     $DEBUG brctl setfd $if 0
-    $DEBUG brctl stp $if $stp
+    $DEBUG brctl stp $if ${stp:-0}
     if_list=$(nvram_get ${type}_ifnames)
     for sif in $if_list; do {
       if_valid $sif || continue
       $DEBUG ifconfig $sif 0.0.0.0 up
-      $DEBUG brctl addif $if $sif 
+      $DEBUG brctl addif $if $sif
     } done
   fi
 
   if_mac=$(nvram_get ${type}_hwaddr)
-  [ -z "$if_mac" ] || $DEBUG ifconfig $if hw ether $if_mac
- 
+  ${if_mac:+$DEBUG ifconfig $if hw ether $if_mac}
+
   if_proto=$(nvram_get ${type}_proto)
   case "$if_proto" in
     static)
       if_ip=$(nvram_get ${type}_ipaddr)
       if_netmask=$(nvram_get ${type}_netmask)
       if_gateway=$(nvram_get ${type}_gateway)
-      
-      ipcalc -s "$if_ip"      || return 
-      ipcalc -s "$if_netmask" || return 
-      $DEBUG ifconfig $if $if_ip netmask $if_netmask up
 
-      ipcalc -s "$if_gateway" || return 
-      $DEBUG route add default gw $if_gateway
+      $DEBUG ifconfig $if $if_ip ${if_netmask:+netmask $if_netmask} broadcast + up
+      ${if_gateway:+$DEBUG route add default gw $if_gateway}
 
       [ -f /etc/resolv.conf ] && return
 
@@ -93,18 +82,19 @@ ifup () (
       if [ -f $pidfile ]; then
         $DEBUG kill $(cat $pidfile)
       fi
-      cmd="udhcpc -i $if -b -p $pidfile &"
-      ${DEBUG:-eval} $cmd
+      ${DEBUG:-eval} "udhcpc -i $if -b -p $pidfile &" 
     ;;
     pppoe)
       if_username=$(nvram_get ppp_username)
       if_password=$(nvram_get ppp_passwd)
       if_redial=$(nvram_get ppp_redialperiod)
       if_idletime=$(nvram_get ppp_idletime)
-      
+      if_mtu=$(nvram_get wan_mtu)
+
       $DEBUG ifconfig $if 0.0.0.0 up
-      
-      $DEBUG /sbin/pppoecd $if -u $if_username -p $if_password -i 0 -I $if_redial -T $if_idletime -k
+
+      $DEBUG /sbin/pppoecd $if -u $if_username -p $if_password \
+        -i 0 -I $if_redial -T $if_idletime -t $if_mtu -k
     ;;
     *)
       echo "### WARNING $if: $if_proto is not supported"
@@ -112,10 +102,11 @@ ifup () (
   esac
 )
 
-ifdown () (                                                                       
+ifdown () (
   type=$1
   debug "### ifdown $type ###"
-  if=$(nvram_get ${type}_ifname)                                                
-  if_valid $if || return                                                        
-  $DEBUG ifdown $if
+  if=$(nvram_get ${type}_ifname)
+  if_valid $if || return
+  kill $(cat /var/run/${if}.pid 2>-) 2>-
+  $DEBUG ifconfig $if down
 )