xnu-1228.15.4.tar.gz

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

diff --git a/bsd/netat/atp_read.c b/bsd/netat/atp_read.c
index 823a8475c0b27745525da9d8d4cf9f97baabfea2..940a58ae3784c49c9ff7ffc6692b92e429af7d4e 100644 (file)
--- a/bsd/netat/atp_read.c
+++ b/bsd/netat/atp_read.c
@@ -47,17 +47,22 @@
 #include <sys/malloc.h>
 #include <sys/socket.h>
 
 #include <sys/malloc.h>
 #include <sys/socket.h>
 

+#include <net/if.h>
+

 #include <netat/sysglue.h>
 #include <netat/appletalk.h>
 #include <netat/ddp.h>
 #include <netat/at_pcb.h>
 #include <netat/sysglue.h>
 #include <netat/appletalk.h>
 #include <netat/ddp.h>
 #include <netat/at_pcb.h>

+#include <netat/at_var.h>

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

+#include <netat/asp.h>

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

-static void atp_trans_complete();
-void atp_x_done();
+__private_extern__ int atp_resp_seqno2big = 0;
+
+static void atp_trans_complete(struct atp_trans *);

 void atp_x_done_locked(void *);
 void atp_x_done_locked(void *);

-extern void atp_req_timeout();
+void atp_treq_event(void *);

 
 /*
  *     Decide what to do about received messages
 
 /*
  *     Decide what to do about received messages


@@ -100,9 +105,9 @@ gbuf_t   *m;
 {
        register at_atp_t *athp;
        register struct atp_state *atp;
 {
        register at_atp_t *athp;
        register struct atp_state *atp;

-       register int s, s_gen;

        gbuf_t *m_asp = NULL;
        struct timeval timenow;
        gbuf_t *m_asp = NULL;
        struct timeval timenow;

+       u_short         temp_net;

 
        atp = (struct atp_state *)gref->info;   
        if (atp->dflag)
 
        atp = (struct atp_state *)gref->info;   
        if (atp->dflag)


@@ -136,16 +141,15 @@ gbuf_t   *m;
            case ATP_CMD_TRESP:
            {   
                register struct atp_trans *trp;
            case ATP_CMD_TRESP:
            {   
                register struct atp_trans *trp;

-               register int    seqno;
-               register at_ddp_t       *ddp;
+               register unsigned int    seqno;
+               register at_ddp_t       *ddp;

 
                /*
                 * we just got a response, find the trans record
                 */
 
 
                /*
                 * we just got a response, find the trans record
                 */
 

-               ATDISABLE(s, atp->atp_lock);

                for (trp = atp->atp_trans_wait.head; trp; trp = trp->tr_list.next) {
                for (trp = atp->atp_trans_wait.head; trp; trp = trp->tr_list.next) {

-                   if (trp->tr_tid == UAS_VALUE(athp->tid))
+                   if (trp->tr_tid == UAS_VALUE_NTOH(athp->tid))

                        break;
                }
 
                        break;
                }
 


@@ -153,13 +157,22 @@ gbuf_t   *m;
                 *      If we can't find one then ignore the message
                 */
                seqno = athp->bitmap;
                 *      If we can't find one then ignore the message
                 */
                seqno = athp->bitmap;

+               if (seqno > 7) {
+                       atp_resp_seqno2big++;
+                       ddp = AT_DDP_HDR(m);
+                       dPrintf(D_M_ATP_LOW, (D_L_INPUT|D_L_ERROR),
+                               ("atp_rput: dropping TRESP seqno too big, tid=%d,loc=%d,rem=%d.%d,seqno=%u\n",
+                                UAS_VALUE_NTOH(athp->tid),
+                                ddp->dst_socket, ddp->src_node, ddp->src_socket, seqno));
+                       gbuf_freem(m);
+                       return;
+               }

                if (trp == NULL) {
                if (trp == NULL) {

-               ATENABLE(s, atp->atp_lock);

                ddp = AT_DDP_HDR(m);
                    dPrintf(D_M_ATP_LOW, (D_L_INPUT|D_L_ERROR),
                ddp = AT_DDP_HDR(m);
                    dPrintf(D_M_ATP_LOW, (D_L_INPUT|D_L_ERROR),

-               ("atp_rput: dropping TRESP, no trp,tid=%d,loc=%d,rem=%d.%d,seqno=%d\n",
-                           UAS_VALUE(athp->tid),
-                           ddp->dst_socket,ddp->src_node,ddp->src_socket,seqno));
+               ("atp_rput: dropping TRESP, no trp,tid=%d,loc=%d,rem=%d.%d,seqno=%u\n",
+                           UAS_VALUE_NTOH(athp->tid),
+                           ddp->dst_socket, ddp->src_node, ddp->src_socket, seqno));

                    gbuf_freem(m);
                    return;
                }
                    gbuf_freem(m);
                    return;
                }


