xnu-517.9.5.tar.gz

[apple/xnu.git] / bsd / kern / sys_socket.c

diff --git a/bsd/kern/sys_socket.c b/bsd/kern/sys_socket.c
index c276ed03614de11c7b7b1d38337b492f12ae3e27..973f4870f39d947ab8e6f5e44f1d3a79be3addef 100644 (file)
--- a/bsd/kern/sys_socket.c
+++ b/bsd/kern/sys_socket.c
@@ -57,6 +57,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/file.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/file.h>

+#include <sys/event.h>

 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>


@@ -77,8 +78,10 @@ int soo_close __P((struct file *fp, struct proc *p));
 
 int soo_select __P((struct file *fp, int which, void * wql, struct proc *p));
 
 
 int soo_select __P((struct file *fp, int which, void * wql, struct proc *p));
 

+int soo_kqfilter __P((struct file *fp, struct knote *kn, struct proc *p));
+

 struct fileops socketops =
 struct fileops socketops =

-    { soo_read, soo_write, soo_ioctl, soo_select, soo_close };
+    { soo_read, soo_write, soo_ioctl, soo_select, soo_close, soo_kqfilter };

 
 /* ARGSUSED */
 int
 
 /* ARGSUSED */
 int


@@ -343,6 +346,7 @@ soo_select(fp, which, wql, p)
        register int s = splnet();
        int retnum=0;
 
        register int s = splnet();
        int retnum=0;
 

+       if (so == NULL || so == (struct socket*)-1) goto done;

 
        switch (which) {
 
 
        switch (which) {
 


@@ -411,14 +415,17 @@ soo_close(fp, p)
        struct proc *p;
 {
        int error = 0;
        struct proc *p;
 {
        int error = 0;

+       struct socket *sp;
+
+       sp = (struct socket *)fp->f_data;
+       fp->f_data = NULL;

 
        thread_funnel_switch(KERNEL_FUNNEL, NETWORK_FUNNEL);
 
 
        thread_funnel_switch(KERNEL_FUNNEL, NETWORK_FUNNEL);
 

-       if (fp->f_data)
-            error = soclose((struct socket *)fp->f_data);
+       if (sp)
+            error = soclose(sp);

 
        thread_funnel_switch(NETWORK_FUNNEL, KERNEL_FUNNEL);
 
 
        thread_funnel_switch(NETWORK_FUNNEL, KERNEL_FUNNEL);
 

-       fp->f_data = 0;

        return (error);
 }
        return (error);
 }