Ticket #1260: cidr+aliases.2.patch

package/base-files/files/bin/ipcalc.sh

@@ -2 +2 @@
 
 awk -f /usr/lib/common.awk -f - $* <<EOF
 BEGIN {
-        ipaddr=ip2int(ARGV[1])
-        netmask=ip2int(ARGV[2])
+        slpos=index(ARGV[1],"/")
+        if (slpos == 0) {
+                ipaddr=ip2int(ARGV[1])
+                netmask=ip2int(ARGV[2])
+        } else {
+                ipaddr=ip2int(substr(ARGV[1],0,slpos-1))
+                netmask=compl(2**(32-int(substr(ARGV[1],slpos+1)))-1)
+                ARGV[4]=ARGV[3]
+                ARGV[3]=ARGV[2]
+        }
         network=and(ipaddr,netmask)
         broadcast=or(network,compl(netmask))
 

package/base-files/files/lib/network/config.sh

@@ -142 +142 @@
                 static)
                         config_get ipaddr "$config" ipaddr
                         config_get netmask "$config" netmask
-                        [ -z "$ipaddr" -o -z "$netmask" ] && return 1
+                       [ -z "$ipaddr" ] && return 1
+                       local IP NETMASK BROADCAST NETWORK PREFIX
+                       eval $(ipcalc "$ipaddr" "$netmask")
 
                         config_get ip6addr "$config" ip6addr
                         config_get gateway "$config" gateway
                         config_get dns "$config" dns
                         config_get bcast "$config" broadcast
+                        config_get aliases "$config" aliases
 
-                        [ -z "$ipaddr" ] || $DEBUG ifconfig "$iface" "$ipaddr" netmask "$netmask" broadcast "${bcast:-+}"
+                        $DEBUG ifconfig "$iface" "$IP" netmask "$NETMASK" broadcast "${bcast:-+}"
                         [ -z "$ip6addr" ] || $DEBUG ifconfig "$iface" add "$ip6addr"
                         [ -z "$gateway" ] || $DEBUG route add default gw "$gateway"
                         [ -z "$dns" ] || {
@@ -159 +162 @@
                                         }
                                 done
                         }
+                        [ -z "$aliases" ] || {
+                                i=1
+                                for al in $aliases; do
+                                        eval $(ipcalc "$al")
+                                        $DEBUG ifconfig "$iface":$i "$IP" netmask "$NETMASK" broadcast "$BROADCAST"
+                                        ((i++))
+                                done
+                        }
 
                         env -i ACTION="ifup" INTERFACE="$config" DEVICE="$iface" PROTO=static /sbin/hotplug-call "iface" &
                 ;;