@@ -168,11 +181,10 @@ gbuf_t   *m;
                 * If no longer valid, drop it
                 */
                if (trp->tr_state == TRANS_FAILED) {
                 * If no longer valid, drop it
                 */
                if (trp->tr_state == TRANS_FAILED) {

-               ATENABLE(s, atp->atp_lock);

                ddp = AT_DDP_HDR(m);
                    dPrintf(D_M_ATP_LOW, (D_L_INPUT|D_L_ERROR),
                ("atp_rput: dropping TRESP, failed trp,tid=%d,loc=%d,rem=%d.%d\n",
                ddp = AT_DDP_HDR(m);
                    dPrintf(D_M_ATP_LOW, (D_L_INPUT|D_L_ERROR),
                ("atp_rput: dropping TRESP, failed trp,tid=%d,loc=%d,rem=%d.%d\n",

-                           UAS_VALUE(athp->tid),
+                           UAS_VALUE_NTOH(athp->tid),

                            ddp->dst_socket, ddp->src_node, ddp->src_socket));
                    gbuf_freem(m);
                    return;
                            ddp->dst_socket, ddp->src_node, ddp->src_socket));
                    gbuf_freem(m);
                    return;


@@ -182,11 +194,10 @@ gbuf_t   *m;
                 * If we have already received it, ignore it
                 */
                if (!(trp->tr_bitmap&atp_mask[seqno]) || trp->tr_rcv[seqno]) {
                 * If we have already received it, ignore it
                 */
                if (!(trp->tr_bitmap&atp_mask[seqno]) || trp->tr_rcv[seqno]) {

-               ATENABLE(s, atp->atp_lock);

                ddp = AT_DDP_HDR(m);
                    dPrintf(D_M_ATP_LOW, (D_L_INPUT|D_L_ERROR),
                ddp = AT_DDP_HDR(m);
                    dPrintf(D_M_ATP_LOW, (D_L_INPUT|D_L_ERROR),

-               ("atp_rput: dropping TRESP, duplicate,tid=%d,loc=%d,rem=%d.%d,seqno=%d\n",
-                           UAS_VALUE(athp->tid),
+               ("atp_rput: dropping TRESP, duplicate,tid=%d,loc=%d,rem=%d.%d,seqno=%u\n",
+                           UAS_VALUE_NTOH(athp->tid),

                            ddp->dst_socket, ddp->src_node, ddp->src_socket, seqno));
                    gbuf_freem(m);
                    return;
                            ddp->dst_socket, ddp->src_node, ddp->src_socket, seqno));
                    gbuf_freem(m);
                    return;


@@ -217,7 +228,6 @@ gbuf_t   *m;
                 *              the message to the user
                 */
                if (trp->tr_bitmap == 0) {
                 *              the message to the user
                 */
                if (trp->tr_bitmap == 0) {

-                   ATENABLE(s, atp->atp_lock);

 
                    /*
                     *  Cancel the request timer and any
 
                    /*
                     *  Cancel the request timer and any


@@ -235,12 +245,10 @@ gbuf_t   *m;
                    /*
                     *  If they want treq again, send them
                     */
                    /*
                     *  If they want treq again, send them
                     */

-                   ATENABLE(s, atp->atp_lock);

                    atp_untimout(atp_req_timeout, trp);
                    atp_send(trp);
                    return;
                }
                    atp_untimout(atp_req_timeout, trp);
                    atp_send(trp);
                    return;
                }

-               ATENABLE(s, atp->atp_lock);

                return;
            }
 
                return;
            }
 


@@ -253,9 +261,8 @@ gbuf_t   *m;
                 */
                ddp = AT_DDP_HDR(m);
 
                 */
                ddp = AT_DDP_HDR(m);
 

-               ATDISABLE(s, atp->atp_lock);

                for (rcbp = atp->atp_rcb.head; rcbp; rcbp = rcbp->rc_list.next) {
                for (rcbp = atp->atp_rcb.head; rcbp; rcbp = rcbp->rc_list.next) {

-                   if (rcbp->rc_tid == UAS_VALUE(athp->tid) &&
+                   if (rcbp->rc_tid == UAS_VALUE_NTOH(athp->tid) &&

                        rcbp->rc_socket.node == ddp->src_node &&
                        rcbp->rc_socket.net == NET_VALUE(ddp->src_net) &&
                        rcbp->rc_socket.socket == ddp->src_socket) {
                        rcbp->rc_socket.node == ddp->src_node &&
                        rcbp->rc_socket.net == NET_VALUE(ddp->src_net) &&
                        rcbp->rc_socket.socket == ddp->src_socket) {


@@ -269,14 +276,11 @@ gbuf_t   *m;
                                {
                                ddp = 0;
                                atp_rcb_free(rcbp);
                                {
                                ddp = 0;
                                atp_rcb_free(rcbp);

-                               ATENABLE(s, atp->atp_lock);

                                }
                            break;
                    }
                }
 
                                }
                            break;
                    }
                }
 

-               if (ddp)
-                       ATENABLE(s, atp->atp_lock);

                gbuf_freem(m);
                return;
           }
                gbuf_freem(m);
                return;
           }


