Permalink
Browse files

Merge with GPL 3459 (RT-AC87U).

Note: this check point is only compilable for RT-AC87U due to a change in the model enum.
  • Loading branch information...
RMerl committed Jun 1, 2016
1 parent 0b6a36e commit 47213d4fb4dd8b637259b6b7408be05c24fa2f0c
Showing with 55,498 additions and 24,861 deletions.
  1. BIN release/src-rt-6.x.4708/wl/exe/prebuilt/wl
  2. +141 −66 release/src-rt-6.x.4708/wl/sysdeps/RT-AC68U/clm/src/wlc_clm_data.c
  3. +4 −0 release/src-rt/Makefile
  4. +1 −1 release/src/router/APP-IPK/AiCloud-ipk/opt/etc/apps_asus_script/smartsync_remove
  5. +5 −5 release/src/router/APP-IPK/SmartSync-ipk/opt/etc/apps_asus_script/smartsync_rm
  6. +20 −5 release/src/router/LPRng/src/common/lpd.c
  7. +5 −4 release/src/router/Makefile
  8. BIN release/src/router/acsd_arm/prebuilt/acsd_qtn
  9. BIN release/src/router/bwdpi/prebuilt_qtn/libbwdpi.so
  10. +4 −0 release/src/router/config/config.in
  11. +1 −0 release/src/router/config_base
  12. +100 −1 release/src/router/dnsmasq/CHANGELOG
  13. +3 −2 release/src/router/dnsmasq/Makefile
  14. +1 −1 release/src/router/dnsmasq/VERSION
  15. +1 −1 release/src/router/dnsmasq/bld/Android.mk
  16. +6 −0 release/src/router/dnsmasq/contrib/lease-tools/Makefile
  17. 0 release/src/router/dnsmasq/contrib/{wrt → lease-tools}/dhcp_lease_time.1
  18. 0 release/src/router/dnsmasq/contrib/{wrt → lease-tools}/dhcp_lease_time.c
  19. 0 release/src/router/dnsmasq/contrib/{wrt → lease-tools}/dhcp_release.1
  20. 0 release/src/router/dnsmasq/contrib/{wrt → lease-tools}/dhcp_release.c
  21. +38 −0 release/src/router/dnsmasq/contrib/lease-tools/dhcp_release6.1
  22. +445 −0 release/src/router/dnsmasq/contrib/lease-tools/dhcp_release6.c
  23. +0 −6 release/src/router/dnsmasq/contrib/wrt/Makefile
  24. +72 −15 release/src/router/dnsmasq/man/dnsmasq.8
  25. +480 −413 release/src/router/dnsmasq/po/de.po
  26. +467 −412 release/src/router/dnsmasq/po/es.po
  27. +460 −410 release/src/router/dnsmasq/po/fi.po
  28. +468 −412 release/src/router/dnsmasq/po/fr.po
  29. +471 −414 release/src/router/dnsmasq/po/id.po
  30. +460 −410 release/src/router/dnsmasq/po/it.po
  31. +465 −412 release/src/router/dnsmasq/po/no.po
  32. +465 −415 release/src/router/dnsmasq/po/pl.po
  33. +460 −410 release/src/router/dnsmasq/po/pt_BR.po
  34. +465 −412 release/src/router/dnsmasq/po/ro.po
  35. +247 −0 release/src/router/dnsmasq/src/arp.c
  36. +8 −2 release/src/router/dnsmasq/src/auth.c
  37. +1 −1 release/src/router/dnsmasq/src/blockdata.c
  38. +3 −1 release/src/router/dnsmasq/src/bpf.c
  39. +16 −35 release/src/router/dnsmasq/src/cache.c
  40. +3 −2 release/src/router/dnsmasq/src/config.h
  41. +1 −1 release/src/router/dnsmasq/src/conntrack.c
  42. +1 −1 release/src/router/dnsmasq/src/dbus.c
  43. +1 −1 release/src/router/dnsmasq/src/dhcp-common.c
  44. +1 −1 release/src/router/dnsmasq/src/dhcp-protocol.h
  45. +5 −3 release/src/router/dnsmasq/src/dhcp.c
  46. +1 −1 release/src/router/dnsmasq/src/dhcp6-protocol.h
  47. +25 −48 release/src/router/dnsmasq/src/dhcp6.c
  48. +4 −1 release/src/router/dnsmasq/src/dns-protocol.h
  49. +54 −20 release/src/router/dnsmasq/src/dnsmasq.c
  50. +55 −49 release/src/router/dnsmasq/src/dnsmasq.h
  51. +638 −918 release/src/router/dnsmasq/src/dnssec.c
  52. +1 −1 release/src/router/dnsmasq/src/domain.c
  53. +429 −0 release/src/router/dnsmasq/src/edns0.c
  54. +509 −701 release/src/router/dnsmasq/src/forward.c
  55. +60 −10 release/src/router/dnsmasq/src/helper.c
  56. +7 −2 release/src/router/dnsmasq/src/inotify.c
  57. +1 −1 release/src/router/dnsmasq/src/ip6addr.h
  58. +13 −9 release/src/router/dnsmasq/src/lease.c
  59. +1 −1 release/src/router/dnsmasq/src/log.c
  60. +1 −1 release/src/router/dnsmasq/src/loop.c
  61. +3 −2 release/src/router/dnsmasq/src/netlink.c
  62. +77 −27 release/src/router/dnsmasq/src/network.c
  63. +130 −55 release/src/router/dnsmasq/src/option.c
  64. +1 −1 release/src/router/dnsmasq/src/outpacket.c
  65. +1 −1 release/src/router/dnsmasq/src/poll.c
  66. +1 −1 release/src/router/dnsmasq/src/radv-protocol.h
  67. +15 −6 release/src/router/dnsmasq/src/radv.c
  68. +61 −570 release/src/router/dnsmasq/src/rfc1035.c
  69. +79 −11 release/src/router/dnsmasq/src/rfc2131.c
  70. +5 −4 release/src/router/dnsmasq/src/rfc3315.c
  71. +339 −0 release/src/router/dnsmasq/src/rrfilter.c
  72. +1 −1 release/src/router/dnsmasq/src/slaac.c
  73. +17 −6 release/src/router/dnsmasq/src/tftp.c
  74. +1 −1 release/src/router/dnsmasq/src/util.c
  75. BIN release/src/router/et_arm/prebuilt/et.o
  76. +405 −405 release/src/router/httpd/apps.c
  77. +20 −8 release/src/router/httpd/httpd.c
  78. +106 −1 release/src/router/httpd/sysdeps/web-broadcom-wl6.c
  79. +74 −0 release/src/router/httpd/sysdeps/web-broadcom.c
  80. +349 −337 release/src/router/httpd/web.c
  81. +4 −3 release/src/router/infosvr/common.c
  82. +1 −1 release/src/router/infosvr/infosvr.c
  83. +1 −1 release/src/router/libdisk/usb_info.c
  84. +7 −6 release/src/router/libdisk/write_smb_conf.c
  85. +270 −0 release/src/router/lighttpd-1.4.39/ar-lib
  86. +347 −0 release/src/router/lighttpd-1.4.39/compile
  87. +1,441 −0 release/src/router/lighttpd-1.4.39/config.guess
  88. +503 −0 release/src/router/lighttpd-1.4.39/config.h.in
  89. +1,813 −0 release/src/router/lighttpd-1.4.39/config.sub
  90. +19,198 −0 release/src/router/lighttpd-1.4.39/configure
  91. +77 −163 release/src/router/lighttpd-1.4.39/configure.ac
  92. +791 −0 release/src/router/lighttpd-1.4.39/depcomp
  93. +508 −0 release/src/router/lighttpd-1.4.39/install-sh
  94. +9,661 −0 release/src/router/lighttpd-1.4.39/ltmain.sh
  95. +7,997 −0 release/src/router/lighttpd-1.4.39/m4/libtool.m4
  96. +384 −0 release/src/router/lighttpd-1.4.39/m4/ltoptions.m4
  97. +123 −0 release/src/router/lighttpd-1.4.39/m4/ltsugar.m4
  98. +23 −0 release/src/router/lighttpd-1.4.39/m4/ltversion.m4
  99. +98 −0 release/src/router/lighttpd-1.4.39/m4/lt~obsolete.m4
  100. +217 −0 release/src/router/lighttpd-1.4.39/missing
  101. +0 −424 release/src/router/lighttpd-1.4.39/src/mod_captive_portal_uam.c
  102. BIN release/src/router/nas_arm/nas/prebuilt/nas_qtn
  103. +3 −1 release/src/router/networkmap/ASUS_Discovery.c
  104. +2 −1 release/src/router/networkmap/Makefile
  105. +0 −778 release/src/router/networkmap/iboxcom.h
  106. +1 −4 release/src/router/pppd/pppd/fsm.c
  107. +4 −12 release/src/router/pppd/pppd/lcp.c
  108. +2 −0 release/src/router/pppd/pppd/pppd.h
  109. +34 −27 release/src/router/pppd/pppd/utils.c
  110. +8 −0 release/src/router/qtnimage/router_command.sh
  111. +21 −18 release/src/router/rc/common.c
  112. +18 −3 release/src/router/rc/firewall.c
  113. +51 −7 release/src/router/rc/init.c
  114. +1 −1 release/src/router/rc/lan.c
  115. +5 −1 release/src/router/rc/ppp.c
  116. +8 −9 release/src/router/rc/pppd.c
  117. BIN release/src/router/rc/prebuild/models/RT-AC87U/ate-broadcom.o
  118. BIN release/src/router/rc/prebuild/models/RT-AC87U/tcode_brcm.o
  119. BIN release/src/router/rc/prebuild/models/RT-AC87U/tcode_rc.o
  120. +24 −7 release/src/router/rc/psta_monitor.c
  121. +2 −2 release/src/router/rc/rc.c
  122. +5 −2 release/src/router/rc/rc.h
  123. +73 −68 release/src/router/rc/services.c
  124. +1 −1 release/src/router/rc/sysdeps/broadcom/broadcom.c
  125. +8 −17 release/src/router/rc/sysdeps/init-broadcom.c
  126. +0 −5 release/src/router/rc/sysdeps/qca/qca.c
  127. +1 −1 release/src/router/rc/traffic_limiter.c
  128. +9 −9 release/src/router/rc/usb.c
  129. +3 −3 release/src/router/rc/usb_devices.c
  130. +1 −0 release/src/router/rc/vpn.c
  131. +6 −20 release/src/router/rc/vpnc.c
  132. +46 −20 release/src/router/rc/wan.c
  133. +71 −42 release/src/router/rc/wanduck.c
  134. +3 −3 release/src/router/rc/watchdog.c
  135. +4 −4 release/src/router/rom/apps_scripts/app_base_library.sh
  136. +2 −2 release/src/router/rom/apps_scripts/app_base_packages.sh
  137. +1 −1 release/src/router/rom/apps_scripts/app_init_run.sh
  138. +28 −27 release/src/router/rom/apps_scripts/app_install.sh
  139. +12 −12 release/src/router/rom/apps_scripts/app_remove.sh
  140. +4 −4 release/src/router/rom/apps_scripts/app_set_enabled.sh
  141. +1 −1 release/src/router/rom/apps_scripts/app_stop.sh
  142. +4 −4 release/src/router/rom/apps_scripts/app_switch.sh
  143. +22 −22 release/src/router/rom/apps_scripts/app_upgrade.sh
  144. +5 −5 release/src/router/rom/apps_scripts/asusrouter
  145. +1 −1 release/src/router/rom/apps_scripts/modem_at.sh
  146. +2 −2 release/src/router/rom/apps_scripts/modem_autoapn.sh
  147. +45 −43 release/src/router/rom/apps_scripts/modem_enable.sh
  148. +34 −34 release/src/router/rom/apps_scripts/modem_status.sh
  149. +2 −2 release/src/router/rom/apps_scripts/modem_stop.sh
  150. +5 −3 release/src/router/shared/defaults.c
  151. +12 −4 release/src/router/shared/iboxcom.h
  152. BIN release/src/router/shared/prebuild/models/RT-AC87U/private.o
  153. BIN release/src/router/shared/prebuild/models/RT-AC87U/tcode.o
  154. +8 −0 release/src/router/shared/shared.h
  155. +53 −0 release/src/router/shared/sysdeps/api-broadcom.c
  156. +196 −0 release/src/router/shared/sysdeps/api-qca.c
  157. +35 −0 release/src/router/shared/sysdeps/api-ralink.c
  158. +0 −13,943 release/src/router/tor/configure.orig
  159. +0 −623 release/src/router/tor/orconfig.h.in.orig
  160. BIN release/src/router/wl_arm/RT-AC87U/prebuilt/wl_apsta.o
  161. +1 −5 release/src/router/www/APP_Installation.asp
  162. +1 −1 release/src/router/www/Advanced_AiDisk_ftp.asp
  163. +2 −1 release/src/router/www/Advanced_AiDisk_samba.asp
  164. +1 −1 release/src/router/www/Advanced_FirmwareUpgrade_Content.asp
  165. +1 −1 release/src/router/www/Advanced_OperationMode_Content.asp
  166. +1 −1 release/src/router/www/Advanced_TimeMachine.asp
  167. +39 −40 release/src/router/www/Advanced_WAN_Content.asp
  168. +2 −1 release/src/router/www/AiProtection_HomeProtection.asp
  169. +0 −3 release/src/router/www/AiProtection_HomeSecurity.asp
  170. +44 −22 release/src/router/www/BR.dict
  171. +43 −22 release/src/router/www/CN.dict
  172. +45 −23 release/src/router/www/CZ.dict
  173. +43 −22 release/src/router/www/DA.dict
  174. +43 −22 release/src/router/www/DE.dict
  175. +43 −22 release/src/router/www/EN.dict
  176. +43 −22 release/src/router/www/ES.dict
  177. +43 −22 release/src/router/www/FI.dict
  178. +45 −23 release/src/router/www/FR.dict
  179. +0 −4 release/src/router/www/Feedback_Info.asp
  180. +43 −22 release/src/router/www/HU.dict
  181. +43 −22 release/src/router/www/IT.dict
  182. +44 −23 release/src/router/www/JP.dict
  183. +43 −22 release/src/router/www/KR.dict
  184. +43 −22 release/src/router/www/MS.dict
  185. +10 −1 release/src/router/www/Main_Login.asp
  186. +24 −1 release/src/router/www/Main_Password.asp
  187. +8 −9 release/src/router/www/Main_TrafficMonitor_last24.asp
  188. +17 −16 release/src/router/www/Main_TrafficMonitor_realtime.asp
  189. +43 −22 release/src/router/www/NO.dict
  190. +43 −22 release/src/router/www/PL.dict
  191. +6 −4 release/src/router/www/QoS_EZQoS.asp
  192. +43 −22 release/src/router/www/RO.dict
  193. +43 −22 release/src/router/www/RU.dict
  194. +43 −22 release/src/router/www/SV.dict
  195. +43 −22 release/src/router/www/TH.dict
  196. +43 −22 release/src/router/www/TR.dict
  197. +43 −22 release/src/router/www/TW.dict
  198. +44 −22 release/src/router/www/UK.dict
  199. +1 −1 release/src/router/www/UpdateError_reboot.asp
  200. +15 −9 release/src/router/www/Updating.asp
  201. +2 −0 release/src/router/www/ajax_status.xml
  202. +19 −9 release/src/router/www/client_function.js
  203. +1 −1 release/src/router/www/cloud_main.asp
  204. +1 −1 release/src/router/www/cloud_router_sync.asp
  205. +1 −1 release/src/router/www/cloud_settings.asp
  206. +2 −2 release/src/router/www/cloud_sync.asp
  207. +1 −1 release/src/router/www/cloud_syslog.asp
  208. +7 −1 release/src/router/www/device-map/clients.asp
  209. +79 −66 release/src/router/www/device-map/device-map.css
  210. +21 −0 release/src/router/www/device-map/internet.asp
  211. +9 −1 release/src/router/www/device-map/router.asp
  212. +61 −29 release/src/router/www/device-map/router_status.asp
  213. +55 −23 release/src/router/www/form_style.css
  214. +5 −3 release/src/router/www/general.js
  215. BIN release/src/router/www/images/New_ui/networkmap/client.png
  216. BIN release/src/router/www/images/New_ui/networkmap/line_singwan_error.png
  217. +93 −164 release/src/router/www/index.asp
  218. +1 −5 release/src/router/www/index_style.css
  219. +2 −1 release/src/router/www/mediaserver.asp
  220. +5 −11 release/src/router/www/qis/QIS_admin_pass.htm
  221. +1 −1 release/src/router/www/qis/QIS_finish.htm
  222. +1 −1 release/src/router/www/qis/QIS_wireless.htm
  223. +1 −1 release/src/router/www/qis_m/QIS_finish.htm
  224. +19 −17 release/src/router/www/start_apply.htm
  225. +8 −0 release/src/router/www/start_apply2.htm
  226. +149 −41 release/src/router/www/state.js
  227. +100 −0 release/src/router/www/sysdep/RT-AC66U/www/Advanced_Wireless_Content.asp
  228. +98 −0 release/src/router/www/sysdep/RT-AC66U/www/chanspec.js
  229. +1 −1 release/src/router/www/userRpm/SoftwareUpgradeRpm.htm
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -586,6 +586,10 @@ define RouterOptions
sed -i "/RTCONFIG_QCA_TW_AUTO_BAND4/d" $(1); \
echo "RTCONFIG_QCA_TW_AUTO_BAND4=y" >>$(1); \
fi; \
if [ "$(NEWSSID_REV2)" = "y" ]; then \
sed -i "/RTCONFIG_NEWSSID_REV2/d" $(1); \
echo "RTCONFIG_NEWSSID_REV2=y" >>$(1); \
fi; \
if [ "$(FINDASUS)" = "y" ]; then \
sed -i "/RTCONFIG_FINDASUS/d" $(1); \
echo "RTCONFIG_FINDASUS=y" >>$(1); \
@@ -6,4 +6,4 @@ APPS_INSTALL_PATH=$APPS_MOUNTED_PATH/$APPS_INSTALL_FOLDER

