diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-06-16 10:23:55 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-06-16 10:23:55 +0200 |
commit | 990a617edfd9040594c0889d2dd23eb7ef91c695 (patch) | |
tree | 25a41246927426fa64ffb10217332bc065df8887 /networking/udhcp/dhcpd.c | |
parent | 1d924f59b1854e9638c63a743642e63c1bef38b9 (diff) | |
download | busybox-w32-990a617edfd9040594c0889d2dd23eb7ef91c695.tar.gz busybox-w32-990a617edfd9040594c0889d2dd23eb7ef91c695.tar.bz2 busybox-w32-990a617edfd9040594c0889d2dd23eb7ef91c695.zip |
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>
Diffstat (limited to 'networking/udhcp/dhcpd.c')
-rw-r--r-- | networking/udhcp/dhcpd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c index 61e4a1d95..09524e29c 100644 --- a/networking/udhcp/dhcpd.c +++ b/networking/udhcp/dhcpd.c | |||
@@ -94,7 +94,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv) | |||
94 | read_leases(server_config.lease_file); | 94 | read_leases(server_config.lease_file); |
95 | 95 | ||
96 | if (udhcp_read_interface(server_config.interface, &server_config.ifindex, | 96 | if (udhcp_read_interface(server_config.interface, &server_config.ifindex, |
97 | &server_config.server, server_config.arp)) { | 97 | &server_config.server_nip, server_config.arp)) { |
98 | retval = 1; | 98 | retval = 1; |
99 | goto ret; | 99 | goto ret; |
100 | } | 100 | } |
@@ -202,7 +202,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv) | |||
202 | if (server_id) { | 202 | if (server_id) { |
203 | /* SELECTING State */ | 203 | /* SELECTING State */ |
204 | DEBUG("server_id = %08x", ntohl(server_id_aligned)); | 204 | DEBUG("server_id = %08x", ntohl(server_id_aligned)); |
205 | if (server_id_aligned == server_config.server | 205 | if (server_id_aligned == server_config.server_nip |
206 | && requested | 206 | && requested |
207 | && requested_aligned == lease->lease_nip | 207 | && requested_aligned == lease->lease_nip |
208 | ) { | 208 | ) { |