From deabacdf91c6d1c3cfcdb4cd06780807193de81d Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sun, 30 Sep 2007 17:55:43 +0000 Subject: [PATCH] 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 --- networking/udhcp/common.h | 4 ---- networking/udhcp/dhcpc.c | 2 +- networking/udhcp/dhcpc.h | 2 +- networking/udhcp/dhcpd.c | 2 +- networking/udhcp/dhcpd.h | 3 ++- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h index 33417af09..4864c8565 100644 --- a/networking/udhcp/common.h +++ b/networking/udhcp/common.h @@ -73,10 +73,6 @@ void udhcp_run_script(struct dhcpMessage *packet, const char *name); /* from socket.h */ #define listen_socket udhcp_listen_socket #define read_interface udhcp_read_interface -/* from dhcpc.h */ -#define client_config udhcp_client_config -/* from dhcpd.h */ -#define server_config udhcp_server_config void udhcp_sp_setup(void); int udhcp_sp_fd_set(fd_set *rfds, int extra_fd); diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c index 961a1712a..ca478b3c5 100644 --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c @@ -37,7 +37,7 @@ static smallint listen_mode; static smallint state; -struct client_config_t client_config; +/* struct client_config_t client_config is in bb_common_bufsiz1 */ /* just a little helper */ diff --git a/networking/udhcp/dhcpc.h b/networking/udhcp/dhcpc.h index 20f4e52b8..8da1dd8e1 100644 --- a/networking/udhcp/dhcpc.h +++ b/networking/udhcp/dhcpc.h @@ -33,7 +33,7 @@ struct client_config_t { uint8_t arp[6]; /* Our arp address */ }; -extern struct client_config_t client_config; +#define client_config (*(struct client_config_t*)&bb_common_bufsiz1) /*** clientpacket.h ***/ diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c index e722833e1..3466312d1 100644 --- a/networking/udhcp/dhcpd.c +++ b/networking/udhcp/dhcpd.c @@ -18,7 +18,7 @@ /* globals */ struct dhcpOfferedAddr *leases; -struct server_config_t server_config; +/* struct server_config_t server_config is in bb_common_bufsiz1 */ int udhcpd_main(int argc, char **argv); diff --git a/networking/udhcp/dhcpd.h b/networking/udhcp/dhcpd.h index fc6b1d6ab..28106d306 100644 --- a/networking/udhcp/dhcpd.h +++ b/networking/udhcp/dhcpd.h @@ -54,7 +54,8 @@ struct server_config_t { struct static_lease *static_leases; /* List of ip/mac pairs to assign static leases */ }; -extern struct server_config_t server_config; +#define server_config (*(struct server_config_t*)&bb_common_bufsiz1) + extern struct dhcpOfferedAddr *leases; -- 2.25.1