aboutsummaryrefslogtreecommitdiff
path: root/networking/udhcp/dhcprelay.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-06-16 10:23:55 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2009-06-16 10:23:55 +0200
commit990a617edfd9040594c0889d2dd23eb7ef91c695 (patch)
tree25a41246927426fa64ffb10217332bc065df8887 /networking/udhcp/dhcprelay.c
parent1d924f59b1854e9638c63a743642e63c1bef38b9 (diff)
downloadbusybox-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/dhcprelay.c')
-rw-r--r--networking/udhcp/dhcprelay.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/networking/udhcp/dhcprelay.c b/networking/udhcp/dhcprelay.c
index 53540d1ab..2fee49a41 100644
--- a/networking/udhcp/dhcprelay.c
+++ b/networking/udhcp/dhcprelay.c
@@ -247,7 +247,7 @@ int dhcprelay_main(int argc, char **argv)
247 char **client_ifaces; 247 char **client_ifaces;
248 int *fds; 248 int *fds;
249 int num_sockets, max_socket; 249 int num_sockets, max_socket;
250 uint32_t our_ip; 250 uint32_t our_nip;
251 251
252 server_addr.sin_family = AF_INET; 252 server_addr.sin_family = AF_INET;
253 server_addr.sin_port = htons(SERVER_PORT); 253 server_addr.sin_port = htons(SERVER_PORT);
@@ -272,7 +272,7 @@ int dhcprelay_main(int argc, char **argv)
272 max_socket = init_sockets(client_ifaces, num_sockets, argv[2], fds); 272 max_socket = init_sockets(client_ifaces, num_sockets, argv[2], fds);
273 273
274 /* Get our IP on server_iface */ 274 /* Get our IP on server_iface */
275 if (udhcp_read_interface(argv[2], NULL, &our_ip, NULL)) 275 if (udhcp_read_interface(argv[2], NULL, &our_nip, NULL))
276 return 1; 276 return 1;
277 277
278 /* Main loop */ 278 /* Main loop */
@@ -309,10 +309,10 @@ int dhcprelay_main(int argc, char **argv)
309 309
310 /* Get our IP on corresponding client_iface */ 310 /* Get our IP on corresponding client_iface */
311//why? what if server can't route such IP? 311//why? what if server can't route such IP?
312 if (udhcp_read_interface(client_ifaces[i-1], NULL, &dhcp_msg.giaddr, NULL)) { 312 if (udhcp_read_interface(client_ifaces[i-1], NULL, &dhcp_msg.gateway_nip, NULL)) {
313 /* Fall back to our server_iface's IP */ 313 /* Fall back to our server_iface's IP */
314//this makes more sense! 314//this makes more sense!
315 dhcp_msg.giaddr = our_ip; 315 dhcp_msg.gateway_nip = our_nip;
316 } 316 }
317//maybe set dhcp_msg.flags |= BROADCAST_FLAG too? 317//maybe set dhcp_msg.flags |= BROADCAST_FLAG too?
318 pass_to_server(&dhcp_msg, packlen, i, fds, &client_addr, &server_addr); 318 pass_to_server(&dhcp_msg, packlen, i, fds, &client_addr, &server_addr);