Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-5]: src/sys/net permit configuration ioctl for tunnel-over-IPv6.



details:   https://anonhg.NetBSD.org/src/rev/42057d66abda
branches:  netbsd-1-5
changeset: 488186:42057d66abda
user:      itojun <itojun%NetBSD.org@localhost>
date:      Tue Jun 20 21:04:26 2000 +0000

description:
permit configuration ioctl for tunnel-over-IPv6.
approved by: releng-1-5

diffstat:

 sys/net/if_gif.c |  28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)

diffs (57 lines):

diff -r 142d51f88b13 -r 42057d66abda sys/net/if_gif.c
--- a/sys/net/if_gif.c  Tue Jun 20 17:53:17 2000 +0000
+++ b/sys/net/if_gif.c  Tue Jun 20 21:04:26 2000 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: if_gif.c,v 1.10 2000/05/17 01:14:04 itojun Exp $       */
-/*     $KAME: if_gif.c,v 1.26 2000/05/17 01:09:26 itojun Exp $ */
+/*     $NetBSD: if_gif.c,v 1.10.4.1 2000/06/20 21:04:26 itojun Exp $   */
+/*     $KAME: if_gif.c,v 1.28 2000/06/20 12:30:03 jinmei Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -474,9 +474,9 @@
                break;
 
 #ifdef SIOCSIFMTU /* xxx */
-#ifndef __OpenBSD__
        case SIOCGIFMTU:
                break;
+
        case SIOCSIFMTU:
                {
 #ifdef __bsdi__
@@ -492,17 +492,29 @@
                        ifp->if_mtu = mtu;
                }
                break;
-#endif /* !OpenBSD */
 #endif /* SIOCSIFMTU */
 
        case SIOCSIFPHYADDR:
 #ifdef INET6
        case SIOCSIFPHYADDR_IN6:
 #endif /* INET6 */
-               src = (struct sockaddr *)
-                       &(((struct in_aliasreq *)data)->ifra_addr);
-               dst = (struct sockaddr *)
-                       &(((struct in_aliasreq *)data)->ifra_dstaddr);
+               switch (cmd) {
+               case SIOCSIFPHYADDR:
+                       src = (struct sockaddr *)
+                               &(((struct in_aliasreq *)data)->ifra_addr);
+                       dst = (struct sockaddr *)
+                               &(((struct in_aliasreq *)data)->ifra_dstaddr);
+                       break;
+#ifdef INET6
+               case SIOCSIFPHYADDR_IN6:
+                       src = (struct sockaddr *)
+                               &(((struct in6_aliasreq *)data)->ifra_addr);
+                       dst = (struct sockaddr *)
+                               &(((struct in6_aliasreq *)data)->ifra_dstaddr);
+                       break;
+#endif
+               }
+
                for (i = 0; i < ngif; i++) {
                        sc2 = gif + i;
                        if (sc2 == sc)



Home | Main Index | Thread Index | Old Index