sleep 4

app_remove.sh smartsync
/usr/sbin/app_remove.sh smartsync
@@ -7,12 +7,12 @@ APPS_INSTALL_PATH=$APPS_MOUNTED_PATH/$APPS_INSTALL_FOLDER

sleep 4

app_remove.sh webdavclient
/usr/sbin/app_remove.sh webdavclient
sleep 2
app_remove.sh asuswebstorage
/usr/sbin/app_remove.sh asuswebstorage
sleep 2
app_remove.sh ftpclient
/usr/sbin/app_remove.sh ftpclient
sleep 2
app_remove.sh dropboxclient
/usr/sbin/app_remove.sh dropboxclient
sleep 2
app_remove.sh inotify
/usr/sbin/app_remove.sh inotify
@@ -23,6 +23,7 @@
#include <sys/wait.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <net/if.h>
#include <arpa/inet.h>
#include <errno.h>
#include <linux/lp.h>
@@ -152,6 +153,8 @@ int main(int argc, char *argv[])
int lock;
int pid = 0;
FILE *fp;
struct ifreq ifr;
struct in_addr local;

fp = fopen("/var/run/lpdparent.pid", "r");
if (fp) {
@@ -191,11 +194,20 @@ int main(int argc, char *argv[])
exit(0);
}

