ip route: get: allow zero-length subnet mask

[mirror_iproute2.git] / ip / link_veth.c

diff --git a/ip/link_veth.c b/ip/link_veth.c
index 776068492a20e041644fcf838c5a234c2cddbc7d..33e8f2b102e7f8178afe04694ebe8d62160317fb 100644 (file)
--- a/ip/link_veth.c
+++ b/ip/link_veth.c
@@ -11,79 +11,76 @@
  */
 
 #include <string.h>
+#include <net/if.h>
+#include <linux/veth.h>
 
 #include "utils.h"
 #include "ip_common.h"
-#include "veth.h"
 
-#define ETH_ALEN       6
+static void print_usage(FILE *f)
+{
+       printf("Usage: ip link <options> type veth [peer <options>]\n"
+              "To get <options> type 'ip link add help'\n");
+}
 
 static void usage(void)
 {
-       printf("Usage: ip link add ... type veth "
-                       "[peer <peer-name>] [mac <mac>] [peer_mac <mac>]\n");
+       print_usage(stderr);
 }
 
 static int veth_parse_opt(struct link_util *lu, int argc, char **argv,
-               struct nlmsghdr *hdr)
+                         struct nlmsghdr *n)
 {
-       __u8 mac[ETH_ALEN];
-
-       for (; argc != 0; argv++, argc--) {
-               if (strcmp(*argv, "peer") == 0) {
-                       argv++;
-                       argc--;
-                       if (argc == 0) {
-                               usage();
-                               return -1;
-                       }
+       char *type = NULL;
+       int err;
+       struct rtattr *data;
+       struct ifinfomsg *ifm, *peer_ifm;
+       unsigned int ifi_flags, ifi_change, ifi_index;
 
-                       addattr_l(hdr, 1024, VETH_INFO_PEER,
-                                       *argv, strlen(*argv));
-
-                       continue;
-               }
+       if (strcmp(argv[0], "peer") != 0) {
+               usage();
+               return -1;
+       }
 
-               if (strcmp(*argv, "mac") == 0) {
-                       argv++;
-                       argc--;
-                       if (argc == 0) {
-                               usage();
-                               return -1;
-                       }
+       ifm = NLMSG_DATA(n);
+       ifi_flags = ifm->ifi_flags;
+       ifi_change = ifm->ifi_change;
+       ifi_index = ifm->ifi_index;
+       ifm->ifi_flags = 0;
+       ifm->ifi_change = 0;
+       ifm->ifi_index = 0;
 
-                       if (hexstring_a2n(*argv, mac, sizeof(mac)) == NULL)
-                               return -1;
+       data = addattr_nest(n, 1024, VETH_INFO_PEER);
 
-                       addattr_l(hdr, 1024, VETH_INFO_MAC,
-                                       mac, ETH_ALEN);
-                       continue;
-               }
+       n->nlmsg_len += sizeof(struct ifinfomsg);
 
-               if (strcmp(*argv, "peer_mac") == 0) {
-                       argv++;
-                       argc--;
-                       if (argc == 0) {
-                               usage();
-                               return -1;
-                       }
+       err = iplink_parse(argc - 1, argv + 1, (struct iplink_req *)n, &type);
+       if (err < 0)
+               return err;
 
-                       if (hexstring_a2n(*argv, mac, sizeof(mac)) == NULL)
-                               return -1;
+       if (type)
+               duparg("type", argv[err]);
 
-                       addattr_l(hdr, 1024, VETH_INFO_PEER_MAC,
-                                       mac, ETH_ALEN);
-                       continue;
-               }
+       peer_ifm = RTA_DATA(data);
+       peer_ifm->ifi_index = ifm->ifi_index;
+       peer_ifm->ifi_flags = ifm->ifi_flags;
+       peer_ifm->ifi_change = ifm->ifi_change;
+       ifm->ifi_flags = ifi_flags;
+       ifm->ifi_change = ifi_change;
+       ifm->ifi_index = ifi_index;
 
-               usage();
-               return -1;
-       }
+       addattr_nest_end(n, data);
+       return argc - 1 - err;
+}
 
-       return 0;
+static void veth_print_help(struct link_util *lu, int argc, char **argv,
+       FILE *f)
+{
+       print_usage(f);
 }
 
 struct link_util veth_link_util = {
        .id = "veth",
        .parse_opt = veth_parse_opt,
+       .print_help = veth_print_help,
 };