rt_names: stop allocating 5k in rwdata

[oweals/busybox.git] / networking / udhcp / dhcprelay.c

diff --git a/networking/udhcp/dhcprelay.c b/networking/udhcp/dhcprelay.c
index 97bdcb084b1c654637abcef685e379d9b3c2ed22..78a1b5e626ce7d65defffb9099063b6940273390 100644 (file)
--- a/networking/udhcp/dhcprelay.c
+++ b/networking/udhcp/dhcprelay.c
@@ -3,10 +3,10 @@
  *
  * Licensed under GPL v2, see file LICENSE in this tarball for details.
  *
- * DHCP Relay for 'DHCPv4 Configuration of IPSec Tunnel Mode' support 
- * Copyright (C) 2002 Mario Strasser <mast@gmx.net>, 
+ * DHCP Relay for 'DHCPv4 Configuration of IPSec Tunnel Mode' support
+ * Copyright (C) 2002 Mario Strasser <mast@gmx.net>,
  *                   Zuercher Hochschule Winterthur,
- *                   Netbeat AG 
+ *                   Netbeat AG
  * Upstream has GPL v2 or later
  */
 
@@ -21,7 +21,7 @@
 
 
 /* This list holds information about clients. The xid_* functions manipulate this list. */
-struct xid_item {
+static struct xid_item {
        u_int32_t xid;
        struct sockaddr_in ip;
        int client;
@@ -33,10 +33,10 @@ struct xid_item {
 static struct xid_item * xid_add(u_int32_t xid, struct sockaddr_in *ip, int client)
 {
        struct xid_item *item;
- 
+
        /* create new xid entry */
        item = xmalloc(sizeof(struct xid_item));
- 
+
        /* add xid entry */
        item->ip = *ip;
        item->xid = xid;
@@ -103,7 +103,7 @@ static void xid_del(u_int32_t xid)
  */
 static int get_dhcp_packet_type(struct dhcpMessage *p)
 {
-       u_char *op;
+       uint8_t *op;
 
        /* it must be either a BOOTREQUEST or a BOOTREPLY */
        if (p->op != BOOTREQUEST && p->op != BOOTREPLY)
@@ -133,15 +133,16 @@ static void dhcprelay_signal_handler(int sig)
 static char ** get_client_devices(char *dev_list, int *client_number)
 {
        char *s, *list, **client_dev;
-       int i, cn=1;
+       int i, cn;
 
        /* copy list */
        list = xstrdup(dev_list);
        if (list == NULL) return NULL;
 
        /* get number of items */
-       for (s = dev_list; *s; s++) if (*s == ',')
-               cn++;
+       for (s = dev_list, cn = 1; *s; s++)
+               if (*s == ',')
+                       cn++;
 
        client_dev = xzalloc(cn * sizeof(*client_dev));
 
@@ -166,18 +167,16 @@ static int init_sockets(char **client, int num_clients,
 {
        int i;
 
-       // talk to real server on bootps
+       /* talk to real server on bootps */
        fds[0] = listen_socket(htonl(INADDR_ANY), 67, server);
-       if (fds[0] < 0) return -1;
        *max_socket = fds[0];
-       
-       // array starts at 1 since server is 0
+
+       /* array starts at 1 since server is 0 */
        num_clients++;
 
        for (i=1; i < num_clients; i++) {
-               // listen for clients on bootps
+               /* listen for clients on bootps */
                fds[i] = listen_socket(htonl(INADDR_ANY), 67, client[i-1]);
-               if (fds[i] < 0) return -1;
                if (fds[i] > *max_socket) *max_socket = fds[i];
        }
 
@@ -258,7 +257,8 @@ static void dhcprelay_loop(int *fds, int num_sockets, int max_socket, char **cli
 {
        struct dhcpMessage dhcp_msg;
        fd_set rfds;
-       size_t packlen, addr_size;
+       size_t packlen;
+       socklen_t addr_size;
        struct sockaddr_in client_addr;
        struct timeval tv;
        int i;
@@ -274,7 +274,7 @@ static void dhcprelay_loop(int *fds, int num_sockets, int max_socket, char **cli
                        if (FD_ISSET(fds[0], &rfds)) {
                                packlen = udhcp_get_packet(&dhcp_msg, fds[0]);
                                if (packlen > 0) {
-                                       pass_back(&dhcp_msg, packlen, fds); 
+                                       pass_back(&dhcp_msg, packlen, fds);
                                }
                        }
                        for (i = 1; i < num_sockets; i++) {
@@ -318,10 +318,8 @@ int dhcprelay_main(int argc, char **argv)
        signal(SIGTERM, dhcprelay_signal_handler);
        signal(SIGQUIT, dhcprelay_signal_handler);
        signal(SIGINT, dhcprelay_signal_handler);
- 
+
        num_sockets = init_sockets(clients, num_sockets, argv[2], fds, &max_socket);
-       if (num_sockets == -1)
-               bb_perror_msg_and_die("init_sockets() failed");
 
        if (read_interface(argv[2], NULL, &gw_ip, NULL) == -1)
                return 1;