local.s_addr = htonl(INADDR_ANY);
if (argv[1]) {
memset(&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_name, argv[1], sizeof(ifr.ifr_name));
if(ioctl(sockfd, SIOCGIFADDR, &ifr) < 0)
syslog(LOGOPTS, "can't get interface %s address: %m", argv[1]);
else
local.s_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr;
}

bzero((char *)&serv_addr , sizeof(serv_addr));
serv_addr.sin_family = AF_INET;
serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
serv_addr.sin_addr.s_addr = local.s_addr;
serv_addr.sin_port = htons(PNT_SVR_PORT_LPR);


if(bind(sockfd,(struct sockaddr *)&serv_addr , sizeof(serv_addr)) < 0 )
{
@@ -223,7 +235,7 @@ int main(int argc, char *argv[])
}
netaddr.sin_family = AF_INET;
netaddr.sin_port = htons(BASEPORT);
netaddr.sin_addr.s_addr = htonl(INADDR_ANY);
netaddr.sin_addr.s_addr = local.s_addr;
memset(netaddr.sin_zero, 0, sizeof(netaddr.sin_zero));
if (bind(netfd, (struct sockaddr*) &netaddr, sizeof(netaddr)) < 0)
{
@@ -247,7 +259,7 @@ int main(int argc, char *argv[])
}
bzero((char *)&serv_addr_ASUS , sizeof(serv_addr_ASUS));
serv_addr_ASUS.sin_family = AF_INET;
serv_addr_ASUS.sin_addr.s_addr = htonl(INADDR_ANY);
serv_addr_ASUS.sin_addr.s_addr = local.s_addr;
serv_addr_ASUS.sin_port = htons(PNT_SVR_PORT_ASUS);

