xnu-1699.22.73.tar.gz

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

diff --git a/bsd/netat/asp_proto.c b/bsd/netat/asp_proto.c
index 80291b24924ed77e64fb6814e9475c0fe72bf3bf..8f1621b54fbf51c7cc7afbc17247b14a215ca84a 100644 (file)
--- a/bsd/netat/asp_proto.c
+++ b/bsd/netat/asp_proto.c
@@ -1,16 +1,19 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1995-2007 Apple Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in

- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.

  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,11 +23,9 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  */
 /*

- *     Copyright (c) 1995 Apple Computer, Inc. 
- *

  *  Change Log:
  *    Created February 20, 1995 by Tuyen Nguyen
  *    Modified for MP, 1996 by Tuyen Nguyen
  *  Change Log:
  *    Created February 20, 1995 by Tuyen Nguyen
  *    Modified for MP, 1996 by Tuyen Nguyen


@@ -43,13 +44,14 @@
 #include <sys/mbuf.h>
 #include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/ioctl.h>
 #include <sys/malloc.h>

+#include <kern/locks.h>

 #include <sys/socket.h>
 #include <sys/socketvar.h>
 
 #include <net/if.h>
 
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 
 #include <net/if.h>
 

-#include <netat/appletalk.h>

 #include <netat/sysglue.h>
 #include <netat/sysglue.h>

+#include <netat/appletalk.h>

 #include <netat/at_pcb.h>
 #include <netat/atp.h>
 #include <netat/ddp.h>
 #include <netat/at_pcb.h>
 #include <netat/atp.h>
 #include <netat/ddp.h>


@@ -57,13 +59,6 @@
 #include <netat/at_var.h>
 #include <netat/debug.h>
 
 #include <netat/at_var.h>
 #include <netat/debug.h>
 

-static int loop_cnt;
-#define CHK_LOOP(str) { \
-  if (loop_cnt++ > 100) { \
-     kprintf("%s", str); \
-     break; \
-  } \
-}

 
 #define atpBDSsize    (sizeof(struct atpBDS)*ATP_TRESP_MAX)
 #define aspCMDsize    (atpBDSsize+sizeof(struct atp_set_default)+TOTAL_ATP_HDR_SIZE)
 
 #define atpBDSsize    (sizeof(struct atpBDS)*ATP_TRESP_MAX)
 #define aspCMDsize    (atpBDSsize+sizeof(struct atp_set_default)+TOTAL_ATP_HDR_SIZE)


@@ -78,35 +73,27 @@ static int loop_cnt;
        && ((scb->rem_addr.net != addr.net) \
                || (scb->rem_addr.node != addr.node)) )
 
        && ((scb->rem_addr.net != addr.net) \
                || (scb->rem_addr.node != addr.node)) )
 

-int  ASPputmsg();
-int  ASPgetmsg();
-void asp_init();
-void asp_ack_reply();
-void asp_nak_reply();
-void asp_clock();
-void asp_clock_funnel(void *);
-int  asp_open();
-int  asp_close();
-int  asp_wput();
-StaticProc asp_scb_t *asp_find_scb();
-StaticProc asp_scb_t *asp_scb_alloc();
-
-StaticProc void asp_putnext();
-StaticProc void asp_iocack();
-StaticProc void asp_iocnak();
-StaticProc void asp_dequeue_scb();
-StaticProc void asp_scb_free();
-StaticProc void asp_timout();
-StaticProc void asp_untimout();
-StaticProc void asp_hangup();
-StaticProc void asp_send_tickle();
-StaticProc void asp_send_tickle_funnel(void *);
-StaticProc void asp_accept();
-StaticProc int  asp_send_req();
+StaticProc asp_scb_t *asp_find_scb(unsigned char, at_inet_t *);
+StaticProc asp_scb_t *asp_scb_alloc(void);
+
+StaticProc void asp_putnext(gref_t *, gbuf_t *);
+StaticProc void asp_iocack(gref_t *, gbuf_t *);
+StaticProc void asp_iocnak(gref_t *, gbuf_t *, int);
+StaticProc void asp_dequeue_scb(asp_scb_t *);
+StaticProc void asp_scb_free(asp_scb_t *);
+StaticProc void asp_timout(asp_tmo_func,  asp_scb_t *, int);
+StaticProc void asp_untimout(asp_tmo_func,  asp_scb_t *);
+StaticProc void asp_hangup(asp_scb_t *);
+StaticProc void asp_send_tickle(asp_scb_t *);
+StaticProc void asp_send_tickle_locked(void *);
+StaticProc void asp_accept(asp_scb_t *scb, asp_scb_t *sess_scb, gbuf_t *m);
+StaticProc int  asp_send_req(gref_t *, gbuf_t *, at_inet_t *, at_retry_t *, asp_word_t *, 
+                                                       unsigned char , unsigned char, unsigned char);

 
 extern at_ifaddr_t *ifID_home;
 extern int atp_pidM[];
 extern gref_t *atp_inputQ[];
 
 extern at_ifaddr_t *ifID_home;
 extern int atp_pidM[];
 extern gref_t *atp_inputQ[];

+extern lck_mtx_t *atalk_mutex;

 gbuf_t *scb_resource_m = 0;
 unsigned char asp_inpC[256];
 asp_scb_t *asp_scbQ[256];
 gbuf_t *scb_resource_m = 0;
 unsigned char asp_inpC[256];
 asp_scb_t *asp_scbQ[256];


@@ -116,7 +103,8 @@ static unsigned char scb_tmo_cnt;
 asp_scb_t *scb_used_list;
 static asp_scb_t *scb_tmo_list;
 asp_scb_t *scb_free_list;
 asp_scb_t *scb_used_list;
 static asp_scb_t *scb_tmo_list;
 asp_scb_t *scb_free_list;

-atlock_t aspall_lock, asptmo_lock;
+
+int asp_readable(gref_t *);

 
 int
 asp_readable(gref)
 
 int
 asp_readable(gref)


@@ -142,7 +130,6 @@ asp_init()
 int asp_open(gref)
        gref_t *gref;
 {
 int asp_open(gref)
        gref_t *gref;
 {

-       int s;

        asp_scb_t *scb;
 
        /*
        asp_scb_t *scb;
 
        /*


@@ -167,11 +154,9 @@ int asp_open(gref)
        scb->gref = gref;
        scb->session_timer = DEF_SESS_TMO;
        scb->cmd_retry = asp_def_retry;
        scb->gref = gref;
        scb->session_timer = DEF_SESS_TMO;
        scb->cmd_retry = asp_def_retry;

-       ATDISABLE(s, aspall_lock);

        if ((scb->next_scb = scb_used_list) != 0)
                scb->next_scb->prev_scb = scb;
        scb_used_list = scb;
        if ((scb->next_scb = scb_used_list) != 0)
                scb->next_scb->prev_scb = scb;
        scb_used_list = scb;

-       ATENABLE(s, aspall_lock);

 
        /*
         * return success
 
        /*
         * return success


@@ -187,7 +172,6 @@ int
 asp_close(gref)
        gref_t *gref;
 {
 asp_close(gref)
        gref_t *gref;
 {

-       int s;

        unsigned char sock_num;
        asp_scb_t *scb, *new_scb;
        gbuf_t *m;
        unsigned char sock_num;
        asp_scb_t *scb, *new_scb;
        gbuf_t *m;


@@ -201,17 +185,14 @@ asp_close(gref)
                 * send the CloseSess response to peer
                 */
                if (gbuf_type(scb->sess_ioc) != MSG_PROTO) {
                 * send the CloseSess response to peer
                 */
                if (gbuf_type(scb->sess_ioc) != MSG_PROTO) {

-                       ATDISABLE(s, scb->lock);

                        m = scb->sess_ioc;
                        scb->sess_ioc = gbuf_next(m);
                        m = scb->sess_ioc;
                        scb->sess_ioc = gbuf_next(m);

-                       ATENABLE(s, scb->lock);

                        atp_send_rsp(scb->gref, m, TRUE);
                }
        }
 
        if (scb->atp_state) {
                sock_num = scb->loc_addr.socket;
                        atp_send_rsp(scb->gref, m, TRUE);
                }
        }
 
        if (scb->atp_state) {
                sock_num = scb->loc_addr.socket;

-               ATDISABLE(s, aspall_lock);

                if ((scb->dflag != 1) && scb->stat_msg) {
                        untimeout(atp_retry_req, scb->stat_msg);
                        gbuf_freem(scb->stat_msg);
                if ((scb->dflag != 1) && scb->stat_msg) {
                        untimeout(atp_retry_req, scb->stat_msg);
                        gbuf_freem(scb->stat_msg);


@@ -220,7 +201,6 @@ asp_close(gref)
                if (asp_scbQ[sock_num]->next_scb == 0) {
                        asp_scbQ[sock_num] = 0;
                        asp_inpC[sock_num] = 0;
                if (asp_scbQ[sock_num]->next_scb == 0) {
                        asp_scbQ[sock_num] = 0;
                        asp_inpC[sock_num] = 0;

-                       ATENABLE(s, aspall_lock);

                        dPrintf(D_M_ASP, D_L_INFO,
                        ("         : atp_close(), loc=%d\n", scb->loc_addr.socket));
                        atp_close(gref, 0);
                        dPrintf(D_M_ASP, D_L_INFO,
                        ("         : atp_close(), loc=%d\n", scb->loc_addr.socket));
                        atp_close(gref, 0);


@@ -238,7 +218,6 @@ asp_close(gref)
                                        scb->next_scb->prev_scb = scb->prev_scb;
                        }
                        scb->next_scb = 0;
                                        scb->next_scb->prev_scb = scb->prev_scb;
                        }
                        scb->next_scb = 0;

-                       ATENABLE(s, aspall_lock);

                }
        } else
                asp_dequeue_scb(scb);
                }
        } else
                asp_dequeue_scb(scb);


