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
This commit is contained in:
Denis Vlasenko 2007-09-30 17:55:43 +00:00
parent d7b3350eb3
commit deabacdf91
5 changed files with 5 additions and 8 deletions

View File

@ -73,10 +73,6 @@ void udhcp_run_script(struct dhcpMessage *packet, const char *name);
/* from socket.h */ /* from socket.h */
#define listen_socket udhcp_listen_socket #define listen_socket udhcp_listen_socket
#define read_interface udhcp_read_interface #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); void udhcp_sp_setup(void);
int udhcp_sp_fd_set(fd_set *rfds, int extra_fd); int udhcp_sp_fd_set(fd_set *rfds, int extra_fd);

View File

@ -37,7 +37,7 @@ static smallint listen_mode;
static smallint state; static smallint state;
struct client_config_t client_config; /* struct client_config_t client_config is in bb_common_bufsiz1 */
/* just a little helper */ /* just a little helper */

View File

@ -33,7 +33,7 @@ struct client_config_t {
uint8_t arp[6]; /* Our arp address */ 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 ***/ /*** clientpacket.h ***/

View File

@ -18,7 +18,7 @@
/* globals */ /* globals */
struct dhcpOfferedAddr *leases; 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); int udhcpd_main(int argc, char **argv);

View File

@ -54,7 +54,8 @@ struct server_config_t {
struct static_lease *static_leases; /* List of ip/mac pairs to assign static leases */ 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; extern struct dhcpOfferedAddr *leases;