xnu-1228.0.2.tar.gz

[apple/xnu.git] / bsd / netat / sys_dep.c

diff --git a/bsd/netat/sys_dep.c b/bsd/netat/sys_dep.c
index ece349050b814200ab2f733951c0c78d5c34ed79..47a18d89c4f5cf6aecacd811e235e05e23bad1f0 100644 (file)
--- a/bsd/netat/sys_dep.c
+++ b/bsd/netat/sys_dep.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1995-2007 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -26,8 +26,6 @@
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
- *     Copyright (c) 1995-1998 Apple Computer, Inc. 
- *
  *  Change Log:
  *    Created February 20, 1995 by Tuyen Nguyen
  *    Modified for MP, 1996 by Tuyen Nguyen
@@ -53,12 +51,12 @@
 
 #include <netat/sysglue.h>
 #include <netat/appletalk.h>
-#include <netat/at_var.h>
 #include <netat/at_pcb.h>
+#include <netat/at_var.h>
 #include <netat/debug.h>
 
+int falloc_locked(proc_t, struct fileproc **, int *, vfs_context_t, int);
 
-extern at_state_t at_state;    /* global state of AT network */
 extern at_ifaddr_t *ifID_home; /* default interface */
 extern lck_mtx_t * atalk_mutex;
 
@@ -70,11 +68,13 @@ extern lck_mtx_t * atalk_mutex;
 #define f_offset f_fglob->fg_offset
 #define f_data f_fglob->fg_data
 
-extern int _ATsocket(int, int *, void *);
-extern int _ATgetmsg(int, strbuf_t *, strbuf_t *, int *, int *, void *);
-extern int _ATputmsg();
-extern int _ATPsndreq(), _ATPsndrsp(), _ATPgetreq(), _ATPgetrsp();
 
+int _ATkqfilter(struct fileproc *, struct knote *, vfs_context_t);
+int _ATselect(struct fileproc *, int, void *, vfs_context_t);
+int _ATioctl(struct fileproc *, u_long, caddr_t, vfs_context_t);
+int _ATwrite(struct fileproc *, struct uio *, int, vfs_context_t);
+int _ATread(struct fileproc *, struct uio *, int, vfs_context_t);
+int _ATclose(struct fileglob *, vfs_context_t);
 
 int ATsocket(proc, uap, retval)
        struct proc *proc;
@@ -83,7 +83,7 @@ int ATsocket(proc, uap, retval)
 {
        int err;
        atalk_lock();
-       if (_ATsocket) {
+       if (1 /* _ATsocket*/) {
                /* required check for all AppleTalk system calls */
                if (!(at_state.flags & AT_ST_STARTED) || !ifID_home) {
                        *retval = -1;
@@ -107,7 +107,7 @@ int ATgetmsg(proc, uap, retval)
        int err;
 
        atalk_lock();
-       if (_ATgetmsg) {
+       if (1 /* _ATgetmsg */) {
                /* required check for all AppleTalk system calls */
                if (!(at_state.flags & AT_ST_STARTED) || !ifID_home) {
                        *retval = -1;
@@ -133,7 +133,7 @@ int ATputmsg(proc, uap, retval)
        int err;
 
        atalk_lock();
-       if (_ATputmsg) {
+       if (1 /* _ATputmsg */) {
                /* required check for all AppleTalk system calls */
                if (!(at_state.flags & AT_ST_STARTED) || !ifID_home) {
                        *retval = -1;
@@ -159,7 +159,7 @@ int ATPsndreq(proc, uap, retval)
        int err;
 
        atalk_lock();
-       if (_ATPsndreq) {
+       if (1 /* _ATPsndreq */) {
                /* required check for all AppleTalk system calls */
                if (!(at_state.flags & AT_ST_STARTED) || !ifID_home) {
                        *retval = -1;
@@ -185,7 +185,7 @@ int ATPsndrsp(proc, uap, retval)
        int err;
 
        atalk_lock();
-       if (_ATPsndrsp) {
+       if (1 /*_ATPsndrsp*/) {
                /* required check for all AppleTalk system calls */
                if (!(at_state.flags & AT_ST_STARTED) || !ifID_home) {
                        *retval = -1;
@@ -211,7 +211,7 @@ int ATPgetreq(proc, uap, retval)
        int err;
 
        atalk_lock();
-       if (_ATPgetreq) {
+       if (1 /* _ATPgetreq */) {
                /* required check for all AppleTalk system calls */
                if (!(at_state.flags & AT_ST_STARTED) || !ifID_home) {
                        *retval = -1;
@@ -237,14 +237,14 @@ int ATPgetrsp(proc, uap, retval)
        int err = 0;
 
        atalk_lock();
-       if (_ATPgetrsp) {
+       if (1 /*_ATPgetrsp*/) {
                /* required check for all AppleTalk system calls */
                if (!(at_state.flags & AT_ST_STARTED) || !ifID_home) {
                        *retval = -1;
                        err = ENOTREADY;
                } else {
                        *retval = 
-                         _ATPgetrsp(uap->fd, uap->bdsp, &err, proc);
+                         _ATPgetrsp(uap->fd, (struct atpBDS *)uap->bdsp, &err, proc);
                }
        } else {
                *retval = -1;
@@ -270,7 +270,6 @@ int atalk_openref(gref, retfd, proc)
        int *retfd;
        struct proc *proc;
 {
-       extern int _ATread(), _ATwrite(),_ATioctl(), _ATselect(), _ATclose(), _ATkqfilter();
        static struct fileops fileops = 
                {_ATread, _ATwrite, _ATioctl, _ATselect, _ATclose, _ATkqfilter, 0};
        int err, fd;
@@ -279,7 +278,7 @@ int atalk_openref(gref, retfd, proc)
        lck_mtx_assert(atalk_mutex, LCK_MTX_ASSERT_OWNED);
        
        proc_fdlock(proc);
-       if ((err = falloc_locked(proc, &fp, &fd, 1)) != 0) {
+       if ((err = falloc_locked(proc, &fp, &fd, vfs_context_current(), 1)) != 0) {
                proc_fdunlock(proc);
                return err;
        }
@@ -292,7 +291,7 @@ int atalk_openref(gref, retfd, proc)
        fp->f_ops = &fileops;
        fp->f_data = (void *)gref;
 
-       *fdflags(proc, fd) &= ~UF_RESERVED;
+       procfdtbl_releasefd(proc, fd, NULL);
        *retfd = fd;
        fp_drop(proc, fd, fp, 1);
        proc_fdunlock(proc);
@@ -345,7 +344,7 @@ int droponerr;
        if (fp->f_type != (DTYPE_ATALK+1) || *grefp == 0 || *grefp == (gref_t *)(-1)) {
                if (droponerr)
                        fp_drop(proc, fd, fp, 1);
-               printf("atalk_getref_locked EBADF f_data: %x\n", fp->f_data);
+               printf("atalk_getref_locked EBADF f_data: %p\n", fp->f_data);
                return EBADF;
        }