@@ -295,9 +299,8 @@ gbuf_t   *m;
                 */
                ddp = AT_DDP_HDR(m);
 
                 */
                ddp = AT_DDP_HDR(m);
 

-               ATDISABLE(s, atp->atp_lock);

                for (rcbp = atp->atp_rcb.head; rcbp; rcbp = rcbp->rc_list.next) {
                for (rcbp = atp->atp_rcb.head; rcbp; rcbp = rcbp->rc_list.next) {

-                   if (rcbp->rc_tid == UAS_VALUE(athp->tid) &&
+                   if (rcbp->rc_tid == UAS_VALUE_NTOH(athp->tid) &&

                        rcbp->rc_socket.node == ddp->src_node &&
                        rcbp->rc_socket.net == NET_VALUE(ddp->src_net) &&
                        rcbp->rc_socket.socket == ddp->src_socket)
                        rcbp->rc_socket.node == ddp->src_node &&
                        rcbp->rc_socket.net == NET_VALUE(ddp->src_net) &&
                        rcbp->rc_socket.socket == ddp->src_socket)


@@ -316,11 +319,10 @@ gbuf_t   *m;
                     */
                                        /* we just did this, why do again? -jjs 4-10-95 */
                    for (rcbp = atp->atp_attached.head; rcbp; rcbp = rcbp->rc_list.next) {
                     */
                                        /* we just did this, why do again? -jjs 4-10-95 */
                    for (rcbp = atp->atp_attached.head; rcbp; rcbp = rcbp->rc_list.next) {

-                       if (rcbp->rc_tid == UAS_VALUE(athp->tid) &&
+                       if (rcbp->rc_tid == UAS_VALUE_NTOH(athp->tid) &&

                            rcbp->rc_socket.node == ddp->src_node &&
                            rcbp->rc_socket.net == NET_VALUE(ddp->src_net) &&
                            rcbp->rc_socket.socket == ddp->src_socket) {
                            rcbp->rc_socket.node == ddp->src_node &&
                            rcbp->rc_socket.net == NET_VALUE(ddp->src_net) &&
                            rcbp->rc_socket.socket == ddp->src_socket) {

-                           ATENABLE(s, atp->atp_lock);

                            gbuf_freem(m);
                            dPrintf(D_M_ATP_LOW, D_L_INPUT, 
                                    ("atp_rput: dropping TREQ, matches req queue\n"));
                            gbuf_freem(m);
                            dPrintf(D_M_ATP_LOW, D_L_INPUT, 
                                    ("atp_rput: dropping TREQ, matches req queue\n"));


@@ -332,20 +334,19 @@ gbuf_t   *m;
                         * assume someone is interested in 
                         * in an asynchronous incoming request
                         */
                         * assume someone is interested in 
                         * in an asynchronous incoming request
                         */

-                       ATENABLE(s, atp->atp_lock);

                        if ((rcbp = atp_rcb_alloc(atp)) == NULL) {
                            gbuf_freem(m);
                            return;
                        }
                        rcbp->rc_state = RCB_UNQUEUED;
                        if ((rcbp = atp_rcb_alloc(atp)) == NULL) {
                            gbuf_freem(m);
                            return;
                        }
                        rcbp->rc_state = RCB_UNQUEUED;

-                       ATDISABLE(s, atp->atp_lock);

 
                    rcbp->rc_local_node = ddp->dst_node;
 
                    rcbp->rc_local_node = ddp->dst_node;

-                   NET_NET(rcbp->rc_local_net, ddp->dst_net);
+                   temp_net = NET_VALUE(ddp->dst_net);
+                   NET_ASSIGN_NOSWAP(rcbp->rc_local_net, temp_net);

                    rcbp->rc_socket.socket = ddp->src_socket;
                    rcbp->rc_socket.node = ddp->src_node;
                    rcbp->rc_socket.net = NET_VALUE(ddp->src_net);
                    rcbp->rc_socket.socket = ddp->src_socket;
                    rcbp->rc_socket.node = ddp->src_node;
                    rcbp->rc_socket.net = NET_VALUE(ddp->src_net);

-                   rcbp->rc_tid = UAS_VALUE(athp->tid);
+                   rcbp->rc_tid = UAS_VALUE_NTOH(athp->tid);

                    rcbp->rc_bitmap = athp->bitmap;
                    rcbp->rc_not_sent_bitmap = athp->bitmap;
                    rcbp->rc_xo = athp->xo;
                    rcbp->rc_bitmap = athp->bitmap;
                    rcbp->rc_not_sent_bitmap = athp->bitmap;
                    rcbp->rc_xo = athp->xo;


@@ -382,7 +383,6 @@ gbuf_t   *m;
                        rcbp->rc_state = RCB_PENDING;
                        ATP_Q_APPEND(atp->atp_attached, rcbp, rc_list);
                        if (m_asp != NULL) {
                        rcbp->rc_state = RCB_PENDING;
                        ATP_Q_APPEND(atp->atp_attached, rcbp, rc_list);
                        if (m_asp != NULL) {

-                           ATENABLE(s, atp->atp_lock);

                            atp_req_ind(atp, m_asp);
                            return;
                        }
                            atp_req_ind(atp, m_asp);
                            return;
                        }


@@ -406,16 +406,13 @@ gbuf_t   *m;
                         *              the replies
                         */
                        getmicrouptime(&timenow);
                         *              the replies
                         */
                        getmicrouptime(&timenow);

-                       ATDISABLE(s_gen, atpgen_lock);

                        if (rcbp->rc_timestamp) {
                          rcbp->rc_timestamp = timenow.tv_sec;
                          if (rcbp->rc_timestamp == 0)
                            rcbp->rc_timestamp = 1;
                        }
                        if (rcbp->rc_timestamp) {
                          rcbp->rc_timestamp = timenow.tv_sec;
                          if (rcbp->rc_timestamp == 0)
                            rcbp->rc_timestamp = 1;
                        }

-                       ATENABLE(s_gen, atpgen_lock);

                        rcbp->rc_bitmap = athp->bitmap;
                        rcbp->rc_not_sent_bitmap = athp->bitmap;
                        rcbp->rc_bitmap = athp->bitmap;
                        rcbp->rc_not_sent_bitmap = athp->bitmap;

-                       ATENABLE(s, atp->atp_lock);

                        gbuf_freem(m);
                        atp_reply(rcbp);
                        return;
                        gbuf_freem(m);
                        atp_reply(rcbp);
                        return;


@@ -427,12 +424,10 @@ gbuf_t   *m;
                         *      we haven't sent any data yet
                         *      ignore the request
                         */
                         *      we haven't sent any data yet
                         *      ignore the request
                         */

-                       ATENABLE(s, atp->atp_lock);

                        gbuf_freem(m);
                        return;
                    }
                }
                        gbuf_freem(m);
                        return;
                    }
                }

-               ATENABLE(s, atp->atp_lock);

                return;
           }
 
                return;
           }