aboutsummaryrefslogtreecommitdiff
path: root/networking/udhcp/dhcprelay.c
diff options
context:
space:
mode:
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 90ecf4831..f3b2855d8 100644
--- a/networking/udhcp/dhcprelay.c
+++ b/networking/udhcp/dhcprelay.c
@@ -156,12 +156,12 @@ static int init_sockets(char **client, int num_clients,
156 int i, n; 156 int i, n;
157 157
158 /* talk to real server on bootps */ 158 /* talk to real server on bootps */
159 fds[0] = listen_socket(/*INADDR_ANY,*/ SERVER_PORT, server); 159 fds[0] = udhcp_listen_socket(/*INADDR_ANY,*/ SERVER_PORT, server);
160 n = fds[0]; 160 n = fds[0];
161 161
162 for (i = 1; i < num_clients; i++) { 162 for (i = 1; i < num_clients; i++) {
163 /* listen for clients on bootps */ 163 /* listen for clients on bootps */
164 fds[i] = listen_socket(/*INADDR_ANY,*/ SERVER_PORT, client[i-1]); 164 fds[i] = udhcp_listen_socket(/*INADDR_ANY,*/ SERVER_PORT, client[i-1]);
165 if (fds[i] > n) 165 if (fds[i] > n)
166 n = fds[i]; 166 n = fds[i];
167 } 167 }
@@ -271,7 +271,7 @@ static void dhcprelay_loop(int *fds, int num_sockets, int max_socket, char **cli
271 (struct sockaddr *)(&client_addr), &addr_size); 271 (struct sockaddr *)(&client_addr), &addr_size);
272 if (packlen <= 0) 272 if (packlen <= 0)
273 continue; 273 continue;
274 if (read_interface(clients[i-1], NULL, &dhcp_msg.giaddr, NULL)) 274 if (udhcp_read_interface(clients[i-1], NULL, &dhcp_msg.giaddr, NULL))
275 dhcp_msg.giaddr = gw_ip; 275 dhcp_msg.giaddr = gw_ip;
276 pass_on(&dhcp_msg, packlen, i, fds, &client_addr, server_addr); 276 pass_on(&dhcp_msg, packlen, i, fds, &client_addr, server_addr);
277 } 277 }
@@ -305,7 +305,7 @@ int dhcprelay_main(int argc, char **argv)
305 fds = xmalloc(num_sockets * sizeof(fds[0])); 305 fds = xmalloc(num_sockets * sizeof(fds[0]));
306 max_socket = init_sockets(clients, num_sockets, argv[2], fds); 306 max_socket = init_sockets(clients, num_sockets, argv[2], fds);
307 307
308 if (read_interface(argv[2], NULL, &gw_ip, NULL)) 308 if (udhcp_read_interface(argv[2], NULL, &gw_ip, NULL))
309 return 1; 309 return 1;
310 310
311 /* doesn't return */ 311 /* doesn't return */