Home Verkennen Help
Registreren Inloggen
FreifunkHochstift
/
gluon
6
0
Vork 0
Bestanden Issues 0 Pull-aanvragen 0
Boom: 7d7c093007
Aftakkingen Labels
gluon
/
patches
/
openwrt
/
0012-Revert-ipv6-remove-now-unneeded-source-dest-routing-workarounds.patch

0012-Revert-ipv6-remove-now-unneeded-source-dest-routing-workarounds.patch 8.6 KB
Geschiedenis Ruwe

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214 
  1. From: Matthias Schiffer <mschiffer@universe-factory.net>
    2. 

  2. Date: Sun, 21 Jun 2015 05:48:45 +0200
    3. 

  3. Subject: Revert "ipv6: remove now unneeded source-dest-routing workarounds"
    4. 

  4. 

  5. This reverts commit 31214c38c8dd0f70366b523f9b0335145b9386bd.
    6. 

  6. 

  7. diff --git a/package/network/ipv6/6in4/Makefile b/package/network/ipv6/6in4/Makefile
    8. 

  8. index b7c2da7..21e69e6 100644
    9. 

  9. --- a/package/network/ipv6/6in4/Makefile
    10. 

  10. +++ b/package/network/ipv6/6in4/Makefile
    11. 

  11. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
    12. 

  12.  
    13. 

  13.  PKG_NAME:=6in4
    14. 

  14.  PKG_VERSION:=21
    15. 

  15. -PKG_RELEASE:=2
    16. 

  16. +PKG_RELEASE:=1
    17. 

  17.  PKG_LICENSE:=GPL-2.0
    18. 

  18.  
    19. 

  19.  include $(INCLUDE_DIR)/package.mk
    20. 

  20. diff --git a/package/network/ipv6/6in4/files/6in4.sh b/package/network/ipv6/6in4/files/6in4.sh
    21. 

  21. index af2ddca..0289df3 100755
    22. 

  22. --- a/package/network/ipv6/6in4/files/6in4.sh
    23. 

  23. +++ b/package/network/ipv6/6in4/files/6in4.sh
    24. 

  24. @@ -27,8 +27,8 @@ proto_6in4_setup() {
    25. 

  25.  	local iface="$2"
    26. 

  26.  	local link="6in4-$cfg"
    27. 

  27.  
    28. 

  28. -	local mtu ttl tos ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey
    29. 

  29. -	json_get_vars mtu ttl tos ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey
    30. 

  30. +	local mtu ttl tos ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey sourcerouting
    31. 

  31. +	json_get_vars mtu ttl tos ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey sourcerouting
    32. 

  32.  
    33. 

  33.  	[ -z "$peeraddr" ] && {
    34. 

  34.  		proto_notify_error "$cfg" "MISSING_ADDRESS"
    35. 

  35. @@ -48,17 +48,21 @@ proto_6in4_setup() {
    36. 

  36.  
    37. 

  37.  	proto_init_update "$link" 1
    38. 

  38.  
    39. 

  39. +	local source=""
    40. 

  40. +	[ "$sourcerouting" != "0" ] && source="::/128"
    41. 

  41. +	proto_add_ipv6_route "::" 0 "" "" "" "$source"
    42. 

  42. +
    43. 

  43.  	[ -n "$ip6addr" ] && {
    44. 

  44.  		local local6="${ip6addr%%/*}"
    45. 

  45.  		local mask6="${ip6addr##*/}"
    46. 

  46.  		[[ "$local6" = "$mask6" ]] && mask6=
    47. 

  47.  		proto_add_ipv6_address "$local6" "$mask6"
    48. 

  48. -		proto_add_ipv6_route "::" 0 "" "" "" "$local6/$mask6"
    49. 

  49. +		[ "$sourcerouting" != "0" ] && proto_add_ipv6_route "::" 0 "" "" "" "$local6/$mask6"
    50. 

  50.  	}
    51. 

  51.  
    52. 

  52.  	[ -n "$ip6prefix" ] && {
    53. 

  53.  		proto_add_ipv6_prefix "$ip6prefix"
    54. 

  54. -		proto_add_ipv6_route "::" 0 "" "" "" "$ip6prefix"
    55. 

  55. +		[ "$sourcerouting" != "0" ] && proto_add_ipv6_route "::" 0 "" "" "" "$ip6prefix"
    56. 

  56.  	}
    57. 

  57.  
    58. 

  58.  	proto_add_tunnel
    59. 

  59. @@ -142,6 +146,7 @@ proto_6in4_init_config() {
    60. 

  60.  	proto_config_add_int "mtu"
    61. 

  61.  	proto_config_add_int "ttl"
    62. 

  62.  	proto_config_add_string "tos"
    63. 

  63. +	proto_config_add_boolean "sourcerouting"
    64. 

  64.  }
    65. 

  65.  
    66. 

  66.  [ -n "$INCLUDE_ONLY" ] || {
    67. 

  67. diff --git a/package/network/ipv6/6rd/Makefile b/package/network/ipv6/6rd/Makefile
    68. 

  68. index cde7117..f9b7eae 100644
    69. 

  69. --- a/package/network/ipv6/6rd/Makefile
    70. 

  70. +++ b/package/network/ipv6/6rd/Makefile
    71. 

  71. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
    72. 

  72.  
    73. 

  73.  PKG_NAME:=6rd
    74. 

  74.  PKG_VERSION:=9
    75. 

  75. -PKG_RELEASE:=2
    76. 

  76. +PKG_RELEASE:=1
    77. 

  77.  PKG_LICENSE:=GPL-2.0
    78. 

  78.  
    79. 

  79.  include $(INCLUDE_DIR)/package.mk
    80. 

  80. diff --git a/package/network/ipv6/6rd/files/6rd.sh b/package/network/ipv6/6rd/files/6rd.sh
    81. 

  81. index 6c68b3b..b485136 100644
    82. 

  82. --- a/package/network/ipv6/6rd/files/6rd.sh
    83. 

  83. +++ b/package/network/ipv6/6rd/files/6rd.sh
    84. 

  84. @@ -14,8 +14,8 @@ proto_6rd_setup() {
    85. 

  85.  	local iface="$2"
    86. 

  86.  	local link="6rd-$cfg"
    87. 

  87.  
    88. 

  88. -	local mtu df ttl tos ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink zone
    89. 

  89. -	json_get_vars mtu df ttl tos ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink zone
    90. 

  90. +	local mtu df ttl tos ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink sourcerouting zone
    91. 

  91. +	json_get_vars mtu df ttl tos ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink sourcerouting zone
    92. 

  92.  
    93. 

  93.  	[ -z "$ip6prefix" -o -z "$peeraddr" ] && {
    94. 

  94.  		proto_notify_error "$cfg" "MISSING_ADDRESS"
    95. 

  95. @@ -54,8 +54,13 @@ proto_6rd_setup() {
    96. 

  96.  	proto_add_ipv6_address "$ip6addr" "$ip6prefixlen"
    97. 

  97.  	proto_add_ipv6_prefix "$ip6lanprefix"
    98. 

  98.  
    99. 

  99. -	proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "$ip6addr/$ip6prefixlen"
    100. 

  100. -	proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "$ip6lanprefix"
    101. 

  101. +	if [ "$sourcerouting" != "0" ]; then
    102. 

  102. +		proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "::/128"
    103. 

  103. +		proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "$ip6addr/$ip6prefixlen"
    104. 

  104. +		proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "$ip6lanprefix"
    105. 

  105. +	else
    106. 

  106. +		proto_add_ipv6_route "::" 0 "::$peeraddr" 4096
    107. 

  107. +	fi
    108. 

  108.  
    109. 

  109.  	proto_add_tunnel
    110. 

  110.  	json_add_string mode sit
    111. 

  111. diff --git a/package/network/ipv6/6to4/Makefile b/package/network/ipv6/6to4/Makefile
    112. 

  112. index fcec90d..6be2cc5 100644
    113. 

  113. --- a/package/network/ipv6/6to4/Makefile
    114. 

  114. +++ b/package/network/ipv6/6to4/Makefile
    115. 

  115. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
    116. 

  116.  
    117. 

  117.  PKG_NAME:=6to4
    118. 

  118.  PKG_VERSION:=12
    119. 

  119. -PKG_RELEASE:=2
    120. 

  120. +PKG_RELEASE:=1
    121. 

  121.  PKG_LICENSE:=GPL-2.0
    122. 

  122.  
    123. 

  123.  include $(INCLUDE_DIR)/package.mk
    124. 

  124. diff --git a/package/network/ipv6/6to4/files/6to4.sh b/package/network/ipv6/6to4/files/6to4.sh
    125. 

  125. index 57efc52..ce1de53 100755
    126. 

  126. --- a/package/network/ipv6/6to4/files/6to4.sh
    127. 

  127. +++ b/package/network/ipv6/6to4/files/6to4.sh
    128. 

  128. @@ -34,8 +34,8 @@ proto_6to4_setup() {
    129. 

  129.  	local iface="$2"
    130. 

  130.  	local link="6to4-$cfg"
    131. 

  131.  
    132. 

  132. -	local mtu ttl tos ipaddr
    133. 

  133. -	json_get_vars mtu ttl tos ipaddr
    134. 

  134. +	local mtu ttl tos ipaddr sourcerouting
    135. 

  135. +	json_get_vars mtu ttl tos ipaddr sourcerouting
    136. 

  136.  
    137. 

  137.  	( proto_add_host_dependency "$cfg" 0.0.0.0 )
    138. 

  138.  
    139. 

  139. @@ -65,8 +65,13 @@ proto_6to4_setup() {
    140. 

  140.  	proto_add_ipv6_address "$local6" 16
    141. 

  141.  	proto_add_ipv6_prefix "$prefix6::/48"
    142. 

  142.  
    143. 

  143. -	proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$local6/16"
    144. 

  144. -	proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$prefix6::/48"
    145. 

  145. +	if [ "$sourcerouting" != "0" ]; then
    146. 

  146. +		proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "::/128"
    147. 

  147. +		proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$local6/16"
    148. 

  148. +		proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$prefix6::/48"
    149. 

  149. +	else
    150. 

  150. +		proto_add_ipv6_route "::" 0 "::192.88.99.1"
    151. 

  151. +	fi
    152. 

  152.  
    153. 

  153.  	proto_add_tunnel
    154. 

  154.  	json_add_string mode sit
    155. 

  155. diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile
    156. 

  156. index a90f5ce..ddd6917 100644
    157. 

  157. --- a/package/network/ipv6/odhcp6c/Makefile
    158. 

  158. +++ b/package/network/ipv6/odhcp6c/Makefile
    159. 

  159. @@ -8,7 +8,7 @@
    160. 

  160.  include $(TOPDIR)/rules.mk
    161. 

  161.  
    162. 

  162.  PKG_NAME:=odhcp6c
    163. 

  163. -PKG_VERSION:=2015-06-09
    164. 

  164. +PKG_VERSION:=2015-05-16
    165. 

  165.  PKG_RELEASE=$(PKG_SOURCE_VERSION)
    166. 

  166.  
    167. 

  167.  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
    168. 

  168. diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script
    169. 

  169. index 650c9b2..6cd59fa 100755
    170. 

  170. --- a/package/network/ipv6/odhcp6c/files/dhcpv6.script
    171. 

  171. +++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script
    172. 

  172. @@ -86,9 +86,10 @@ setup_interface () {
    173. 

  173.  		entry="${entry#*,}"
    174. 

  174.  		local metric="${entry%%,*}"
    175. 

  175.  
    176. 

  176. -		if [ -z "$gw" ]; then
    177. 

  177. +		if [ -z "$SOURCE_ROUTING" -o -z "$gw" ]; then
    178. 

  178.  			proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid"
    179. 

  179.  		else
    180. 

  180. +			proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "::/128"
    181. 

  181.  			for prefix in $PREFIXES $ADDRESSES; do
    182. 

  182.  				local paddr="${prefix%%,*}"
    183. 

  183.  				proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "$paddr"
    184. 

  184. diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
    185. 

  185. index adcb100..9fb6fa3 100755
    186. 

  186. --- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh
    187. 

  187. +++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
    188. 

  188. @@ -23,6 +23,7 @@ proto_dhcpv6_init_config() {
    189. 

  189.  	proto_config_add_string zone_464xlat
    190. 

  190.  	proto_config_add_string zone
    191. 

  191.  	proto_config_add_string 'ifaceid:ip6addr'
    192. 

  192. +	proto_config_add_string 'sourcerouting:bool'
    193. 

  193.  	proto_config_add_string "userclass"
    194. 

  194.  	proto_config_add_string "vendorclass"
    195. 

  195.  	proto_config_add_boolean delegate
    196. 

  196. @@ -34,8 +35,8 @@ proto_dhcpv6_setup() {
    197. 

  197.  	local config="$1"
    198. 

  198.  	local iface="$2"
    199. 

  199.  
    200. 

  200. -	local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes
    201. 

  201. -	json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes
    202. 

  202. +	local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes
    203. 

  203. +	json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes
    204. 

  204.  
    205. 

  205.  
    206. 

  206.  	# Configure
    207. 

  207. @@ -69,6 +70,7 @@ proto_dhcpv6_setup() {
    208. 

  208.  	[ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite"
    209. 

  209.  	[ -n "$iface_map" ] && proto_export "IFACE_MAP=$iface_map"
    210. 

  210.  	[ -n "$iface_464xlat" ] && proto_export "IFACE_464XLAT=$iface_464xlat"
    211. 

  211. +	[ "$sourcerouting" != "0" ] && proto_export "SOURCE_ROUTING=1"
    212. 

  212.  	[ "$delegate" = "0" ] && proto_export "IFACE_DSLITE_DELEGATE=0"
    213. 

  213.  	[ "$delegate" = "0" ] && proto_export "IFACE_MAP_DELEGATE=0"
    214. 

  214.  	[ -n "$zone_dslite" ] && proto_export "ZONE_DSLITE=$zone_dslite"
    215.