81 Commits

Author	SHA1	Message	Date
Michel Stam	9f41271f3c	udhcpd: add option for tweaking arpping ... Some clients have a very short timeout for sending the DHCP DISCOVER, shorter than the arpping timeout of 2000 milliseconds that udhcpd uses by default. This patch allows tweaking the timeout, or disabling of arpping altogether, at the risk of handing out addresses which are already in use. function old new delta udhcpd_main 1460 1501 +41 udhcpc_main 2814 2851 +37 packed_usage 29957 29974 +17 arpping 477 493 +16 find_free_or_expired_nip 161 174 +13 send_offer 285 292 +7 nobody_responds_to_arp 85 89 +4 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 7/0 up/down: 135/0) Total: 135 bytes Signed-off-by: Michel Stam <m.stam@fugro.nl> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2014-10-30 11:59:04 +01:00
Denys Vlasenko	7b5d5c1bdb	udhcpd: also add -I ADDR to help text ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-03-14 02:18:52 +01:00
Denys Vlasenko	e3f5b73ad0	udhcpd: add -I LOCAL_ADDR option ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-03-13 22:27:37 +01:00
Denys Vlasenko	71045cc819	dhcpd: write lease file on exit ... function old new delta udhcpd_main 1431 1403 -28 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-07-24 17:21:26 +02:00
Leonid Lisovskiy	6c9c0a1dc9	udhcp: IF_UDHCP_VERBOSE() macro - improve code readability ... Signed-off-by: Leonid Lisovskiy <lly.dev@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-10-18 00:35:47 +02:00
Pere Orga	5bc8c005a8	move remaining help text from include/usage.src.h ... Signed-off-by: Pere Orga <gotrunks@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-04-11 03:29:49 +02:00
Denys Vlasenko	713d241852	dhcpd: reply with NAK to clients in INIT-REBOOT state w/o existing lease ... We were not responding to them at all. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-11-28 21:51:44 +01:00
Denys Vlasenko	fa5e295600	dhcpd: smaller code: do not look for REQUESTED_IP twice ... text data bss dec hex filename 883235 936 17192 901363 dc0f3 busybox_old 883219 936 17192 901347 dc0e3 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-11-28 01:10:51 +01:00
Denys Vlasenko	e4dcba1c10	*: whitespace fixes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-10-28 18:57:19 +02:00
Denys Vlasenko	0bb35e19a7	udhcpd: reduce stack usage by ~700 bytes. +28 bytes code size ... Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>	2010-10-21 12:33:10 +02:00
Mike Frysinger	6db1373295	udhcpd: fix daemonize crash on nommu systems ... Signed-off-by: Mike Frysinger <vapier@gentoo.org>	2010-06-04 13:24:50 -04:00
Denys Vlasenko	f8fcc184b6	udhcpd: note missing sanity checks on INFORM message handling ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-04-04 22:36:34 +02:00
Denys Vlasenko	406bd14416	udhcpd: fix -v/-P mixup ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-03-27 23:24:57 +01:00
Denys Vlasenko	385b4562e3	udhcp: cosmetic cleanups; one case of s/full_read/xread/ ... function old new delta dumpleases_main 632 623 -9 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-03-26 10:09:34 +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	651a2697f7	*: merge some common strings ... text data bss dec hexfilename 838650 8009 0 846659 ceb43busybox_old 838519 8009 0 846528 ceac0busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-03-23 16:25:17 +01:00
Denys Vlasenko	dde8bdcc5b	udhcp: merge options.h into common.h, script.c into dhcpc.c ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-03-22 14:29:13 +01:00
Denys Vlasenko	53f72bb3f0	dhcpd: apparently, sometimes IP is in ciaddr, not requested_ip... ... also revert the part which appempted to "fix" that in client function old new delta udhcpd_main 1949 1964 +15 send_renew 142 105 -37 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/1 up/down: 15/-37) Total: -22 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-03-21 06:46:09 +01:00
Denys Vlasenko	c7dc79e71d	udhcpd: untangle incredibly messy handling of DHCPREQUEST ... Also fixes attacks possible via DHCPDECLINE / DHCPRELEASE function old new delta udhcpd_main 1846 1949 +103 send_renew 105 142 +37 send_NAK 61 - -61 send_ACK 180 - -180 ------------------------------------------------------------------------------ (add/remove: 0/2 grow/shrink: 2/0 up/down: 140/-241) Total: -101 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-03-21 06:15:28 +01:00
Denys Vlasenko	2e7aa92836	udhcp: tweak udhcpd.conf example and comments. no code changes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-03-21 02:22:07 +01:00
Denys Vlasenko	e5ce91b41b	udhcp: code shrink; disable time and log server options ... function old new delta add_server_options - 100 +100 udhcp_add_simple_option 92 90 -2 nobody_responds_to_arp 88 85 -3 dhcp_options 66 62 -4 udhcp_add_option_string 104 94 -10 udhcp_run_script 665 654 -11 dhcp_option_strings 203 188 -15 static.blank_chaddr 16 - -16 send_ACK 211 180 -31 add_bootp_options 61 - -61 udhcpd_main 1925 1846 -79 ------------------------------------------------------------------------------ (add/remove: 1/2 grow/shrink: 0/8 up/down: 100/-232) Total: -132 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-03-21 00:43:11 +01:00
Denys Vlasenko	a953987e77	udhcpd: remove redundant code in send_offer() ... static_lease_nip and lease pointer are canculated in the caller, no need to calculate them again. lease_time_sec calculation is also redundant: it is assigned to later, w/o being used in between. function old new delta udhcpd_main 1956 1925 -31 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-03-20 03:49:27 +01:00
Denys Vlasenko	8a7c166ab9	udhcp: move serverpacket.c into dhcpd.c, no other changes ... function old new delta udhcpd_main 1480 1956 +476 send_inform 83 - -83 send_offer 376 - -376 ------------------------------------------------------------------------------ (add/remove: 0/3 grow/shrink: 1/0 up/down: 476/-459) Total: 17 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-03-20 03:48:11 +01:00
Denys Vlasenko	6331cf059c	*: use "can't" instead of "cannot" ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-11-13 09:08:27 +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	31af3d5a1d	udhcp: shorten mac len from 16 to 6 in lease file ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-06-17 11:57:09 +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
Denys Vlasenko	26918dd28e	udhcp: rename server/client_config.arp to server_mac and client_mac ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-06-16 12:04:23 +02:00
Denys Vlasenko	cab3a0127c	udhcp: cleanup of static lease handling ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-06-16 12:03:12 +02:00
Denys Vlasenko	990a617edf	udhcp: rename giaddr to gateway_nip and server to server_nip ... "nip" stands for "IP in network order" Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-06-16 10:23:55 +02:00
Denys Vlasenko	1d924f59b1	udhcp: rename fields in struct dhcpOfferedAddr ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-06-16 10:23:01 +02:00
Denis Vlasenko	5e34ff29bc	*: mass renaming of USE_XXXX to IF_XXXX ... and SKIP_XXXX to IF_NOT_XXXX - the second one was especially badly named. It was not skipping anything!	2009-04-21 11:09:40 +00:00
Denis Vlasenko	a19e64933c	docs/logging_and_backgrounding.txt: new mini-doc ... dnsd: remove statics, remove nerly-useless SIGINT handler crond: correct more of logfile to 0666 (as usual, umask allows user to remove unwanted bits). nameif: print errors to stderr too, not just to syslog function old new delta udhcp_read_interface 308 306 -2 ttl 4 - -4 fileconf 4 - -4 dnsentry 4 - -4 interrupt 19 - -19 dnsd_main 1463 1394 -69 ------------------------------------------------------------------------------ (add/remove: 0/4 grow/shrink: 0/2 up/down: 0/-102) Total: -102 bytes text data bss dec hex filename 808161 476 7864 816501 c7575 busybox_old 807994 468 7856 816318 c74be busybox_unstripped	2009-03-11 14:40:00 +00:00
Denis Vlasenko	5e4fda0aff	ftpd: code chrink, fixed some minor bugs ... ls: update comment *: openlog fixes (added LOG_PID, set LOG_DAEMON as appropriate) function old new delta xwrite_str - 26 +26 cmdio_write_ok - 15 +15 handle_cwd 40 45 +5 packed_usage 25668 25670 +2 cmdio_write_raw 7 9 +2 handle_upload_common 322 320 -2 udhcpd_main 1375 1372 -3 udhcpc_main 2362 2359 -3 port_cleanup 27 23 -4 handle_dir_common 221 209 -12 str_netfd_write 26 - -26 cmdio_get_cmd_and_arg 122 - -122 ftpd_main 2208 2050 -158 ------------------------------------------------------------------------------ text data bss dec hex filename 809933 476 7864 818273 c7c61 busybox_old 809199 476 7864 817539 c7983 busybox_unstripped	2009-03-08 23:46:48 +00:00
Denis Vlasenko	04158e0459	udhcpd: add code which rejects lease files with suspicious or old timestamp. ... *: s/time(0)/time(NULL)/g	2009-02-02 10:48:06 +00:00
Denis Vlasenko	0416e3dde1	udhcpd: disable opton to have absolute lease times in lease file ... (that does not work with dumpleases) dumpleases: fix -a option. networking/udhcp/*: code shrink, more compact static leases struture, better comments, etc function old new delta find_free_or_expired_address - 147 +147 nobody_responds_to_arp - 84 +84 read_opt 781 830 +49 dumpleases_main 435 447 +12 send_ACK 229 232 +3 read_staticlease 90 93 +3 addStaticLease 60 61 +1 getIpByMac 46 43 -3 reservedIp 31 20 -11 keywords 304 288 -16 send_offer 428 403 -25 write_leases 225 193 -32 read_leases 184 143 -41 read_yn 64 - -64 find_address 191 - -191 ------------------------------------------------------------------------------ (add/remove: 2/2 grow/shrink: 5/6 up/down: 299/-383) Total: -84 bytes	2009-01-01 17:52:09 +00:00
Denis Vlasenko	efb545b9bd	optimize 16- and 32-bit moves ... function old new delta udhcpd_main 1239 1257 +18 udhcp_add_simple_option 93 92 -1 buffer_read_le_u32 19 18 -1 unpack_gz_stream_with_info 526 520 -6 dnsd_main 1470 1463 -7 udhcp_run_script 1208 1186 -22 send_ACK 255 229 -26 arping_main 1661 1623 -38 send_offer 470 428 -42 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/8 up/down: 18/-143) Total: -125 bytes	2008-12-08 22:56:18 +00:00
Denis Vlasenko	f1980f67d3	dhcp: add FAST_FUNC as appropriate. -160 bytes.	2008-09-26 09:34:59 +00:00
Denis Vlasenko	a60f84ebf0	*: rename ATTRIBUTE_XXX to just XXX.	2008-07-05 09:18:54 +00:00
Denis Vlasenko	6de8994440	udhcpc: regularize the names of receiving functions, ... pause on "serious failure to receive". Some misc fixes are also folded in here.	2008-05-21 07:05:06 +00:00
Denis Vlasenko	68404f13d4	*: add -Wunused-parameter; fix resulting breakage ... function old new delta procps_scan 1265 1298 +33 aliascmd 278 283 +5 parse_file_cmd 116 120 +4 dname_enc 373 377 +4 setcmd 90 93 +3 execcmd 57 60 +3 count_lines 72 74 +2 process_command_subs 340 339 -1 test_main 409 407 -2 mknod_main 179 177 -2 handle_incoming_and_exit 2653 2651 -2 argstr 1312 1310 -2 shiftcmd 131 128 -3 exitcmd 46 43 -3 dotcmd 297 294 -3 breakcmd 86 83 -3 evalpipe 353 349 -4 evalcommand 1180 1176 -4 evalcmd 109 105 -4 send_tree 374 369 -5 mkfifo_main 82 77 -5 evalsubshell 152 147 -5 typecmd 75 69 -6 letcmd 61 55 -6 add_cmd 1190 1183 -7 main 891 883 -8 ash_main 1415 1407 -8 parse_stream 1377 1367 -10 alloc_procps_scan 55 - -55 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 7/21 up/down: 54/-148) Total: -94 bytes text data bss dec hex filename 797195 658 7428 805281 c49a1 busybox_old 797101 658 7428 805187 c4943 busybox_unstripped	2008-03-17 09:00:54 +00:00
Denis Vlasenko	d55fe3e595	udhcp: optional support for non-standard DHCP ports (+300 bytes when selected)	2008-02-04 13:12:16 +00:00
Denis Vlasenko	fff145dba3	udhcp: fix oversized packet sending (introduced by "slack for bad dhcp servers" options); ... slight optimizations and function renaming udhcp_send_raw_packet - 391 +391 udhcp_send_kernel_packet - 197 +197 udhcp_recv_packet - 134 +134 get_raw_packet 353 326 -27 udhcp_get_packet 134 - -134 udhcp_kernel_packet 197 - -197 udhcp_raw_packet 391 - -391 ------------------------------------------------------------------------------ (add/remove: 3/3 grow/shrink: 0/1 up/down: 722/-749) Total: -27 bytes	2007-12-20 21:11:38 +00:00
Denis Vlasenko	9b49a5ed85	add -fvisibility=hidden to CC flags, mark XXX_main functions ... EXTERNALLY_VISIBLE. 5% size reduction of libbusybox.so	2007-10-11 10:05:36 +00:00
Denis Vlasenko	def8898596	reviving libbusybox, adding CONFIG_INDIVIDUAL part 3	2007-10-07 17:06:01 +00:00
Denis Vlasenko	deabacdf91	move udhcp_{client/server}_config to common_bufsiz1 ... udhcp_run_script 1108 1151 +43 init_packet 209 210 +1 udhcpc_main 2395 2393 -2 udhcp_client_config 56 - -56 udhcp_server_config 88 - -88 ------------------------------------------------------------------------------ (add/remove: 0/2 grow/shrink: 2/1 up/down: 44/-146) Total: -102 bytes text data bss dec hex filename 771326 1029 9696 782051 beee3 busybox_old 771383 1029 9552 781964 bee8c busybox_unstripped	2007-09-30 17:55:43 +00:00
Denis Vlasenko	fe7cd642b0	don't pass argc in getopt32, it's superfluous ... (add/remove: 0/0 grow/shrink: 12/131 up/down: 91/-727) Total: -636 bytes text data bss dec hex filename 773469 1058 11092 785619 bfcd3 busybox_old 772644 1058 11092 784794 bf99a busybox_unstripped	2007-08-18 15:32:12 +00:00
Denis Vlasenko	a27a11bb2c	introduce and use xdup2(int, int) ... stop checking whether setsockopt_reuseaddr(int fd) was successful (it always is) remove second parameter (sockllen) from xmalloc_sockaddr2xxxxx functions sockaddr2str 142 156 +14 collect_blk 467 474 +7 xdup2 28 33 +5 singlemount 4456 4454 -2 print_host 214 212 -2 nslookup_main 139 137 -2 ftpgetput_main 414 412 -2 udhcpd_main 1258 1255 -3 udhcpc_main 2405 2402 -3 traceroute_main 4125 4122 -3 nc_main 1072 1069 -3 buffer_fill_and_print 76 73 -3 xmalloc_sockaddr2hostonly_noport 18 14 -4 xmalloc_sockaddr2host_noport 18 14 -4 xmalloc_sockaddr2host 15 11 -4 xmalloc_sockaddr2dotted_noport 18 14 -4 xmalloc_sockaddr2dotted 18 14 -4 wget_main 2618 2614 -4 ping_main 393 389 -4 ip_port_str 120 115 -5 dhcprelay_main 1146 1141 -5 dnsd_main 1531 1525 -6 passwd_main 1110 1102 -8 udhcp_kernel_packet 206 197 -9 udhcp_listen_socket 154 144 -10 getty_main 2576 2566 -10 setup 655 640 -15 xmove_fd 51 34 -17 dolisten 759 742 -17 tcpudpsvd_main 1866 1836 -30 startservice 339 299 -40	2007-08-18 14:16:39 +00:00
Denis Vlasenko	9f7b92a2e1	dhcpd: make -S and -f actually work	2007-08-15 20:03:36 +00:00