73 Commits

Author	SHA1	Message	Date
Denys Vlasenko	74d9f1ba37	udhcpc: when decoding DHCP_SUBNET, ensure it is 4 bytes long ... function old new delta udhcp_run_script 795 801 +6 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2019-01-07 15:33:42 +01:00
Denys Vlasenko	b80bdeba02	udhcp: code shrink ... function old new delta attach_option 406 349 -57 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2019-01-07 15:23:18 +01:00
Denys Vlasenko	6d3b4bb24d	udhcpc: check that 4-byte options are indeed 4-byte, closes 11506 ... function old new delta udhcp_get_option32 - 27 +27 udhcp_get_option 231 248 +17 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 1/0 up/down: 44/0) Total: 44 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-12-17 18:07:18 +01:00
Denys Vlasenko	6d26744a2c	udhcp: tweak comment indentation, no code changes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-07-04 15:44:22 +02:00
Jeremy Kerr	fc267214f0	udhcp: add option 211, "reboot time" ... As defined in RFC 5071. Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-07-04 15:38:19 +02:00
Denys Vlasenko	6027597fd1	udhcpc6: set -x options in request ... Last foru commits: function old new delta option_to_env 621 791 +170 .rodata 168351 168505 +154 attach_option 431 506 +75 add_d6_client_options 112 167 +55 d6_option_strings 30 84 +54 udhcp_str2optset 644 660 +16 d6_optflags 12 20 +8 udhcpc6_main 2590 2596 +6 udhcpc_main 2648 2651 +3 read_optset 15 18 +3 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 10/0 up/down: 544/0) Total: 544 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-05-14 11:11:08 +02:00
Samuel Mendoza-Jonas	43b9235f66	udhcp: fix use of trim() in udhcp_str2optset() ... trim() modifies the string in place if needed and returns a pointer to the end of the resulting string. Update udhcp_str2optset() so it no longer sets the value of 'val' to the return value of trim(). Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-05-14 10:46:00 +02:00
Denys Vlasenko	266f6f1973	udhcp: support string user options, closes 10946 ... function old new delta udhcp_str2optset 536 628 +92 packed_usage 32757 32760 +3 udhcpc_main 2708 2692 -16 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/1 up/down: 95/-16) Total: 79 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-13 13:27:52 +02:00
Denys Vlasenko	ba4fbca8a8	udhcpc6: make -O OPT work ... Patch is based on work by tiggerswelt.net. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-06-28 19:18:17 +02:00
Denys Vlasenko	b181ca7552	typo in comment ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-01-29 18:48:58 +01:00
Denys Vlasenko	f11c6989ba	udhcpc: check read of overload option data byte to be within packet ... function old new delta udhcp_get_option 220 225 +5 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-10-25 14:26:36 +02:00
Brian Foley	f9beeb22e2	udhcpc: check read of option length byte to be within packet ... function old new delta udhcp_get_option 215 220 +5 udhcp_run_script 802 803 +1 Signed-off-by: Brian Foley <bpfoley@google.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-10-25 14:20:55 +02:00
Denys Vlasenko	f75a96d74c	udhcp: fix capitalization of two messages ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-03-30 18:49:45 +02:00
Denys Vlasenko	8f2e99c813	udhcp: get rid of bb_info_msg() ... function old new delta udhcpd_main 1501 1531 +30 d6_recv_raw_packet 251 264 +13 perform_d6_release 188 198 +10 udhcpc6_main 2443 2449 +6 udhcp_recv_raw_packet 582 588 +6 udhcp_recv_kernel_packet 132 138 +6 send_d6_renew 140 146 +6 d6_recv_kernel_packet 118 124 +6 send_renew 77 82 +5 send_discover 85 90 +5 send_decline 84 89 +5 send_d6_select 97 102 +5 send_d6_discover 174 179 +5 perform_release 167 172 +5 count_lines 72 74 +2 udhcpc_main 2836 2837 +1 bb_info_msg 125 - -125 ------------------------------------------------------------------------------ (add/remove: 0/2 grow/shrink: 17/4 up/down: 117/-180) Total: -63 bytes text data bss dec hex filename 924935 906 17160 943001 e6399 busybox_old 924736 906 17160 942802 e62d2 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-03-30 18:41:23 +02:00
Denys Vlasenko	352f79acbd	udhcpc: fix OPTION_6RD parsing (could overflow its malloced buffer) ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-02-26 15:54:56 +01:00
Jeremy Kerr	b8ffd11e65	udhcp: add PXELINUX path prefix option (code 210) definition ... Like d3092c99, this change adds support for the DHCP "path-prefix" option, as defined in RFC 5071. We use the string identifer "pxepathprefix". Adding this option makes string parsing in the hook scripts simpler. function old new delta dhcp_option_strings 255 269 +14 dhcp_optflags 72 74 +2 Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2014-07-16 14:21:42 +02:00
Jeremy Kerr	d3092c99ae	udhcp: add PXELINUX config file option (code 209) definition ... This change adds a definition for DHCP option 209. RFC 5071 defines code 209 as a configuration file for a PXE bootloader; this change uses the string "pxeconffile" as its text identifier. Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-11-12 11:18:26 +01:00
Denys Vlasenko	b443a3780d	udhcp: code shrink ... function old new delta attach_option 416 413 -3 allocate_tempopt_if_needed 74 - -74 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-05-17 15:19:47 +02:00
Denys Vlasenko	c133fa66f3	udhcpc: fix a problem with binary-encoded options #2 ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-05-17 15:13:38 +02:00
Michael McTernan	ee0f444f11	udhcp: finish support of classless static routes (now the correct patch!) ... Signed-off-by: Michael McTernan <Michael.McTernan.2001@cs.bris.ac.uk> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-12-16 17:10:09 +01:00
Denys Vlasenko	7280d2017d	udhcpc: sanitize hostnames in incoming packets. Closes 3979. ... The following options are replaced with string "bad" if they contain malformed hostname: HOST_NAME, DOMAIN_NAME, NIS_DOMAIN, TFTP_SERVER_NAME function old new delta xmalloc_optname_optval 850 888 +38 attach_option 440 443 +3 len_of_option_as_string 13 14 +1 dhcp_option_lengths 13 14 +1 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 4/0 up/down: 43/0) Total: 43 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-12-08 16:41:05 +01:00
Denys Vlasenko	a092a89d8f	udhcpc6: rudimentary code to export data to script; fix IAADDR parsing ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-11-16 20:17:12 +01:00
Denys Vlasenko	cd4d78f525	dhcpc: fix the case where we might add extra space at the end of envvar. ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-10-20 13:21:55 +02:00
Denys Vlasenko	1f56e51ca1	udhcpc: add support for DHCP option 212 (RFC 5969) ... The patch is from OpenWRT people. function old new delta xmalloc_optname_optval 637 874 +237 dhcp_option_strings 237 243 +6 dhcp_optflags 68 70 +2 len_of_option_as_string 12 13 +1 dhcp_option_lengths 12 13 +1 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 5/0 up/down: 247/0) Total: 247 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-10-19 22:40:35 +02:00
Nigel Hathaway	fb6b173ff7	udhcp: add FEATURE_UDHCP_8021Q option ... function old new delta dhcp_option_strings 217 237 +20 dhcp_optflags 64 68 +4 Signed-off-by: Nigel Hathaway <Nigel.Hathaway@ubiquisys.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-04-26 02:50:00 +02:00
Denys Vlasenko	fbea220560	udhcpc: fix a problem with binary-encoded options ... function old new delta attach_option 395 413 +18 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-02-06 18:00:58 +01:00
Denys Vlasenko	d3c5ab703b	udhcpc: remove now-unneeded definitions of vendor and client-id opts ... function old new delta dhcp_optflags 68 64 -4 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-10-20 02:03:30 +02:00
Denys Vlasenko	1cbdc03411	udhcpc: remove -c CLIENTID, it is hard to use, -x 61:hexstring does the same better ... function old new delta packed_usage 27802 27808 +6 static.udhcpc_longopts 261 250 -11 udhcpc_main 2799 2780 -19 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/2 up/down: 6/-30) Total: -24 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-10-20 01:42:37 +02:00
Vladislav Grishenko	7d3a48a003	udhcp: add support for 0x21 ROUTES and 0xf9 MS_STATIC_ROUTES options ... Signed-off-by: Vladislav Grishenko <themiron@mail.ru> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-09-26 00:15:12 +02:00
Denys Vlasenko	0ef64bdb40	*: make GNU licensing statement forms more regular ... This change retains "or later" state! No licensing _changes_ here, only form is adjusted (article, space between "GPL" and "v2" and so on). Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-08-16 20:14:46 +02:00
Denys Vlasenko	b7d19cc400	dhcp: readability cleanups and small code shrink ... function old new delta udhcp_run_script 654 617 -37 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-05-30 23:41:23 +02:00
Denys Vlasenko	5ab6b0f563	udhcp: s/sipservers/sipsrv/ to match other similar option names ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-04-06 16:52:59 +02:00
Denys Vlasenko	4f3aa51f9d	udhcp: implement "raw" binary options. Closes bug 735 ... function old new delta allocate_tempopt_if_needed - 76 +76 udhcp_str2optset 351 415 +64 attach_option 380 398 +18 len_of_option_as_string 11 12 +1 dhcp_option_lengths 11 12 +1 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 4/0 up/down: 160/0) Total: 160 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-04-04 15:31:12 +02:00
Denys Vlasenko	c03602baa4	udhcp: s/dhcp_option/dhcp_optflag/g ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-04-04 15:28:49 +02:00
Denys Vlasenko	243ddcbc76	udhcpd: support decoding of option 120 "SIP servers". Closes bug 737 ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-04-03 17:34:52 +02:00
Denys Vlasenko	8a659f6ff9	libbb: make index_in_substrings return -1 on ambiguous matches ... function old new delta index_in_substrings 67 93 +26 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-04-03 00:52:16 +02:00
Denys Vlasenko	9107b63a7f	udhcp: abort if we see unknown option, and show valid options if so ... function old new delta udhcp_option_idx - 77 +77 udhcp_str2optset 366 351 -15 udhcpc_main 2845 2801 -44 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 0/2 up/down: 77/-59) Total: 18 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-03-27 23:23:41 +01:00
Denys Vlasenko	7724c766bd	udhcp: pass pointer to whole packet to "add option" functions ... This is needed for "overflow option" support function old new delta udhcp_find_option - 34 +34 udhcp_add_binary_option 94 106 +12 write_leases 227 223 -4 udhcp_init_header 86 82 -4 send_release 104 99 -5 init_packet 87 81 -6 add_client_options 160 154 -6 add_server_options 100 92 -8 udhcpd_main 1964 1954 -10 udhcpc_main 2859 2837 -22 find_option 34 - -34 ------------------------------------------------------------------------------ (add/remove: 1/1 grow/shrink: 1/8 up/down: 46/-99) Total: -53 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-03-26 09:32:09 +01:00
Denys Vlasenko	a8f6b99987	udhcp: move options.c to common.c; disable unused bool and s16 option code ... function old new delta udhcp_add_binary_option - 94 +94 udhcp_str2nip - 42 +42 len_of_option_as_string 12 10 -2 dhcp_option_lengths 12 10 -2 udhcpc_main 2859 2851 -8 read_nip 42 - -42 xmalloc_optname_optval 590 536 -54 udhcp_str2optset 443 366 -77 udhcp_add_option_string 86 - -86 ------------------------------------------------------------------------------ (add/remove: 2/2 grow/shrink: 0/5 up/down: 136/-271) Total: -135 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-03-26 08:35:24 +01:00
Denys Vlasenko	6947d2c7e1	udhcp: logging improvements, field and variable renames ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-06-17 13:24:03 +02:00
Denys Vlasenko	ac906fa85e	udhcp: change UDHCP_DEBUG into int, make verbosity selectable with -v ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-06-17 11:54:52 +02:00
Denis Vlasenko	6ca409e0e4	trylink: produce even more info about final link stage ... trylink: explain how to modify link and drastically decrease amount of padding (unfortunately, needs hand editing ATM). *: add ALIGN1 / ALIGN2 to global strings and arrays of bytes and shorts size saving: 0.5k	2007-08-12 20:58:27 +00:00
Denis Vlasenko	80edead5ea	udhcp: slight shrink ... udhcpd_main 1171 1208 +37 udhcpc_main 2363 2387 +24 dhcprelay_main 1145 1146 +1 dhcprelay_stopflag 4 1 -3 dhcprelay_signal_handler 11 8 -3 client_background 46 42 -4 udhcp_read_interface 230 211 -19 udhcp_make_pidfile 76 - -76 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 3/4 up/down: 62/-105) Total: -43 bytes text data bss dec hex filename 770052 1096 11228 782376 bf028 busybox_old 769980 1096 11228 782304 befe0 busybox_unstripped	2007-08-02 22:31:05 +00:00
Denis Vlasenko	42b3dea9bf	udhcp: many small fixes: ... * arpping(): smaller and even probably fixed * lots of variables/params converted: ulong -> uint32_t * uptime() nuked in favor of monotonic_sec() * udhcp_get_packet(): only one "bad vendor", simplify function old new delta reservedIp 36 35 -1 udhcpc_main 2462 2460 -2 addStaticLease 64 62 -2 static.broken_vendors 16 - -16 uptime 19 - -19 udhcpd_main 1273 1238 -35 udhcp_get_packet 223 184 -39 .rodata 144162 144106 -56 arpping 690 609 -81 ------------------------------------------------------------------------------ (add/remove: 0/2 grow/shrink: 0/7 up/down: 0/-251) Total: -251 bytes text data bss dec hex filename 734241 3028 14400 751669 b7835 busybox_old 734005 3028 14400 751433 b7749 busybox_unstripped	2007-07-03 15:47:50 +00:00
Denis Vlasenko	6e6d331d97	udhcpc: stop deleting our own pidfile if we daemonize. ... udhcp[cd]: stop using atexit magic fir pidfile removal.	2007-05-03 23:39:35 +00:00
Denis Vlasenko	fbd2918f5c	udhcp: MAC_BCAST_ADDR and blank_chaddr are in fact constant, move to rodata. ... a few global variables reduced to smallints function old new delta add_lease 75 227 +152 static.blank_chaddr - 16 +16 MAC_BCAST_ADDR - 6 +6 sockfd 4 8 +4 udhcp_run_script 1153 1155 +2 state 8 5 -3 listen_mode 4 1 -3 perform_release 152 148 -4 fd 8 4 -4 blank_chaddr 16 - -16 udhcpc_main 2518 2497 -21 .rodata 131864 131832 -32 oldest_expired_lease 61 - -61 clear_lease 127 - -127 ------------------------------------------------------------------------------ (add/remove: 2/3 grow/shrink: 3/6 up/down: 180/-271) Total: -91 bytes	2007-04-07 01:05:47 +00:00
Denis Vlasenko	10457b90db	make pidfile writing configurable. ... [ui]toa_to_buf: change API. No users yet.	2007-03-27 22:01:31 +00:00
Denis Vlasenko	af1c84360f	Move udhcp to new NOMMU helpers. ... Fix server part to compile under NOMMU. Client is not compilable yet. On MMU everything compiles (and maybe even works :)	2007-03-26 13:22:35 +00:00
Denis Vlasenko	e06bed30cf	use bb_sanitize_stdio() where appropriate	2007-01-27 22:21:12 +00:00
Denis Vlasenko	61126ab30a	small fixes: using fd-based io instead of FILE*-based, ... missed O_TRUNC, etc	2006-11-18 22:03:26 +00:00