xnu-517.12.7.tar.gz

[apple/xnu.git] / bsd / net / if_tun.c

diff --git a/bsd/net/if_tun.c b/bsd/net/if_tun.c
index 833251c07ce469d9032fb21cb29ee4e00c1a7734..8ed3afd27f11d66c491004be2ba2bd2a31025912 100644 (file)
--- a/bsd/net/if_tun.c
+++ b/bsd/net/if_tun.c
@@ -77,11 +77,6 @@
 #include <netinet6/in6_ifattach.h>
 #endif /* INET6 */
 
-#if NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
 #include "bpfilter.h"
 #if NBPFILTER > 0
 #include <net/bpf.h>
@@ -249,9 +244,8 @@ tunclose(dev, foo, bar, p)
        }
        ifp->if_flags &= ~IFF_RUNNING;
        funsetown(tp->tun_sigio);
-       thread_funnel_switch(NETWORK_FUNNEL, KERNEL_FUNNEL);
        selwakeup(&tp->tun_rsel);
-       thread_funnel_switch(KERNEL_FUNNEL, NETWORK_FUNNEL);
+       selthreadclear(&tp->tun_rsel);
 
        TUNDEBUG ("%s%d: closed\n", ifp->if_name, ifp->if_unit);
        return (0);
@@ -305,6 +299,12 @@ tunifioctl(ifp, cmd, data)
 
        s = splimp();
        switch(cmd) {
+       case SIOCGIFSTATUS:
+               ifs = (struct ifstat *)data;
+               if (tp->tun_pid)
+                       sprintf(ifs->ascii + strlen(ifs->ascii),
+                           "\tOpened by PID %d\n", tp->tun_pid);
+               break;
        case SIOCSIFADDR:
                tuninit(ifp->if_unit);
                TUNDEBUG("%s%d: address set\n",
@@ -451,9 +451,7 @@ tunoutput(ifp, m0, dst, rt)
        }
        if (tp->tun_flags & TUN_ASYNC && tp->tun_sigio)
                pgsigio(tp->tun_sigio, SIGIO, 0);
-       thread_funnel_switch(NETWORK_FUNNEL, KERNEL_FUNNEL);
        selwakeup(&tp->tun_rsel);
-       thread_funnel_switch(KERNEL_FUNNEL, NETWORK_FUNNEL);
        return 0;
 }
 
@@ -730,9 +728,10 @@ tunwrite(dev, uio, flag)
  * anyway, it either accepts the packet or drops it.
  */
 static int
-tunpoll(dev, events, p)
+tunpoll(dev, events, wql, p)
        dev_t dev;
        int events;
+       void * wql;
        struct proc *p;
 {
        int             unit = dev_val(minor(dev)), s;
@@ -751,7 +750,7 @@ tunpoll(dev, events, p)
                } else {
                        TUNDEBUG("%s%d: tunpoll waiting\n", ifp->if_name,
                            ifp->if_unit);
-                       selrecord(p, &tp->tun_rsel);
+                       selrecord(p, &tp->tun_rsel, wql);
                }
 
        if (events & (POLLOUT | POLLWRNORM))