[src/netbsd-1-5]: src/sbin/ifconfig Pull up revision 1.89 (requested by bouyer):

[jhawk <jhawk%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/41de9549fd33
branches:  netbsd-1-5
changeset: 490449:41de9549fd33
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Sun Dec 31 20:13:54 2000 +0000

description:
Pull up revision 1.89 (requested by bouyer):
        Add support for 802.1Q virtual LANs.

diffstat:

 sbin/ifconfig/ifconfig.c |  114 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 112 insertions(+), 2 deletions(-)

diffs (191 lines):

diff -r 3d8706b39b1e -r 41de9549fd33 sbin/ifconfig/ifconfig.c
--- a/sbin/ifconfig/ifconfig.c  Sun Dec 31 18:35:15 2000 +0000
+++ b/sbin/ifconfig/ifconfig.c  Sun Dec 31 20:13:54 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ifconfig.c,v 1.79.4.4 2000/12/31 17:57:33 jhawk Exp $  */
+/*     $NetBSD: ifconfig.c,v 1.79.4.5 2000/12/31 20:13:54 jhawk Exp $  */
 
 /*-
  * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@
 #if 0
 static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94";
 #else
-__RCSID("$NetBSD: ifconfig.c,v 1.79.4.4 2000/12/31 17:57:33 jhawk Exp $");
+__RCSID("$NetBSD: ifconfig.c,v 1.79.4.5 2000/12/31 20:13:54 jhawk Exp $");
 #endif
 #endif /* not lint */
 
@@ -93,6 +93,7 @@
 #include <net/if_media.h>
 #include <net/if_ether.h>
 #include <net/if_ieee80211.h>
+#include <net/if_vlanvar.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #ifdef INET6
@@ -148,6 +149,7 @@
 #endif
 int    reset_if_flags;
 int    explicit_prefix = 0;
+u_int  vlan_tag = (u_int)-1;
 
 void   notealias __P((const char *, int));
 void   notrailers __P((const char *, int));
@@ -182,6 +184,9 @@
 void   clone_create __P((const char *, int));
 void   clone_destroy __P((const char *, int));
 void   fixnsel __P((struct sockaddr_iso *));
+void   setvlan __P((const char *, int));
+void   setvlanif __P((const char *, int));
+void   unsetvlanif __P((const char *, int));
 int    main __P((int, char *[]));
 
 /*
@@ -255,6 +260,10 @@
        { "tunnel",     NEXTARG2,       0,              NULL,
                                                        settunnel } ,
        { "deletetunnel", 0,            0,              deletetunnel },
+       { "vlan",       NEXTARG,        0,              setvlan } ,
+       { "vlanif",     NEXTARG,        0,              setvlanif } ,
+       { "-vlanif",    0,              0,              unsetvlanif } ,
+       { "deletetunnel", 0,            0,              deletetunnel },
 #if 0
        /* XXX `create' special-cased below */
        { "create",     0,              0,              clone_create } ,
@@ -322,6 +331,7 @@
 
 void   ieee80211_status __P((void));
 void   tunnel_status __P((void));
+void   vlan_status __P((void));
 
 /* Known address families */
 struct afswtch {
@@ -990,6 +1000,83 @@
                err(1, "SIOCDIFPHYADDR");
 }
 
+void setvlan(val, d)
+       const char *val;
+       int d;
+{
+       struct vlanreq vlr;
+
+       if (strncmp(ifr.ifr_name, "vlan", 4) != 0 ||
+           !isdigit(ifr.ifr_name[4]))
+               errx(EXIT_FAILURE,
+                   "``vlan'' valid only with vlan(4) interfaces");
+
+       vlan_tag = atoi(val);
+
+       memset(&vlr, 0, sizeof(vlr));
+       ifr.ifr_data = (caddr_t)&vlr;
+
+       if (ioctl(s, SIOCGETVLAN, (caddr_t)&ifr) == -1)
+               err(EXIT_FAILURE, "SIOCGETVLAN");
+
+       vlr.vlr_tag = vlan_tag;
+
+       if (ioctl(s, SIOCSETVLAN, (caddr_t)&ifr) == -1)
+               err(EXIT_FAILURE, "SIOCSETVLAN");
+}
+
+void setvlanif(val, d)
+       const char *val;
+       int d;
+{
+       struct vlanreq vlr;
+
+       if (strncmp(ifr.ifr_name, "vlan", 4) != 0 ||
+           !isdigit(ifr.ifr_name[4]))
+               errx(EXIT_FAILURE,
+                   "``vlanif'' valid only with vlan(4) interfaces");
+
+       if (vlan_tag == (u_int)-1)
+               errx(EXIT_FAILURE,
+                   "must specify both ``vlan'' and ``vlanif''");
+
+       memset(&vlr, 0, sizeof(vlr));
+       ifr.ifr_data = (caddr_t)&vlr;
+
+       if (ioctl(s, SIOCGETVLAN, (caddr_t)&ifr) == -1)
+               err(EXIT_FAILURE, "SIOCGETVLAN");
+
+       strlcpy(vlr.vlr_parent, val, sizeof(vlr.vlr_parent));
+       vlr.vlr_tag = vlan_tag;
+
+       if (ioctl(s, SIOCSETVLAN, (caddr_t)&ifr) == -1)
+               err(EXIT_FAILURE, "SIOCSETVLAN");
+}
+
+void unsetvlanif(val, d)
+       const char *val;
+       int d;
+{
+       struct vlanreq vlr;
+
+       if (strncmp(ifr.ifr_name, "vlan", 4) != 0 ||
+           !isdigit(ifr.ifr_name[4]))
+               errx(EXIT_FAILURE,
+                   "``vlanif'' valid only with vlan(4) interfaces");
+
+       memset(&vlr, 0, sizeof(vlr));
+       ifr.ifr_data = (caddr_t)&vlr;
+
+       if (ioctl(s, SIOCGETVLAN, (caddr_t)&ifr) == -1)
+               err(EXIT_FAILURE, "SIOCGETVLAN");
+
+       vlr.vlr_parent[0] = '\0';
+       vlr.vlr_tag = 0;
+
+       if (ioctl(s, SIOCSETVLAN, (caddr_t)&ifr) == -1)
+               err(EXIT_FAILURE, "SIOCSETVLAN");
+}
+
 void
 setifnetmask(addr, d)
        const char *addr;
@@ -1714,6 +1801,7 @@
        putchar('\n');
 
        ieee80211_status();
+       vlan_status();
        tunnel_status();
 
        if (ap && alen > 0) {
@@ -1884,6 +1972,27 @@
 }
 
 void
+vlan_status()
+{
+       struct vlanreq vlr;
+
+       if (strncmp(ifr.ifr_name, "vlan", 4) != 0 ||
+           !isdigit(ifr.ifr_name[4]))
+               return;
+
+       memset(&vlr, 0, sizeof(vlr));
+       ifr.ifr_data = (caddr_t)&vlr;
+
+       if (ioctl(s, SIOCGETVLAN, (caddr_t)&ifr) == -1)
+               return;
+
+       if (vlr.vlr_tag || vlr.vlr_parent[0] != '\0')
+               printf("\tvlan: %d parent: %s\n",
+                   vlr.vlr_tag, vlr.vlr_parent[0] == '\0' ?
+                   "<none>" : vlr.vlr_parent);
+}
+
+void
 in_alias(creq)
        struct ifreq *creq;
 {
@@ -2727,6 +2836,7 @@
                "\t[ mediaopt mopts ]\n"
                "\t[ -mediaopt mopts ]\n"
                "\t[ instance minst ]\n"
+               "\t[ vlan n vlanif i ]\n"
                "\t[ link0 | -link0 ] [ link1 | -link1 ] [ link2 | -link2 ]\n"
                "       %s -a [ -A ] [ -m ] [ -d ] [ -u ] [ af ]\n"
                "       %s -l [ -d ] [ -u ]\n"