if(bind(sockfd_ASUS,(struct sockaddr *)&serv_addr_ASUS , sizeof(serv_addr_ASUS)) < 0 )
@@ -1244,15 +1256,18 @@ void check_prn_status(char *status_prn, char *cliadd_prn)
/*JY1114: get printer queue name for LPR*/
int get_queue_name(char *input)
{
#if 0
char QueueName_got[32];
char *index1;
int rps_i=0, rps_j=0;
while(index1 = strrchr(input, ' '))
index1[0] = 0;
rps_i = 0;
strcpy(QueueName_got, input);
memset(QueueName_got, 0, sizeof(QueueName_got));
strncpy(QueueName_got, input, sizeof(QueueName_got) - 1);
//return(strcmp(QueueName_got, "LPRServer"));
//by pass queue Name Check
#endif
return 0;
}

@@ -495,10 +495,14 @@ obj-$(RTCONFIG_WEBDAV) += samba-3.5.8

ifneq ($(RTCONFIG_SAMBA_MODERN),y)
ifeq ($(CONFIG_BCMWL5),y)
ifneq ($(RTCONFIG_8M_SFP),y)
obj-$(NEED_SAMBA3) += samba-3.0.33
else
obj-$(NEED_SAMBA3) += samba3
endif
else
obj-$(NEED_SAMBA3) += samba3
endif