@@ -246,7 +225,6 @@ asp_close(gref)
        /*
         * free all allocated blocks if any
         */
        /*
         * free all allocated blocks if any
         */

-       ATDISABLE(s, scb->lock);

        if (scb->stat_msg) {
                gbuf_freem(scb->stat_msg);
                scb->stat_msg = 0;
        if (scb->stat_msg) {
                gbuf_freem(scb->stat_msg);
                scb->stat_msg = 0;


@@ -261,14 +239,13 @@ asp_close(gref)
        }
 
        scb->rem_addr.node = 0;
        }
 
        scb->rem_addr.node = 0;

-       ATENABLE(s, scb->lock);

 
        /*
         * stop all timers
         */
        scb->tmo_cnt = 0;
        asp_untimout(asp_hangup, scb);
 
        /*
         * stop all timers
         */
        scb->tmo_cnt = 0;
        asp_untimout(asp_hangup, scb);

-       untimeout(asp_send_tickle_funnel, (void *)scb); /* added for 2225395 */
+       untimeout(asp_send_tickle_locked, (void *)scb); /* added for 2225395 */

 
        /*
         * free the asp session control block
 
        /*
         * free the asp session control block


@@ -278,7 +255,11 @@ asp_close(gref)
        return 0;
 } /* asp_close */
 
        return 0;
 } /* asp_close */
 

-static char *aspStateStr(state)
+#if DEBUG
+
+static const char *aspStateStr(int);
+
+static const char *aspStateStr(state)

      int state;
 {
   return ((state==ASPSTATE_Close)? "Close":
      int state;
 {
   return ((state==ASPSTATE_Close)? "Close":


@@ -293,7 +274,9 @@ static char *aspStateStr(state)
          "unknown");
 }
 
          "unknown");
 }
 

