deabacdf9
Denis Vlasenko
2007-09-30
Subject
move udhcp_{client/server}_config to common_bufsiz1
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
networking/udhcp/common.h +0 -4networking/udhcp/dhcpc.c +1 -1networking/udhcp/dhcpc.h +1 -1networking/udhcp/dhcpd.c +1 -1networking/udhcp/dhcpd.h +2 -1
networking/udhcp/common.h+0 -4
| @@ -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); | |
networking/udhcp/dhcpc.c+1 -1
| @@ -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 */ | |
networking/udhcp/dhcpc.h+1 -1
| @@ -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 ***/ | |
networking/udhcp/dhcpd.c+1 -1
| @@ -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); | |
networking/udhcp/dhcpd.h+2 -1
| @@ -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; | |