From 49d34155494e7e1625855003bcbb240d2c1fe051 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 13 Jun 2009 14:42:47 +0000
Subject: udhcpc: add cidr routes support (patch from #5299)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16433 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
.../files/usr/share/udhcpc/default.script | 74 ++++++++++++++++++++++
package/busybox/patches/244-udhcpc_cidrroute.patch | 18 ++++++
2 files changed, 92 insertions(+)
create mode 100644 package/busybox/patches/244-udhcpc_cidrroute.patch
(limited to 'package')
diff --git a/package/base-files/files/usr/share/udhcpc/default.script b/package/base-files/files/usr/share/udhcpc/default.script
index f629c745f..08b59d086 100755
--- a/package/base-files/files/usr/share/udhcpc/default.script
+++ b/package/base-files/files/usr/share/udhcpc/default.script
@@ -62,6 +62,80 @@ setup_interface () {
change_state network "$ifc" gateway "$router"
}
+ # CIDR STATIC ROUTES (rfc3442)
+ [ -n "$cidrroute" ] && {
+ # This defines how many CIDR Routes can be assigned so that we do not enter
+ # an endless loop on malformed data
+ MAXCIDRROUTES=24;
+ while [ ${MAXCIDRROUTES} -gt "0" ]; do
+ # Format is
+ # $MASK $NW $GW
+ # $NW == AAA.BBB.CCC.DDD
+ # $GW == EEE.FFF.CCC.DDD
+ # $MASK AAA.[BBB].[CCC].[DDD] EEE.FFF.GGG.HHH
+ # 1 2 3 4 5 6 7 8 9
+ MASK=$(echo $cidrroute | awk '{ print $1 }')
+ if [ ${MASK} = "0" ] ; then
+ # $MASK EEE.FFF.GGG.HHH
+ # 1 2 3 5 6
+ NW="0"
+ GW=$(echo $cidrroute | awk '{ print $2"."$3"."$4"."$5 }' )
+ elif [ ${MASK} -le "8" ] ; then
+ # $MASK AAA EEE.FFF.GGG.HHH
+ # 1 2 3 5 6 7
+ NW=$(echo $cidrroute | awk '{ print $2 }' )
+ GW=$(echo $cidrroute | awk '{ print $3"."$4"."$5"."$6 }' )
+ elif [ ${MASK} -le "16" ] ; then
+ # $MASK AAA.BBB EEE.FFF.GGG.HHH
+ # 1 2 3 5 6 7 8
+ NW=$(echo $cidrroute | awk '{ print $2"."$3 }' )
+ GW=$(echo $cidrroute | awk '{ print $4"."$5"."$6"."$7 }' )
+ elif [ ${MASK} -le "24" ] ; then
+ # $MASK AAA.BBB.CCC EEE.FFF.GGG.HHH
+ # 1 2 3 4 5 6 7 8
+ NW=$(echo $cidrroute | awk '{ print $2"."$3"."$4 }' )
+ GW=$(echo $cidrroute | awk '{ print $5"."$6"."$7"."$8 }' )
+
+ else
+ # $MASK AAA.BBB.CCC.DDD EEE.FFF.GGG.HHH
+ # 1 2 3 4 5 6 7 8 9
+ NW=$(echo $cidrroute | awk '{ print $2"."$3"."$4"."$5 }' )
+ GW=$(echo $cidrroute | awk '{ print $6"."$7"."$8"."$9 }' )
+ fi
+ echo [$ROUTECOUNTER] Route Network: $NW/$MASK Gateway: $GW on $interface
+
+ # TODO: Check for malformed data here to eliminate counter workaround
+ # Malformed data is: ... or xxx... or xxx.yyy.. or xxx.yyy.zzz.
+
+ [ -n "$NW" ] && [ -n "$GW" ] && {
+ route add $NW gw $GW dev $interface
+ }
+
+ # Clear the strings incase they don't get set next time around
+ if [ ${NW} = "0" ]; then
+ NW=""
+ fi
+ TMP="$MASK $NW $GW "
+ NW=""
+ GW=""
+
+ # Remove the '.' so that we can delete them from the input with sed
+ TMP=$(echo $TMP | sed "s/\./ /g")
+
+ # Remove the previous entry from cidrroute
+ cidrroute=$(echo $cidrroute | sed "s/$TMP//g")
+
+ # Add to counter
+ let ROUTECOUNTER=$ROUTECOUNTER+1;
+ let MAXCIDRROUTES=$MAXCIDRROUTES-1;
+
+ # Leave the loop if cidrroutes is empty (we've parsed everything)
+ [ ! -n "$cidrroute" ] && break
+
+ done
+
+ echo "done."
+ }
# DNS
config_get old_dns "$ifc" dns
diff --git a/package/busybox/patches/244-udhcpc_cidrroute.patch b/package/busybox/patches/244-udhcpc_cidrroute.patch
new file mode 100644
index 000000000..726775035
--- /dev/null
+++ b/package/busybox/patches/244-udhcpc_cidrroute.patch
@@ -0,0 +1,18 @@
+--- a/networking/udhcp/options.c
++++ b/networking/udhcp/options.c
+@@ -46,6 +46,7 @@ const struct dhcp_option dhcp_options[]
+ #if ENABLE_FEATURE_UDHCP_RFC3397
+ { OPTION_STR1035 | OPTION_LIST , 0x77 }, /* search */
+ #endif
++ { OPTION_U8 | OPTION_LIST | OPTION_REQ, 0x79 }, /* cidr_static_routes */
+ /* MSIE's "Web Proxy Autodiscovery Protocol" support */
+ { OPTION_STRING , 0xfc }, /* wpad */
+
+@@ -95,6 +96,7 @@ const char dhcp_option_strings[] ALIGN1
+ #if ENABLE_FEATURE_UDHCP_RFC3397
+ "search" "\0"
+ #endif
++ "cidrroute" "\0" /* cidr_static_routes */
+ /* MSIE's "Web Proxy Autodiscovery Protocol" support */
+ "wpad" "\0"
+ ;
--
cgit v1.2.3