-static char *aspCmdStr(aspCmd)
+static const char *aspCmdStr(int);
+
+static const char *aspCmdStr(aspCmd)

      int aspCmd;
 { 
 return ((aspCmd==ASPFUNC_CloseSess)? "CloseSess":
      int aspCmd;
 { 
 return ((aspCmd==ASPFUNC_CloseSess)? "CloseSess":


@@ -307,7 +290,9 @@ return ((aspCmd==ASPFUNC_CloseSess)? "CloseSess":
        (aspCmd==ASPFUNC_CmdReply)? "CmdReply": "unknown");
 }
 
        (aspCmd==ASPFUNC_CmdReply)? "CmdReply": "unknown");
 }
 

-static char *aspIOCStr(aspIOC)
+static const char *aspIOCStr(int);
+
+static const char *aspIOCStr(aspIOC)

      int aspIOC;
 {
 return (
      int aspIOC;
 {
 return (


@@ -327,13 +312,14 @@ return (
        "unknown"
        );
 }
        "unknown"
        );
 }

+#endif /* DEBUG */

 
 #ifdef AT_MBUF_TRACE
 
 static char mbuf_str[100];
 char *mbuf_totals() 
 {
 
 #ifdef AT_MBUF_TRACE
 
 static char mbuf_str[100];
 char *mbuf_totals() 
 {

-  sprintf(mbuf_str, 
+  snprintf(mbuf_str, sizeof(mbuf_str),

          /*
          "dat = %d, prot = %d, ioc = %d, err = %d, hu = %d, ack = %d, nak = %d, ctl = %d",
          */
          /*
          "dat = %d, prot = %d, ioc = %d, err = %d, hu = %d, ack = %d, nak = %d, ctl = %d",
          */


@@ -382,7 +368,7 @@ int asp_wput(gref, m)
        gref_t *gref;
        gbuf_t *m;
 {
        gref_t *gref;
        gbuf_t *m;
 {

-       int s, err;
+       int err;

        unsigned char sockSav, sock_num;
        gbuf_t *mioc, *mdata;
        ioc_t *iocbp;
        unsigned char sockSav, sock_num;
        gbuf_t *mioc, *mdata;
        ioc_t *iocbp;


@@ -496,7 +482,7 @@ int asp_wput(gref, m)
 
        case ASPIOC_GetLocEntity:
                if ((gbuf_cont(mioc) == 0) || (scb->atp_state == 0)) {
 
        case ASPIOC_GetLocEntity:
                if ((gbuf_cont(mioc) == 0) || (scb->atp_state == 0)) {

-                       asp_iocnak(gref, mioc, EPROTO);
+                       asp_iocnak(gref, mioc, EPROTOTYPE);

                        return 0;
                }
                *(at_inet_t *)gbuf_rptr(gbuf_cont(mioc)) = scb->loc_addr;
                        return 0;
                }
                *(at_inet_t *)gbuf_rptr(gbuf_cont(mioc)) = scb->loc_addr;


@@ -504,7 +490,7 @@ int asp_wput(gref, m)
 
        case ASPIOC_GetRemEntity:
                if ((gbuf_cont(mioc) == 0) || (scb->atp_state == 0)) {
 
        case ASPIOC_GetRemEntity:
                if ((gbuf_cont(mioc) == 0) || (scb->atp_state == 0)) {

-                       asp_iocnak(gref, mioc, EPROTO);
+                       asp_iocnak(gref, mioc, EPROTOTYPE);

                        return 0;
                }
                *(at_inet_t *)gbuf_rptr(gbuf_cont(mioc)) = scb->rem_addr;
                        return 0;
                }
                *(at_inet_t *)gbuf_rptr(gbuf_cont(mioc)) = scb->rem_addr;


@@ -512,7 +498,7 @@ int asp_wput(gref, m)
 
        case ASPIOC_GetSession:
                if ((mdata = gbuf_cont(mioc)) == 0) {
 
        case ASPIOC_GetSession:
                if ((mdata = gbuf_cont(mioc)) == 0) {

-                       asp_iocnak(gref, mioc, EPROTO);
+                       asp_iocnak(gref, mioc, EPROTOTYPE);

                        return 0;
                }
                addr = (at_inet_t *)gbuf_rptr(mdata);
                        return 0;
                }
                addr = (at_inet_t *)gbuf_rptr(mdata);


@@ -521,11 +507,11 @@ int asp_wput(gref, m)
                server_scb = asp_scbQ[addr->socket];
 /*### LD 10/28/97: changed to make sure we're not accessing a null server_scb */
                if (server_scb == 0) {
                server_scb = asp_scbQ[addr->socket];
 /*### LD 10/28/97: changed to make sure we're not accessing a null server_scb */
                if (server_scb == 0) {

-                       asp_iocnak(gref, mioc, EPROTO);
+                       asp_iocnak(gref, mioc, EPROTOTYPE);

                        return 0;
                }
                if (server_scb->sess_ioc == 0) {
                        return 0;
                }
                if (server_scb->sess_ioc == 0) {

-                       asp_iocnak(gref, mioc, EPROTO);
+                       asp_iocnak(gref, mioc, EPROTOTYPE);

                        return 0;
                }
 
                        return 0;
                }
 


@@ -547,7 +533,6 @@ int asp_wput(gref, m)
                if ((sock_num = (at_socket)atp_bind(gref, 0, &sockSav)) == 0) {
                        atp_close(gref, 0);
                        asp_dequeue_scb(scb);
                if ((sock_num = (at_socket)atp_bind(gref, 0, &sockSav)) == 0) {
                        atp_close(gref, 0);
                        asp_dequeue_scb(scb);

-                       ATDISABLE(s, aspall_lock);

                        sock_num = sockSav;
                        scb->loc_addr.socket = sock_num;
                        for (curr_scb = asp_scbQ[sock_num];
                        sock_num = sockSav;
                        scb->loc_addr.socket = sock_num;
                        for (curr_scb = asp_scbQ[sock_num];


@@ -555,14 +540,11 @@ int asp_wput(gref, m)
                        scb->prev_scb = curr_scb;
                        curr_scb->next_scb = scb;
                        scb->atp_state = curr_scb->atp_state;
                        scb->prev_scb = curr_scb;
                        curr_scb->next_scb = scb;
                        scb->atp_state = curr_scb->atp_state;

-                       ATENABLE(s, aspall_lock);

                } else {
                        asp_dequeue_scb(scb);
                } else {
                        asp_dequeue_scb(scb);

-                       ATDISABLE(s, aspall_lock);

                        scb->loc_addr.socket = sock_num;
                        asp_scbQ[sock_num] = scb;
                        scb->atp_state->dflag = scb->dflag;
                        scb->loc_addr.socket = sock_num;
                        asp_scbQ[sock_num] = scb;
                        scb->atp_state->dflag = scb->dflag;

-                       ATENABLE(s, aspall_lock);

                }
                gref->info = (void *)scb;
                asp_inpC[sock_num]++;
                }
                gref->info = (void *)scb;
                asp_inpC[sock_num]++;


@@ -603,7 +585,7 @@ int asp_wput(gref, m)
                scb->session_timer = open_cmd->SessionTimer;
                aw.func = ASPFUNC_OpenSess;
                aw.param1 = scb->loc_addr.socket;
                scb->session_timer = open_cmd->SessionTimer;
                aw.func = ASPFUNC_OpenSess;
                aw.param1 = scb->loc_addr.socket;

-               aw.param2 = ASP_Version;
+               aw.param2 = htons(ASP_Version);

                scb->ioc_wait = (unsigned char)(iocbp->ioc_cmd & 0xff);
                iocbp->ioc_cmd = AT_ATP_ISSUE_REQUEST_DEF;
                asp_send_req(gref, mioc, &open_cmd->SLSEntityIdentifier,
                scb->ioc_wait = (unsigned char)(iocbp->ioc_cmd & 0xff);
                iocbp->ioc_cmd = AT_ATP_ISSUE_REQUEST_DEF;
                asp_send_req(gref, mioc, &open_cmd->SLSEntityIdentifier,


@@ -777,15 +759,15 @@ asp_send_req(gref, mioc, dest, retry, awp, xo, state, bitmap)
 }
 
 /*
 }
 
 /*

- * send tickle routine - funnelled version
+ * send tickle routine - locked version

  */
 StaticProc void
  */
 StaticProc void

-asp_send_tickle_funnel(scb)
+asp_send_tickle_locked(scb)

        void *scb;
 {
        void *scb;
 {

-        thread_funnel_set(network_flock, TRUE);
+       atalk_lock();

        asp_send_tickle((asp_scb_t *)scb);
        asp_send_tickle((asp_scb_t *)scb);

-        thread_funnel_set(network_flock, FALSE);
+       atalk_unlock();

 }
 
 
 }
 
 


@@ -813,7 +795,7 @@ asp_send_tickle(scb)
                dPrintf(D_M_ASP, D_L_WARNING,
                ("asp_send_tickle: ENOBUFS 0, loc=%d, rem=%d\n",
                        scb->loc_addr.socket,scb->rem_addr.socket));
                dPrintf(D_M_ASP, D_L_WARNING,
                ("asp_send_tickle: ENOBUFS 0, loc=%d, rem=%d\n",
                        scb->loc_addr.socket,scb->rem_addr.socket));

-               timeout(asp_send_tickle_funnel, (void *)scb, 10);
+               timeout(asp_send_tickle_locked, (void *)scb, 10);

                return;
        }
        gbuf_wset(mioc,sizeof(ioc_t));
                return;
        }
        gbuf_wset(mioc,sizeof(ioc_t));


@@ -835,7 +817,7 @@ asp_send_tickle(scb)
                        ("asp_send_tickle: ENOBUFS 1, loc=%d, rem=%d\n",
                         scb->loc_addr.socket,scb->rem_addr.socket));
 
                        ("asp_send_tickle: ENOBUFS 1, loc=%d, rem=%d\n",
                         scb->loc_addr.socket,scb->rem_addr.socket));
 

-               timeout(asp_send_tickle_funnel, (void *)scb, 10);
+               timeout(asp_send_tickle_locked, (void *)scb, 10);

                return;
        }
 }
                return;
        }
 }


@@ -849,7 +831,6 @@ asp_accept(scb, sess_scb, m)
        asp_scb_t *sess_scb;
        gbuf_t *m;
 {
        asp_scb_t *sess_scb;
        gbuf_t *m;
 {

-       int s;

        gbuf_t *mdata;
        at_ddp_t *ddp;
        at_atp_t *atp;
        gbuf_t *mdata;
        at_ddp_t *ddp;
        at_atp_t *atp;


@@ -881,9 +862,7 @@ asp_accept(scb, sess_scb, m)
        awp->param1 = sess_scb->sess_id;
        awp->param2 = 0;
        gbuf_freeb(m);
        awp->param1 = sess_scb->sess_id;
        awp->param2 = 0;
        gbuf_freeb(m);

-       ATDISABLE(s, scb->lock);

        scb->sess_ioc = gbuf_next(mdata);
        scb->sess_ioc = gbuf_next(mdata);

-       ATENABLE(s, scb->lock);

        gbuf_next(mdata) = 0;
        asp_timout(asp_hangup, sess_scb, sess_scb->session_timer);
        atp_send_rsp(scb->gref, mdata, TRUE);
        gbuf_next(mdata) = 0;
        asp_timout(asp_hangup, sess_scb, sess_scb->session_timer);
        atp_send_rsp(scb->gref, mdata, TRUE);


@@ -896,14 +875,14 @@ asp_accept(scb, sess_scb, m)
 } /* asp_accept */
 
 /*
 } /* asp_accept */
 
 /*

- * timer routine - funneled version
+ * timer routine - locked version

  */
  */

-void asp_clock_funnel(arg)
+void asp_clock_locked(arg)

        void *arg;
 {
        void *arg;
 {

-        thread_funnel_set(network_flock, TRUE);
+       atalk_lock();

        asp_clock(arg);
        asp_clock(arg);

-        thread_funnel_set(network_flock, FALSE);
+       atalk_unlock();

 }
 
 /*
 }
 
 /*


@@ -912,11 +891,9 @@ void asp_clock_funnel(arg)
 void asp_clock(arg)
        void *arg;
 {
 void asp_clock(arg)
        void *arg;
 {

-       int s;

        asp_scb_t *scb;
        asp_scb_t *scb;

-       void (*tmo_func)();
-
-       ATDISABLE(s, asptmo_lock);
+       asp_tmo_func tmo_func;
+       

        if (scb_tmo_list)
                scb_tmo_list->tmo_delta--;
        while (((scb = scb_tmo_list) != 0) && (scb_tmo_list->tmo_delta == 0)) {
        if (scb_tmo_list)
                scb_tmo_list->tmo_delta--;
        while (((scb = scb_tmo_list) != 0) && (scb_tmo_list->tmo_delta == 0)) {


@@ -924,15 +901,12 @@ void asp_clock(arg)
                        scb_tmo_list->prev_tmo = 0;
                if ((tmo_func = scb->tmo_func) != 0) {
                        scb->tmo_func = 0;
                        scb_tmo_list->prev_tmo = 0;
                if ((tmo_func = scb->tmo_func) != 0) {
                        scb->tmo_func = 0;

-                       ATENABLE(s, asptmo_lock);

                        (*tmo_func)(scb);
                        (*tmo_func)(scb);

-                       ATDISABLE(s, asptmo_lock);

                }
        }
                }
        }

-       ATENABLE(s, asptmo_lock);

 
        if (++scb_tmo_cnt == 0) scb_tmo_cnt++;
 
        if (++scb_tmo_cnt == 0) scb_tmo_cnt++;

-       timeout(asp_clock_funnel, (void *)arg, (1<<SESS_TMO_RES)*TICKS_PER_SEC);
+       timeout(asp_clock_locked, (void *)arg, (1<<SESS_TMO_RES)*TICKS_PER_SEC);

         
 }
 
         
 }
 


@@ -944,7 +918,6 @@ asp_ack_reply(gref, mioc)
        register gref_t *gref;
        register gbuf_t *mioc;
 {
        register gref_t *gref;
        register gbuf_t *mioc;
 {

-       int s;

        int len, msize, nbds;
        register gbuf_t *mdata, *m, *mx;
        struct atpBDS *atpBDS;
        int len, msize, nbds;
        register gbuf_t *mdata, *m, *mx;
        struct atpBDS *atpBDS;


@@ -1084,7 +1057,7 @@ asp_ack_reply(gref, mioc)
                                 */
                                awp->func = 0;
                                awp->param1 = 0;
                                 */
                                awp->func = 0;
                                awp->param1 = 0;

-                               awp->param2 = (unsigned short)ASPERR_BadVersNum;
+                               awp->param2 = htons((unsigned short)ASPERR_BadVersNum);

                                dPrintf(D_M_ASP, D_L_INFO,
                                        ("             : version=%d\n",
                                        ASPERR_BadVersNum));
                                dPrintf(D_M_ASP, D_L_INFO,
                                        ("             : version=%d\n",
                                        ASPERR_BadVersNum));


@@ -1101,7 +1074,6 @@ asp_ack_reply(gref, mioc)
                        /*
                         * queue the connection request
                         */
                        /*
                         * queue the connection request
                         */

-                       ATDISABLE(s, scb->lock);

                        gbuf_next(mdata) = 0;
                        if ((m = scb->sess_ioc) == 0) {
                                scb->sess_ioc = mdata;
                        gbuf_next(mdata) = 0;
                        if ((m = scb->sess_ioc) == 0) {
                                scb->sess_ioc = mdata;


@@ -1114,7 +1086,6 @@ asp_ack_reply(gref, mioc)
                                        m = gbuf_next(m);
                                gbuf_next(m) = mdata;
                        }
                                        m = gbuf_next(m);
                                gbuf_next(m) = mdata;
                        }

-                       ATENABLE(s, scb->lock);

                        dPrintf(D_M_ASP, D_L_INFO,
                                ("             : QUEUE connect request\n"));
 
                        dPrintf(D_M_ASP, D_L_INFO,
                                ("             : QUEUE connect request\n"));
 


@@ -1123,11 +1094,11 @@ asp_ack_reply(gref, mioc)
                case ASPFUNC_Command:
                case ASPFUNC_Write:
                        if ( (scb->sess_id != awp->param1)
                case ASPFUNC_Command:
                case ASPFUNC_Write:
                        if ( (scb->sess_id != awp->param1)

-                            || (scb->rcv_seq_num != awp->param2)
+                            || (scb->rcv_seq_num != ntohs(awp->param2))

                             || BAD_REMADDR(rem_addr) ) {
                                char era[8], ra[8];
                             || BAD_REMADDR(rem_addr) ) {
                                char era[8], ra[8];

-                               sprintf(era,"%d.%d", scb->rem_addr.node,scb->rem_addr.socket);
-                               sprintf(ra,"%d.%d", rem_addr.node,rem_addr.socket);
+                               snprintf(era, sizeof(era), "%d.%d", scb->rem_addr.node,scb->rem_addr.socket);
+                               snprintf(ra, sizeof(ra), "%d.%d", rem_addr.node,rem_addr.socket);

                                dPrintf(D_M_ASP, D_L_WARNING,
                                        ("             : DROP, id=%d,esn=%d,sn=%d,erem=%s,rem=%s\n",
                                        scb->sess_id,scb->rcv_seq_num,awp->param2,era,ra));
                                dPrintf(D_M_ASP, D_L_WARNING,
                                        ("             : DROP, id=%d,esn=%d,sn=%d,erem=%s,rem=%s\n",
                                        scb->sess_id,scb->rcv_seq_num,awp->param2,era,ra));


@@ -1145,12 +1116,11 @@ asp_ack_reply(gref, mioc)
                        command_ind = (asp_command_ind_t *)gbuf_rptr(mioc);
                        command_ind->Primitive = (int)awp->func;
                        command_ind->ReqRefNum =
                        command_ind = (asp_command_ind_t *)gbuf_rptr(mioc);
                        command_ind->Primitive = (int)awp->func;
                        command_ind->ReqRefNum =

-                               *(unsigned short *)atp->tid;
+                               ntohs(*(unsigned short *)atp->tid);

                        command_ind->ReqType = awp->func;
 
                        mdata = gbuf_strip(mdata);
                        gbuf_cont(mioc) = mdata;
                        command_ind->ReqType = awp->func;
 
                        mdata = gbuf_strip(mdata);
                        gbuf_cont(mioc) = mdata;

-                       ATDISABLE(s, scb->lock);

                        if (scb->req_flag) {
                                if ((mx = scb->req_msgq) != 0) {
                                        while (gbuf_next(mx))
                        if (scb->req_flag) {
                                if ((mx = scb->req_msgq) != 0) {
                                        while (gbuf_next(mx))


@@ -1158,10 +1128,8 @@ asp_ack_reply(gref, mioc)
                                        gbuf_next(mx) = mioc;
                                } else
                                        scb->req_msgq = mioc;
                                        gbuf_next(mx) = mioc;
                                } else
                                        scb->req_msgq = mioc;

-                               ATENABLE(s, scb->lock);

                        } else {
                                scb->req_flag = 1;
                        } else {
                                scb->req_flag = 1;

-                               ATENABLE(s, scb->lock);

                                asp_putnext(scb->gref, mioc);
                        }
                        goto l_done;
                                asp_putnext(scb->gref, mioc);
                        }
                        goto l_done;


@@ -1178,7 +1146,7 @@ asp_ack_reply(gref, mioc)
                        command_ind = (asp_command_ind_t *)gbuf_rptr(mioc);
                        command_ind->Primitive = (int)awp->func;
                        command_ind->ReqRefNum =
                        command_ind = (asp_command_ind_t *)gbuf_rptr(mioc);
                        command_ind->Primitive = (int)awp->func;
                        command_ind->ReqRefNum =

-                               *(unsigned short *)atp->tid;
+                               ntohs(*(unsigned short *)atp->tid);

                        command_ind->ReqType = awp->func;
 
                        mdata = gbuf_strip(mdata);
                        command_ind->ReqType = awp->func;
 
                        mdata = gbuf_strip(mdata);


@@ -1247,12 +1215,10 @@ asp_ack_reply(gref, mioc)
                                scb->rem_addr.socket));
 
                        gbuf_next(mdata) = 0;
                                scb->rem_addr.socket));
 
                        gbuf_next(mdata) = 0;

-                       ATDISABLE(s, scb->lock);

                        if (scb->sess_ioc)
                                gbuf_freel(scb->sess_ioc);
                        scb->sess_ioc = mdata;
                        scb->state = ASPSTATE_Close;
                        if (scb->sess_ioc)
                                gbuf_freel(scb->sess_ioc);
                        scb->sess_ioc = mdata;
                        scb->state = ASPSTATE_Close;

-                       ATENABLE(s, scb->lock);

 
                        /*
                         * notify upstream of the CloseSess from peer
 
                        /*
                         * notify upstream of the CloseSess from peer


@@ -1271,7 +1237,7 @@ asp_ack_reply(gref, mioc)
                        command_ind = (asp_command_ind_t *)gbuf_rptr(mioc);
                        command_ind->Primitive = (int)awp->func;
                        command_ind->ReqRefNum =
                        command_ind = (asp_command_ind_t *)gbuf_rptr(mioc);
                        command_ind->Primitive = (int)awp->func;
                        command_ind->ReqRefNum =

-                               *(unsigned short *)atp->tid;
+                               ntohs(*(unsigned short *)atp->tid);

                        command_ind->ReqType = awp->func;
                        scb->attn_tid = *(unsigned short *)atp->tid;
                        scb->attn_flag = 1;
                        command_ind->ReqType = awp->func;
                        scb->attn_tid = *(unsigned short *)atp->tid;
                        scb->attn_flag = 1;


@@ -1317,12 +1283,10 @@ asp_ack_reply(gref, mioc)
                case ASPSTATE_Idle:
                        scb->rem_addr.node = 0;
                        gbuf_freem(mioc);
                case ASPSTATE_Idle:
                        scb->rem_addr.node = 0;
                        gbuf_freem(mioc);

-                       ATDISABLE(s, scb->lock);

                        if (scb->get_wait)
                                wakeup(&scb->event);
                        else
                                atalk_notify_sel(gref);
                        if (scb->get_wait)
                                wakeup(&scb->event);
                        else
                                atalk_notify_sel(gref);

-                       ATENABLE(s, scb->lock);

                        return;
 
                case ASPSTATE_WaitingForGetStatusRsp:
                        return;
 
                case ASPSTATE_WaitingForGetStatusRsp:


@@ -1391,7 +1355,7 @@ asp_ack_reply(gref, mioc)
                        atpBDS = (struct atpBDS *)gbuf_rptr(mx);
                        cmdreply_ind = (asp_cmdreply_ind_t *)gbuf_rptr(mioc);
                        cmdreply_ind->Primitive = ASPFUNC_CmdReply;
                        atpBDS = (struct atpBDS *)gbuf_rptr(mx);
                        cmdreply_ind = (asp_cmdreply_ind_t *)gbuf_rptr(mioc);
                        cmdreply_ind->Primitive = ASPFUNC_CmdReply;

-                       cmdreply_ind->CmdResult = *(int *)atpBDS->bdsUserData;
+                       cmdreply_ind->CmdResult = ntohl(*(int *)atpBDS->bdsUserData);

                        gbuf_wset(mioc,sizeof(asp_cmdreply_ind_t));
                        gbuf_freeb(mx);
                        asp_putnext(scb->gref, mioc);
                        gbuf_wset(mioc,sizeof(asp_cmdreply_ind_t));
                        gbuf_freeb(mx);
                        asp_putnext(scb->gref, mioc);


@@ -1523,7 +1487,7 @@ asp_nak_reply(gref, mioc)
 
                        /* last remaining use of MSG_ERROR */
                        gbuf_set_type(mioc, MSG_ERROR);
 
                        /* last remaining use of MSG_ERROR */
                        gbuf_set_type(mioc, MSG_ERROR);

-                       *gbuf_rptr(mioc) = (u_char)EPROTO;
+                       *gbuf_rptr(mioc) = (u_char)EPROTOTYPE;

                        gbuf_wset(mioc, 1);
                        if (gbuf_cont(mioc)) {
                                gbuf_freem(gbuf_cont(mioc));
                        gbuf_wset(mioc, 1);
                        if (gbuf_cont(mioc)) {
                                gbuf_freem(gbuf_cont(mioc));


@@ -1587,9 +1551,7 @@ StaticProc void
 asp_dequeue_scb(scb)
        asp_scb_t *scb;
 {
 asp_dequeue_scb(scb)
        asp_scb_t *scb;
 {

-       int s;

 
 

-       ATDISABLE(s, aspall_lock);

        if (scb == scb_used_list) {
                if ((scb_used_list = scb->next_scb) != 0)
                        scb->next_scb->prev_scb = 0;
        if (scb == scb_used_list) {
                if ((scb_used_list = scb->next_scb) != 0)
                        scb->next_scb->prev_scb = 0;


@@ -1597,7 +1559,6 @@ asp_dequeue_scb(scb)
                if ((scb->prev_scb->next_scb = scb->next_scb) != 0)
                        scb->next_scb->prev_scb = scb->prev_scb;
        }
                if ((scb->prev_scb->next_scb = scb->next_scb) != 0)
                        scb->next_scb->prev_scb = scb->prev_scb;
        }

-       ATENABLE(s, aspall_lock);

 
        scb->next_scb = 0;
        scb->prev_scb = 0;
 
        scb->next_scb = 0;
        scb->prev_scb = 0;


@@ -1611,11 +1572,9 @@ asp_find_scb(sock_num, rem_addr)
        unsigned char sock_num;
        at_inet_t *rem_addr;
 {
        unsigned char sock_num;
        at_inet_t *rem_addr;
 {

-       int s;

        asp_scb_t *scb;
        asp_scb_t *alt_scb = 0;
 
        asp_scb_t *scb;
        asp_scb_t *alt_scb = 0;
 

-       ATDISABLE(s, aspall_lock);

        for (scb = asp_scbQ[sock_num]; scb; scb = scb->next_scb) {
                if ((scb->rem_addr.net == rem_addr->net)
                        && (scb->rem_addr.node == rem_addr->node)) {
        for (scb = asp_scbQ[sock_num]; scb; scb = scb->next_scb) {
                if ((scb->rem_addr.net == rem_addr->net)
                        && (scb->rem_addr.node == rem_addr->node)) {


@@ -1635,7 +1594,6 @@ asp_find_scb(sock_num, rem_addr)
                        rem_addr->node,
                        rem_addr->socket));
        }
                        rem_addr->node,
                        rem_addr->socket));
        }

-       ATENABLE(s, aspall_lock);

 
        return scb;
 }
 
        return scb;
 }


@@ -1645,11 +1603,10 @@ asp_find_scb(sock_num, rem_addr)
  */
 StaticProc void
 asp_timout(func, scb, seconds)
  */
 StaticProc void
 asp_timout(func, scb, seconds)

-       void (*func)();
+       asp_tmo_func func;

        register asp_scb_t *scb;
        int seconds;
 {
        register asp_scb_t *scb;
        int seconds;
 {

-       int s;

        unsigned char sum;
        register asp_scb_t *curr_scb, *prev_scb;
 
        unsigned char sum;
        register asp_scb_t *curr_scb, *prev_scb;
 


@@ -1660,11 +1617,9 @@ asp_timout(func, scb, seconds)
        scb->tmo_delta = (seconds>>SESS_TMO_RES);
        scb->tmo_cnt = scb_tmo_cnt;
 
        scb->tmo_delta = (seconds>>SESS_TMO_RES);
        scb->tmo_cnt = scb_tmo_cnt;
 

-       ATDISABLE(s, asptmo_lock);

        if (scb_tmo_list == 0) {
                scb->next_tmo = scb->prev_tmo = 0;
                scb_tmo_list = scb;
        if (scb_tmo_list == 0) {
                scb->next_tmo = scb->prev_tmo = 0;
                scb_tmo_list = scb;

-               ATENABLE(s, asptmo_lock);

                return;
        }
 
                return;
        }
 


@@ -1698,23 +1653,20 @@ asp_timout(func, scb, seconds)
                scb_tmo_list->prev_tmo = scb;
                scb_tmo_list = scb;
        }
                scb_tmo_list->prev_tmo = scb;
                scb_tmo_list = scb;
        }

-       ATENABLE(s, asptmo_lock);

 }
 
 /*
  * untimout routine
  */
 StaticProc void
 }
 
 /*
  * untimout routine
  */
 StaticProc void

-asp_untimout(func, scb)
-       void (*func)();
-       register asp_scb_t *scb;
+asp_untimout(
+       __unused asp_tmo_func tmo_func,
+       register asp_scb_t *scb)

 {
 {

-       int s;

 
        if ((scb->tmo_cnt == scb_tmo_cnt) || (scb->tmo_func == 0))
                return;
 
 
        if ((scb->tmo_cnt == scb_tmo_cnt) || (scb->tmo_func == 0))
                return;
 

-       ATDISABLE(s, asptmo_lock);

        if (scb_tmo_list == scb) {
                if ((scb_tmo_list = scb->next_tmo) != 0) {
                        scb_tmo_list->prev_tmo = 0;
        if (scb_tmo_list == scb) {
                if ((scb_tmo_list = scb->next_tmo) != 0) {
                        scb_tmo_list->prev_tmo = 0;


@@ -1728,7 +1680,6 @@ asp_untimout(func, scb)
                scb->prev_tmo = 0;
        }
        scb->tmo_func = 0;
                scb->prev_tmo = 0;
        }
        scb->tmo_func = 0;

-       ATENABLE(s, asptmo_lock);

 }
 
 /*
 }
 
 /*


@@ -1738,12 +1689,9 @@ StaticProc void
 asp_hangup(scb)
        asp_scb_t *scb;
 {
 asp_hangup(scb)
        asp_scb_t *scb;
 {

-       int s;
-

        /*
         * set the state to Close
         */
        /*
         * set the state to Close
         */

-       ATDISABLE(s, scb->lock);

        scb->state = ASPSTATE_Close;
        if (scb->tickle_tid) {
                atp_cancel_req(scb->gref, (unsigned int)scb->tickle_tid);
        scb->state = ASPSTATE_Close;
        if (scb->tickle_tid) {
                atp_cancel_req(scb->gref, (unsigned int)scb->tickle_tid);


@@ -1754,15 +1702,11 @@ asp_hangup(scb)
         * notify upstream of the hangup
         */
        if (scb->rem_addr.node) {
         * notify upstream of the hangup
         */
        if (scb->rem_addr.node) {

-               if (scb->get_wait) {
+               if (scb->get_wait)

                        wakeup(&scb->event);
                        wakeup(&scb->event);

-                       ATENABLE(s, scb->lock);
-               } else {
-                       ATENABLE(s, scb->lock);
+               else

                        atalk_notify_sel(scb->gref);
                        atalk_notify_sel(scb->gref);

-               }
-       } else
-               ATENABLE(s, scb->lock);
+       }

 }
 
 StaticProc void
 }
 
 StaticProc void


@@ -1805,17 +1749,13 @@ asp_iocnak(gref, mioc, err)
 StaticProc asp_scb_t *
 asp_scb_alloc()
 {
 StaticProc asp_scb_t *
 asp_scb_alloc()
 {

-       int s, i;
+       int i;

        gbuf_t *m;
        asp_scb_t *scb, *scb_array;
 
        gbuf_t *m;
        asp_scb_t *scb, *scb_array;
 

-       ATDISABLE(s, aspall_lock);

        if (scb_free_list == 0) {
                if ((m = gbuf_alloc(SCBS_PER_BLK*sizeof(asp_scb_t), PRI_MED)) == 0)
        if (scb_free_list == 0) {
                if ((m = gbuf_alloc(SCBS_PER_BLK*sizeof(asp_scb_t), PRI_MED)) == 0)

-               {
-                       ATENABLE(s, aspall_lock);

                        return (asp_scb_t *)0;
                        return (asp_scb_t *)0;

-               }

                bzero((char *)gbuf_rptr(m), SCBS_PER_BLK*sizeof(asp_scb_t));
                gbuf_cont(m) = scb_resource_m;
                scb_resource_m = m;
                bzero((char *)gbuf_rptr(m), SCBS_PER_BLK*sizeof(asp_scb_t));
                gbuf_cont(m) = scb_resource_m;
                scb_resource_m = m;


@@ -1828,9 +1768,6 @@ asp_scb_alloc()
 
        scb = scb_free_list;
        scb_free_list = scb->next_scb;
 
        scb = scb_free_list;
        scb_free_list = scb->next_scb;

-       ATENABLE(s, aspall_lock);
-       ATLOCKINIT(scb->lock);
-       ATLOCKINIT(scb->delay_lock);

        ATEVENTINIT(scb->event);
        ATEVENTINIT(scb->delay_event);
 
        ATEVENTINIT(scb->event);
        ATEVENTINIT(scb->delay_event);
 


@@ -1844,13 +1781,10 @@ StaticProc void
 asp_scb_free(scb)
        asp_scb_t *scb;
 {
 asp_scb_free(scb)
        asp_scb_t *scb;
 {

-       int s;

 
        bzero((char *)scb, sizeof(asp_scb_t));
 
        bzero((char *)scb, sizeof(asp_scb_t));

-       ATDISABLE(s, aspall_lock);

        scb->next_scb = scb_free_list;
        scb_free_list = scb;
        scb->next_scb = scb_free_list;
        scb_free_list = scb;

-       ATENABLE(s, aspall_lock);

 }
 
 /*
 }
 
 /*


@@ -1861,7 +1795,6 @@ asp_putnext(gref, mproto)
        gref_t *gref;
        gbuf_t *mproto;
 {
        gref_t *gref;
        gbuf_t *mproto;
 {

-       int s;

        gbuf_t *m;
        asp_scb_t *scb;
 
        gbuf_t *m;
        asp_scb_t *scb;
 


@@ -1870,7 +1803,6 @@ asp_putnext(gref, mproto)
        /*
         * queue the message.
         */
        /*
         * queue the message.
         */

-       ATDISABLE(s, scb->lock);

        gbuf_next(mproto) = 0;
        if ((m = scb->sess_ioc) == 0)
                scb->sess_ioc = mproto;
        gbuf_next(mproto) = 0;
        if ((m = scb->sess_ioc) == 0)
                scb->sess_ioc = mproto;


@@ -1883,14 +1815,11 @@ asp_putnext(gref, mproto)
        if (scb->rcv_cnt >= MAX_RCV_CNT)
                scb->snd_stop = 1;
 
        if (scb->rcv_cnt >= MAX_RCV_CNT)
                scb->snd_stop = 1;
 

-       if (scb->get_wait) {
+       if (scb->get_wait)

                wakeup(&scb->event);
                wakeup(&scb->event);

-               ATENABLE(s, scb->lock);
-       } else if (mproto == scb->sess_ioc) {
-               ATENABLE(s, scb->lock);
+       else if (mproto == scb->sess_ioc)

                atalk_notify_sel(gref);
                atalk_notify_sel(gref);

-       } else
-               ATENABLE(s, scb->lock);
+

 } /* asp_putnext */
 
 /*
 } /* asp_putnext */
 
 /*


@@ -1912,10 +1841,10 @@ asp_putnext(gref, mproto)
     2)  datptr->len = size of data
 */
 
     2)  datptr->len = size of data
 */
 

-int ASPputmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t *mreq, int flags, int *errp)
+int ASPputmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t *mreq, __unused int flags, int *errp)

 {
 {

-    int s, i, err, len, offset, remain, size, copy_len;
-    gbuf_t *mioc, *mdata, *mx, *m0;
+    int i, err, len, offset, remain, size, copy_len;
+    gbuf_t *mioc, *mdata, *mx;

     ioc_t *iocbp;
     strbuf_t ctlbuf;
     strbuf_t datbuf;
     ioc_t *iocbp;
     strbuf_t ctlbuf;
     strbuf_t datbuf;


@@ -1956,12 +1885,25 @@ int ASPputmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t *mreq, in
         bcopy (datptr, &datbuf, sizeof (strbuf_t));
      } else {
         /* being called from user space */
         bcopy (datptr, &datbuf, sizeof (strbuf_t));
      } else {
         /* being called from user space */

-        if ((err = copyin((caddr_t)ctlptr, (caddr_t)&ctlbuf, sizeof(ctlbuf))) != 0)
+        if ((err = copyin(CAST_USER_ADDR_T(ctlptr), (caddr_t)&ctlbuf, sizeof(ctlbuf))) != 0)

             goto l_err;
             goto l_err;

-        if ((err = copyin((caddr_t)datptr, (caddr_t)&datbuf, sizeof(datbuf))) != 0)
+        if ((err = copyin(CAST_USER_ADDR_T(datptr), (caddr_t)&datbuf, sizeof(datbuf))) != 0)

             goto l_err;
      }
 
             goto l_err;
      }
 

+     /* Radar 5398072: check for bogus length
+      *               Max ASP data is 8 ATP packets
+      */
+
+     if ((ctlbuf.len < 0) || (ctlbuf.len > (ATP_DATA_SIZE * 8))) {
+            err = EINVAL;
+            goto l_err;
+     }
+     if ((datbuf.len < 0) || (datbuf.len > (ATP_DATA_SIZE * 8))) {
+            err = EINVAL;
+            goto l_err;
+     }
+

     /*
      * allocate buffer and copy in the control content
      */
     /*
      * allocate buffer and copy in the control content
      */


@@ -1978,7 +1920,7 @@ int ASPputmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t *mreq, in
         bcopy (ctlbuf.buf, gbuf_rptr(mioc), ctlbuf.len);
     } else {
         /* being called from user space */
         bcopy (ctlbuf.buf, gbuf_rptr(mioc), ctlbuf.len);
     } else {
         /* being called from user space */

-        if ((err = copyin((caddr_t)ctlbuf.buf, (caddr_t)gbuf_rptr(mioc), ctlbuf.len)) != 0) {
+        if ((err = copyin(CAST_USER_ADDR_T(ctlbuf.buf), (caddr_t)gbuf_rptr(mioc), ctlbuf.len)) != 0) {

             gbuf_freem(mioc);
             goto l_err;
         }
             gbuf_freem(mioc);
             goto l_err;
         }


@@ -2031,7 +1973,7 @@ int ASPputmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t *mreq, in
                remain -= copy_len;
                if (mreq != NULL)
                        bcopy (dataptr, (gbuf_rptr(mdata) + offset), copy_len);
                remain -= copy_len;
                if (mreq != NULL)
                        bcopy (dataptr, (gbuf_rptr(mdata) + offset), copy_len);

-               else if ((err = copyin(dataptr, (caddr_t)(gbuf_rptr(mdata) + offset), copy_len)) != 0) {
+               else if ((err = copyin(CAST_USER_ADDR_T(dataptr), (caddr_t)(gbuf_rptr(mdata) + offset), copy_len)) != 0) {

                        gbuf_freem(mioc);
                        goto l_err;
                }
                        gbuf_freem(mioc);
                        goto l_err;
                }


@@ -2070,7 +2012,7 @@ int ASPputmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t *mreq, in
         /*
          * build the command/write/write_continue request
          */
         /*
          * build the command/write/write_continue request
          */

-        wptr = gbuf_rptr(mdata);
+        wptr = (unsigned char *)gbuf_rptr(mdata);

         atpBDS = (struct atpBDS *)wptr;
         wptr += atpBDSsize;
         for (i=0; i < ATP_TRESP_MAX; i++) {
         atpBDS = (struct atpBDS *)wptr;
         wptr += atpBDSsize;
         for (i=0; i < ATP_TRESP_MAX; i++) {


@@ -2098,7 +2040,7 @@ int ASPputmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t *mreq, in
         awp = (asp_word_t *)atp->user_bytes;
         awp->func = (unsigned char)Primitive;
         awp->param1 = scb->sess_id;
         awp = (asp_word_t *)atp->user_bytes;
         awp->func = (unsigned char)Primitive;
         awp->param1 = scb->sess_id;

-        awp->param2 = scb->snd_seq_num;
+        awp->param2 = htons(scb->snd_seq_num);

         iocbp->ioc_private = (void *)scb;
         iocbp->ioc_count = gbuf_len(mdata);
         iocbp->ioc_rval = 0;
         iocbp->ioc_private = (void *)scb;
         iocbp->ioc_count = gbuf_len(mdata);
         iocbp->ioc_rval = 0;


@@ -2107,7 +2049,6 @@ int ASPputmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t *mreq, in
         /*
          * send the command/write/write_continue/attention request
          */
         /*
          * send the command/write/write_continue/attention request
          */

-        ATDISABLE(s, scb->lock);

         switch (awp->func) {
         case ASPFUNC_Command:
             scb->state = ASPSTATE_WaitingForCommandRsp;
         switch (awp->func) {
         case ASPFUNC_Command:
             scb->state = ASPSTATE_WaitingForCommandRsp;


@@ -2117,7 +2058,7 @@ int ASPputmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t *mreq, in
             break;
         case ASPFUNC_WriteContinue:
             scb->state = ASPSTATE_WaitingForWriteContinueRsp;
             break;
         case ASPFUNC_WriteContinue:
             scb->state = ASPSTATE_WaitingForWriteContinueRsp;

-            awp->param2 = scb->wrt_seq_num;
+            awp->param2 = htons(scb->wrt_seq_num);

             break;
         case ASPFUNC_Attention:
             scb->state = ASPSTATE_WaitingForCommandRsp;
             break;
         case ASPFUNC_Attention:
             scb->state = ASPSTATE_WaitingForCommandRsp;


@@ -2125,10 +2066,9 @@ int ASPputmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t *mreq, in
             atp->xo_relt = 0;
             atp->bitmap = 0x01;
             gbuf_wdec(mdata,2);
             atp->xo_relt = 0;
             atp->bitmap = 0x01;
             gbuf_wdec(mdata,2);

-            awp->param2 = *(unsigned short *)gbuf_wptr(mdata);
+            awp->param2 = htons(*(unsigned short *)gbuf_wptr(mdata));

             break;
         }
             break;
         }

-        ATENABLE(s, scb->lock);

         dPrintf(D_M_ASP,D_L_INFO,
             ("ASPputmsg: %s, loc=%d, rem=%x.%x.%d\n",
              (awp->func == ASPFUNC_Command ? "CommandReq" :
         dPrintf(D_M_ASP,D_L_INFO,
             ("ASPputmsg: %s, loc=%d, rem=%x.%x.%d\n",
              (awp->func == ASPFUNC_Command ? "CommandReq" :


@@ -2141,17 +2081,14 @@ int ASPputmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t *mreq, in
 
     case ASPFUNC_CmdReply:
 
 
     case ASPFUNC_CmdReply:
 

-        ATDISABLE(s, scb->lock);

         if (scb->req_msgq) {
             mx = scb->req_msgq;
             scb->req_msgq = gbuf_next(mx);
             gbuf_next(mx) = 0;
         if (scb->req_msgq) {
             mx = scb->req_msgq;
             scb->req_msgq = gbuf_next(mx);
             gbuf_next(mx) = 0;

-            ATENABLE(s, scb->lock);

             asp_putnext(scb->gref, mx);
             asp_putnext(scb->gref, mx);

-        } else {
+        } else

             scb->req_flag = 0;
             scb->req_flag = 0;

-            ATENABLE(s, scb->lock);
-        }
+

         result = primitives->CmdReplyReq.CmdResult;
         tid = primitives->CmdReplyReq.ReqRefNum;
 
         result = primitives->CmdReplyReq.CmdResult;
         tid = primitives->CmdReplyReq.ReqRefNum;
 


@@ -2169,7 +2106,7 @@ int ASPputmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t *mreq, in
         ddp->dst_socket = scb->reply_socket;
         ddp->type = DDP_ATP;
         UAS_ASSIGN(ddp->checksum, 0);
         ddp->dst_socket = scb->reply_socket;
         ddp->type = DDP_ATP;
         UAS_ASSIGN(ddp->checksum, 0);

-        UAS_ASSIGN(atp->tid, tid);
+        UAS_ASSIGN(atp->tid, htons(tid));

         if (scb->attn_flag && (tid == scb->attn_tid)) {
            scb->attn_flag = 0;
             atp->xo = 0;
         if (scb->attn_flag && (tid == scb->attn_tid)) {
            scb->attn_flag = 0;
             atp->xo = 0;


@@ -2214,9 +2151,9 @@ l_err:
 
 
 /* bms:  make this callable from kernel.  reply date is passed back as a mbuf chain in *mreply  */
 
 
 /* bms:  make this callable from kernel.  reply date is passed back as a mbuf chain in *mreply  */

-int ASPgetmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t **mreply, int *flags, int *errp)
+int ASPgetmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t **mreply, __unused int *flags, int *errp)

 {
 {

-    int err, s, len, sum, rval;
+    int err, len, sum, rval;

     gbuf_t *mproto, *mdata;
     strbuf_t ctlbuf;
     strbuf_t datbuf;
     gbuf_t *mproto, *mdata;
     strbuf_t ctlbuf;
     strbuf_t datbuf;


@@ -2232,39 +2169,32 @@ int ASPgetmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t **mreply,
                return -1;
        }
 
                return -1;
        }
 

-    ATDISABLE(s, scb->lock);
-    if (scb->state == ASPSTATE_Close) {
-        ATENABLE(s, scb->lock);
+    if (scb->state == ASPSTATE_Close)

         return 0;
         return 0;

-    }

 
     /*
      * get receive data
      */
     while ((mproto = scb->sess_ioc) == 0) {
         scb->get_wait = 1;
 
     /*
      * get receive data
      */
     while ((mproto = scb->sess_ioc) == 0) {
         scb->get_wait = 1;

-        err = tsleep(&scb->event, PSOCK | PCATCH, "aspgetmsg", 0);
+          lck_mtx_assert(atalk_mutex, LCK_MTX_ASSERT_OWNED);
+        err = msleep(&scb->event, atalk_mutex, PSOCK | PCATCH, "aspgetmsg", 0);

         if (err != 0) {
             scb->get_wait = 0;
         if (err != 0) {
             scb->get_wait = 0;

-            ATENABLE(s, scb->lock);

             *errp = err;
             return -1;
         }
         if (scb->state == ASPSTATE_Close) {
             scb->get_wait = 0;
             *errp = err;
             return -1;
         }
         if (scb->state == ASPSTATE_Close) {
             scb->get_wait = 0;

-            ATENABLE(s, scb->lock);

             return 0;
         }
     }
     get_wait = scb->get_wait;
     scb->get_wait = 0;
             return 0;
         }
     }
     get_wait = scb->get_wait;
     scb->get_wait = 0;

-    if ((ctlptr == 0) && (datptr == 0)) {
-        ATENABLE(s, scb->lock);
+    if ((ctlptr == 0) && (datptr == 0))

         return 0;
         return 0;

-    }

     scb->sess_ioc = gbuf_next(mproto);
     mdata = gbuf_cont(mproto);
     scb->sess_ioc = gbuf_next(mproto);
     mdata = gbuf_cont(mproto);

-    ATENABLE(s, scb->lock);

 
     /* last remaining use of MSG_ERROR */
     if (gbuf_type(mproto) == MSG_ERROR) {
 
     /* last remaining use of MSG_ERROR */
     if (gbuf_type(mproto) == MSG_ERROR) {


@@ -2281,18 +2211,16 @@ int ASPgetmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t **mreply,
         bcopy (datptr, &datbuf, sizeof(datbuf));
     } else {
         /* called from user space */
         bcopy (datptr, &datbuf, sizeof(datbuf));
     } else {
         /* called from user space */

-        if ((err = copyin((caddr_t)ctlptr,
+        if ((err = copyin(CAST_USER_ADDR_T(ctlptr),

                 (caddr_t)&ctlbuf, sizeof(ctlbuf))) != 0)
             goto l_err;
                 (caddr_t)&ctlbuf, sizeof(ctlbuf))) != 0)
             goto l_err;

-        if ((err = copyin((caddr_t)datptr,
+        if ((err = copyin(CAST_USER_ADDR_T(datptr),

                 (caddr_t)&datbuf, sizeof(datbuf))) != 0)
             goto l_err;
     }
     if ((datbuf.maxlen < 0) || (datbuf.maxlen < gbuf_msgsize(mdata))) {
                 (caddr_t)&datbuf, sizeof(datbuf))) != 0)
             goto l_err;
     }
     if ((datbuf.maxlen < 0) || (datbuf.maxlen < gbuf_msgsize(mdata))) {

-        ATDISABLE(s, scb->lock);

         gbuf_next(mproto) = scb->sess_ioc;
         scb->sess_ioc = mproto;
         gbuf_next(mproto) = scb->sess_ioc;
         scb->sess_ioc = mproto;

-        ATENABLE(s, scb->lock);

         return MOREDATA;
     }
 
         return MOREDATA;
     }
 


@@ -2302,13 +2230,9 @@ int ASPgetmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t **mreply,
          * we're not supposed to dequeue messages in the Streams 
          * head's read queue this way; but there is no better way.
          */
          * we're not supposed to dequeue messages in the Streams 
          * head's read queue this way; but there is no better way.
          */

-        ATDISABLE(s, scb->lock);
-        if (scb->sess_ioc == 0) {
-            ATENABLE(s, scb->lock);
-        } else {
-            ATENABLE(s, scb->lock);
+        if (scb->sess_ioc != 0)

             atalk_notify_sel(gref); 
             atalk_notify_sel(gref); 

-        }
+        

     }
 
     /*
     }
 
     /*


@@ -2323,10 +2247,10 @@ int ASPgetmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t **mreply,
     } else {
         /* called from user space */
         if ((err = copyout((caddr_t)gbuf_rptr(mproto),
     } else {
         /* called from user space */
         if ((err = copyout((caddr_t)gbuf_rptr(mproto),

-                (caddr_t)ctlbuf.buf, ctlbuf.len)) != 0)
+                CAST_USER_ADDR_T(ctlbuf.buf), ctlbuf.len)) != 0)

             goto l_err;
         if ((err = copyout((caddr_t)&ctlbuf,
             goto l_err;
         if ((err = copyout((caddr_t)&ctlbuf,

-                (caddr_t)ctlptr, sizeof(ctlbuf))) != 0)
+                CAST_USER_ADDR_T(ctlptr), sizeof(ctlbuf))) != 0)

             goto l_err;
     }
 
             goto l_err;
     }
 


@@ -2344,7 +2268,7 @@ int ASPgetmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t **mreply,
             
             if (mreply == NULL) {
                 /* called from user space */
             
             if (mreply == NULL) {
                 /* called from user space */

-                if ((err = copyout((caddr_t)gbuf_rptr(mdata), (caddr_t)&datbuf.buf[sum], len)) != 0)
+                if ((err = copyout((caddr_t)gbuf_rptr(mdata), CAST_USER_ADDR_T(&datbuf.buf[sum]), len)) != 0)

                     goto l_err;
             }
             sum += len;
                     goto l_err;
             }
             sum += len;


@@ -2356,7 +2280,7 @@ int ASPgetmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t **mreply,
         bcopy (&datbuf, datptr, sizeof(datbuf));
     } else {
         /* called from user space */
         bcopy (&datbuf, datptr, sizeof(datbuf));
     } else {
         /* called from user space */

-        if ((err = copyout((caddr_t)&datbuf, (caddr_t)datptr, sizeof(datbuf))) != 0)
+        if ((err = copyout((caddr_t)&datbuf, CAST_USER_ADDR_T(datptr), sizeof(datbuf))) != 0)

             goto l_err;
     }
     
             goto l_err;
     }
     


@@ -2373,21 +2297,17 @@ int ASPgetmsg(gref_t *gref, strbuf_t *ctlptr, strbuf_t *datptr, gbuf_t **mreply,
         gbuf_freem(mproto);
     }
 
         gbuf_freem(mproto);
     }
 

-    ATDISABLE(s, scb->lock);

     if (scb->sess_ioc)
         scb->rcv_cnt--;
     else {
         scb->rcv_cnt = 0;
         scb->snd_stop = 0;
     }
     if (scb->sess_ioc)
         scb->rcv_cnt--;
     else {
         scb->rcv_cnt = 0;
         scb->snd_stop = 0;
     }

-    ATENABLE(s, scb->lock);

     return rval;
 
 l_err:
     return rval;
 
 l_err:

-    ATDISABLE(s, scb->lock);

     gbuf_next(mproto) = scb->sess_ioc;
     scb->sess_ioc = mproto;
     gbuf_next(mproto) = scb->sess_ioc;
     scb->sess_ioc = mproto;

-    ATENABLE(s, scb->lock);

     *errp = err;
     return -1;
 }
     *errp = err;
     return -1;
 }