use xbind, xconnect where appropriate.

[oweals/busybox.git] / networking / libiproute / iplink.c

diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index 2550c196e493ef2cae628fefe7e80d77f158f0c3..ea57d60aca78faf965ec4120a4c9d856c25061bb 100644 (file)
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -1,49 +1,33 @@
+/* vi: set sw=4 ts=4: */
 /*
- * iplink.c            "ip link".
+ * iplink.c "ip link".
  *
- *             This program is free software; you can redistribute it and/or
- *             modify it under the terms of the GNU General Public License
- *             as published by the Free Software Foundation; either version
- *             2 of the License, or (at your option) any later version.
- *
- * Authors:    Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
+#include "libbb.h"
+
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <linux/version.h>
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 #include <net/if.h>
 #include <net/if_packet.h>
 #include <netpacket/packet.h>
 
-#if __GLIBC__ >=2 && __GLIBC_MINOR >= 1
 #include <net/ethernet.h>
-#else
-#include <linux/if_ether.h>
-#endif
 
 #include "rt_names.h"
 #include "utils.h"
 #include "ip_common.h"
 
-#include "libbb.h"
-
-
 /* take from linux/sockios.h */
 #define SIOCSIFNAME    0x8923          /* set interface name */
 
-static int do_link;
-
 static int on_off(char *msg)
 {
-       bb_error_msg("Error: argument of \"%s\" must be \"on\" or \"off\"", msg);
+       bb_error_msg("error: argument of \"%s\" must be \"on\" or \"off\"", msg);
        return -1;
 }
 
@@ -73,7 +57,7 @@ static int do_chflags(char *dev, __u32 flags, __u32 mask)
        int fd;
        int err;
 
-       strcpy(ifr.ifr_name, dev);
+       strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
        fd = get_ctl_fd();
        if (fd < 0)
                return -1;
@@ -96,13 +80,12 @@ static int do_chflags(char *dev, __u32 flags, __u32 mask)
 
 static int do_changename(char *dev, char *newdev)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0)
        struct ifreq ifr;
        int fd;
        int err;
 
-       strcpy(ifr.ifr_name, dev);
-       strcpy(ifr.ifr_newname, newdev);
+       strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
+       strncpy(ifr.ifr_newname, newdev, sizeof(ifr.ifr_newname));
        fd = get_ctl_fd();
        if (fd < 0)
                return -1;
@@ -114,8 +97,6 @@ static int do_changename(char *dev, char *newdev)
        }
        close(fd);
        return err;
-#endif
-       return 0;
 }
 
 static int set_qlen(char *dev, int qlen)
@@ -128,7 +109,7 @@ static int set_qlen(char *dev, int qlen)
                return -1;
 
        memset(&ifr, 0, sizeof(ifr));
-       strcpy(ifr.ifr_name, dev);
+       strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
        ifr.ifr_qlen = qlen;
        if (ioctl(s, SIOCSIFTXQLEN, &ifr) < 0) {
                perror("SIOCSIFXQLEN");
@@ -150,7 +131,7 @@ static int set_mtu(char *dev, int mtu)
                return -1;
 
        memset(&ifr, 0, sizeof(ifr));
-       strcpy(ifr.ifr_name, dev);
+       strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
        ifr.ifr_mtu = mtu;
        if (ioctl(s, SIOCSIFMTU, &ifr) < 0) {
                perror("SIOCSIFMTU");
@@ -166,7 +147,7 @@ static int get_address(char *dev, int *htype)
 {
        struct ifreq ifr;
        struct sockaddr_ll me;
-       int alen;
+       socklen_t alen;
        int s;
 
        s = socket(PF_PACKET, SOCK_DGRAM, 0);
@@ -176,7 +157,7 @@ static int get_address(char *dev, int *htype)
        }
 
        memset(&ifr, 0, sizeof(ifr));
-       strcpy(ifr.ifr_name, dev);
+       strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
        if (ioctl(s, SIOCGIFINDEX, &ifr) < 0) {
                perror("SIOCGIFINDEX");
                close(s);
@@ -209,13 +190,13 @@ static int parse_address(char *dev, int hatype, int halen, char *lla, struct ifr
        int alen;
 
        memset(ifr, 0, sizeof(*ifr));
-       strcpy(ifr->ifr_name, dev);
+       strncpy(ifr->ifr_name, dev, sizeof(ifr->ifr_name));
        ifr->ifr_hwaddr.sa_family = hatype;
-       alen = ll_addr_a2n(ifr->ifr_hwaddr.sa_data, 14, lla);
+       alen = ll_addr_a2n((unsigned char *)(ifr->ifr_hwaddr.sa_data), 14, lla);
        if (alen < 0)
                return -1;
        if (alen != halen) {
-               bb_error_msg("Wrong address (%s) length: expected %d bytes", lla, halen);
+               bb_error_msg("wrong address (%s) length: expected %d bytes", lla, halen);
                return -1;
        }
        return 0;
@@ -266,7 +247,7 @@ static int do_set(int argc, char **argv)
                        if (mtu != -1)
                                duparg("mtu", *argv);
                        if (get_integer(&mtu, *argv, 0))
-                               invarg("Invalid \"mtu\" value\n", *argv);
+                               invarg(*argv, "mtu");
                } else if (strcmp(*argv, "multicast") == 0) {
                        NEXT_ARG();
                        mask |= IFF_MULTICAST;
@@ -285,8 +266,11 @@ static int do_set(int argc, char **argv)
                                flags |= IFF_NOARP;
                        } else
                                return on_off("noarp");
+               } else if (strcmp(*argv, "addr") == 0) {
+                       NEXT_ARG();
+                       newaddr = *argv;
                } else {
-                        if (strcmp(*argv, "dev") == 0) {
+                       if (strcmp(*argv, "dev") == 0) {
                                NEXT_ARG();
                        }
                        if (dev)
@@ -297,7 +281,7 @@ static int do_set(int argc, char **argv)
        }
 
        if (!dev) {
-               bb_error_msg("Not enough of information: \"dev\" argument is required.");
+               bb_error_msg(bb_msg_requires_arg, "\"dev\"");
                exit(-1);
        }
 
@@ -346,7 +330,6 @@ static int do_set(int argc, char **argv)
 static int ipaddr_list_link(int argc, char **argv)
 {
        preferred_family = AF_PACKET;
-       do_link = 1;
        return ipaddr_list_or_flush(argc, argv, 0);
 }
 
@@ -362,6 +345,6 @@ int do_iplink(int argc, char **argv)
        } else
                return ipaddr_list_link(0, NULL);
 
-       bb_error_msg("Command \"%s\" is unknown.", *argv);
+       bb_error_msg("command \"%s\" is unknown", *argv);
        exit(-1);
 }