Inicio Explorar Axuda
Rexistro Iniciar sesión
FreifunkHochstift
/
gluon
6
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0
Árbore: 88bdc98108
Ramas Etiquetas
gluon
/
patches
/
openwrt
/
0015-odhcp6c-add-option-sourcefilter-to-disable-source-filter.patch

0015-odhcp6c-add-option-sourcefilter-to-disable-source-filter.patch 2.9 KB
Histórico Raw

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

  2. Date: Sat, 18 Jul 2015 17:13:23 +0200
    3. 

  3. Subject: odhcp6c: add option "sourcefilter" to disable source filter
    4. 

  4. 

  5. Signed-off-by: Steven Barth <steven@midlink.org>
    6. 

  6. 

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

  8. index 5bf43bd..75de54c 100644
    9. 

  9. --- a/package/network/ipv6/odhcp6c/Makefile
    10. 

  10. +++ b/package/network/ipv6/odhcp6c/Makefile
    11. 

  11. @@ -8,7 +8,7 @@
    12. 

  12.  include $(TOPDIR)/rules.mk
    13. 

  13.  
    14. 

  14.  PKG_NAME:=odhcp6c
    15. 

  15. -PKG_VERSION:=2015-07-13
    16. 

  16. +PKG_VERSION:=2015-07-18
    17. 

  17.  PKG_RELEASE=$(PKG_SOURCE_VERSION)
    18. 

  18.  
    19. 

  19.  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
    20. 

  20. diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script
    21. 

  21. index b8cbddb..33f6d9b 100755
    22. 

  22. --- a/package/network/ipv6/odhcp6c/files/dhcpv6.script
    23. 

  23. +++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script
    24. 

  24. @@ -76,7 +76,7 @@ setup_interface () {
    25. 

  25.  	done
    26. 

  26.  
    27. 

  27.  	for entry in $RA_ROUTES; do
    28. 

  28. -		local duplicate=0
    29. 

  29. +		local duplicate=$NOSOURCEFILTER
    30. 

  30.  		local addr="${entry%%/*}"
    31. 

  31.  		entry="${entry#*/}"
    32. 

  32.  		local mask="${entry%%,*}"
    33. 

  33. diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
    34. 

  34. index adcb100..4a453fd 100755
    35. 

  35. --- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh
    36. 

  36. +++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
    37. 

  37. @@ -28,14 +28,15 @@ proto_dhcpv6_init_config() {
    38. 

  38.  	proto_config_add_boolean delegate
    39. 

  39.  	proto_config_add_int "soltimeout"
    40. 

  40.  	proto_config_add_boolean fakeroutes
    41. 

  41. +	proto_config_add_boolean sourcefilter
    42. 

  42.  }
    43. 

  43.  
    44. 

  44.  proto_dhcpv6_setup() {
    45. 

  45.  	local config="$1"
    46. 

  46.  	local iface="$2"
    47. 

  47.  
    48. 

  48. -	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
    49. 

  49. -	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
    50. 

  50. +	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 sourcefilter
    51. 

  51. +	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 sourcefilter
    52. 

  52.  
    53. 

  53.  
    54. 

  54.  	# Configure
    55. 

  55. @@ -76,6 +77,7 @@ proto_dhcpv6_setup() {
    56. 

  56.  	[ -n "$zone_464xlat" ] && proto_export "ZONE_464XLAT=$zone_464xlat"
    57. 

  57.  	[ -n "$zone" ] && proto_export "ZONE=$zone"
    58. 

  58.  	[ "$fakeroutes" != "0" ] && proto_export "FAKE_ROUTES=1"
    59. 

  59. +	[ "$sourcefilter" = "0" ] && proto_export "NOSOURCEFILTER=1"
    60. 

  60.  
    61. 

  61.  	proto_export "INTERFACE=$config"
    62. 

  62.  	proto_run_command "$config" odhcp6c \
    63.