else # Samba 3.6.x
obj-$(NEED_SAMBA3) += samba36
@@ -3545,10 +3549,7 @@ nas$(BCMEX)$(EX7): nvram$(BCMEX)
eapd$(BCMEX)$(EX7)-clean:
-@cd eapd$(BCMEX)$(EX7)/linux && make clean

lighttpd-1.4.39/Makefile:
cd lighttpd-1.4.39 && ./autogen.sh

lighttpd-1.4.39/stamp-h1: lighttpd-1.4.39/Makefile
lighttpd-1.4.39/stamp-h1:
ifneq ($(RTCONFIG_QTN),y)
cd lighttpd-1.4.39 && ./preconfigure-script touch $@
else
Binary file not shown.
Binary file not shown.
@@ -564,6 +564,10 @@ config RTCONFIG_LOCALE2012
depends on RTCONFIG_RALINK_RT3883
default n

config RTCONFIG_NEWSSID_REV2
bool "New ASUS_2GMAC_xG rule"
default n

config RTCONFIG_QCA
bool "Qualcomm Atheros Chip Support"
default n
@@ -63,6 +63,7 @@ RTCONFIG_L7PAT=y
# RTCONFIG_DHCP_OVERRIDE is not set
# RTCONFIG_MTK_TW_AUTO_BAND4 is not set
# RTCONFIG_QCA_TW_AUTO_BAND4 is not set
# RTCONFIG_NEWSSID_REV2 is not set
# RTCONFIG_LED_ALL is not set
# RTCONFIG_COMA is not set
# RTCONFIG_PARENTALCTRL is not set
@@ -18,7 +18,106 @@ version 2.76
that the same name is empty. Thanks to Edwin Török for
the patch.


Fix failure to correctly calculate cache-size when
reading a hosts-file fails. Thanks to André Glüpker
for the patch.

Fix wrong answer to simple name query when --domain-needed
set, but no upstream servers configured. Dnsmasq returned
REFUSED, in this case, when it should be the same as when
upstream servers are configured - NOERROR. Thanks to
Allain Legacy for spotting the problem.

Return REFUSED when running out of forwarding table slots,
not SERVFAIL.

Add --max-port configuration. Thanks to Hans Dedecker for
the patch.

Add --script-arp and two new functions for the dhcp-script.
These are "arp" and "arp-old" which announce the arrival and
removal of entries in the ARP or nieghbour tables.

Extend --add-mac to allow a new encoding of the MAC address
as base64, by configurting --add-mac=base64

Add --add-cpe-id option.

Don't crash with divide-by-zero if an IPv6 dhcp-range
is declared as a whole /64.
(ie xx::0 to xx::ffff:ffff:ffff:ffff)
Thanks to Laurent Bendel for spotting this problem.

Add support for a TTL parameter in --host-record and
--cname.

Add --dhcp-ttl option.

Add --tftp-mtu option. Thanks to Patrick McLean for the
initial patch.

Check return-code of inet_pton() when parsing dhcp-option.
Bad addresses could fail to generate errors and result in
garbage dhcp-options being sent. Thanks to Marc Branchaud
for spotting this.

Fix wrong value for EDNS UDP packet size when using
--servers-file to define upstream DNS servers. Thanks to
Scott Bonar for the bug report.

Move the dhcp_release and dhcp_lease_time tools from
contrib/wrt to contrib/lease-tools.

Add dhcp_release6 to contrib/lease-tools. Many thanks
to Sergey Nechaev for this code.

To avoid filling logs in configurations which define
many upstream nameservers, don't log more that 30 servers.
The number to be logged can be changed as SERVERS_LOGGED
in src/config.h.

Swap the values if BC_EFI and x86-64_EFI in --pxe-service.
These were previously wrong due to an error in RFC 4578.
If you're using BC_EFI to boot 64-bit EFI machines, you
will need to update your config.

Add ARM32_EFI and ARM64_EFI as valid architectures in
--pxe-service.

Fix PXE booting for UEFI architectures. Modify PXE boot
sequence in this case to force the client to talk to dnsmasq
over port 4011. This makes PXE and especially proxy-DHCP PXE
work with these archictectures.

Workaround problems with UEFI PXE clients. There exist
in the wild PXE clients which have problems with PXE
boot menus. To work around this, when there's a single
--pxe-service which applies to client, then that target
will be booted directly, rather then sending a
single-item boot menu.

Many thanks to Jarek Polok, Michael Kuron and Dreamcat4
for their work on the long-standing UEFI PXE problem.

Subtle change in the semantics of "basename" in
--pxe-service. The historical behaviour has always been
that the actual filename downloaded from the TFTP server
is <basename>.<layer> where <layer> is an integer which
corresponds to the layer parameter supplied by the client.
It's not clear what the function of the "layer"
actually is in the PXE protocol, and in practise layer
is always zero, so the filename is <basename>.0
The new behaviour is the same as the old, except when
<basename> includes a file suffix, in which case
the layer suffix is no longer added. This allows
sensible suffices to be used, rather then the
meaningless ".0". Only in the unlikely event that you
have a config with a basename which already has a
suffix, is this an incompatible change, since the file
downloaded will change from name.suffix.0 to just
name.suffix


version 2.75
Fix reversion on 2.74 which caused 100% CPU use when a
dhcp-script is configured. Thanks to Adrian Davey for
@@ -1,4 +1,4 @@
# dnsmasq is Copyright (c) 2000-2015 Simon Kelley
# dnsmasq is Copyright (c) 2000-2016 Simon Kelley
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -73,7 +73,8 @@ objs = cache.o rfc1035.o util.o option.o forward.o network.o \
dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o \
helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o \
dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o \
domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o
domain.o dnssec.o blockdata.o tables.o loop.o inotify.o \
poll.o rrfilter.o edns0.o arp.o

hdrs = dnsmasq.h config.h dhcp-protocol.h dhcp6-protocol.h \
dns-protocol.h radv-protocol.h ip6addr.h
@@ -1 +1 @@
2.76-g0007ee9
2.76
@@ -10,7 +10,7 @@ LOCAL_SRC_FILES := bpf.c cache.c dbus.c dhcp.c dnsmasq.c \
dhcp6.c rfc3315.c dhcp-common.c outpacket.c \
radv.c slaac.c auth.c ipset.c domain.c \
dnssec.c dnssec-openssl.c blockdata.c tables.c \
loop.c inotify.c poll.c
loop.c inotify.c poll.c rrfilter.c edns0.c arp.c

LOCAL_MODULE := dnsmasq

@@ -0,0 +1,6 @@
CFLAGS?= -O2 -Wall -W

all: dhcp_release dhcp_release6 dhcp_lease_time

clean:
rm -f *~ *.o core dhcp_release dhcp_release6 dhcp_lease_time
@@ -0,0 +1,38 @@
.TH DHCP_RELEASE 1
.SH NAME
dhcp_release6 \- Release a DHCPv6 lease on a the local dnsmasq DHCP server.
.SH SYNOPSIS
.B dhcp_release6 --iface <interface> --client-id <client-id> --server-id
server-id --iaid <iaid> --ip <IP> [--dry-run] [--help]
.SH "DESCRIPTION"
A utility which forces the DHCP server running on this machine to release a
DHCPv6 lease.
.SS OPTIONS
.IP "-a, --ip"
IPv6 address to release.
.IP "-c, --client-id"
Colon-separated hex string representing DHCPv6 client id. Normally
it can be found in leases file both on client and server.
.IP "-d, --dry-run"
Print hexadecimal representation of generated DHCPv6 release packet to standard
output and exit.
.IP "-h, --help"
print usage information to standard output and exit.
.IP "-i, --iaid"
Decimal representation of DHCPv6 IAID. Normally it can be found in leases file
both on client and server.
.IP "-n, --iface"
Network interface to send a DHCPv6 release packet from.
.IP "-s, --server-id"
Colon-separated hex string representing DHCPv6 server id. Normally
it can be found in leases file both on client and server.
.SH NOTES
MUST be run as root - will fail otherwise.
.SH LIMITATIONS
Only usable on IPv6 DHCP leases.
.SH SEE ALSO
.BR dnsmasq (8)
.SH AUTHOR
This manual page was written by Simon Kelley <simon@thekelleys.org.uk>.


Oops, something went wrong.

0 comments on commit 47213d4

Please sign in to comment.