xnu-1228.15.4.tar.gz

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

diff --git a/bsd/netat/ddp_sip.c b/bsd/netat/ddp_sip.c
index bbaf35d937636719bfe9fff1052693f6db69dd42..cc4b4749555a4b485eb1a5a5ac86bdca765fb506 100644 (file)
--- a/bsd/netat/ddp_sip.c
+++ b/bsd/netat/ddp_sip.c
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, 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,7 +23,7 @@
  * 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@

  */
 
 /*
  */
 
 /*


@@ -69,12 +72,12 @@
 
 #include <net/if.h>
 
 
 #include <net/if.h>
 

+#include <netat/sysglue.h>  /* nbp.h needs the gbuf definiton */

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

-#include <netat/sysglue.h>  /* nbp.h needs the gbuf definiton */
-#include <netat/nbp.h>

 #include <netat/at_pcb.h>
 #include <netat/at_var.h>
 #include <netat/at_pcb.h>
 #include <netat/at_var.h>

+#include <netat/nbp.h>

 #include <netat/atp.h>
 
 #define        SIP_SYSINFO_CMD         1
 #include <netat/atp.h>
 
 #define        SIP_SYSINFO_CMD         1


@@ -92,9 +95,9 @@ typedef       struct {
        u_short responder_version;
 } sip_userbytes_t;
 
        u_short responder_version;
 } sip_userbytes_t;
 

-void sip_input(mp, ifID)
-     gbuf_t    *mp;
-     int       *ifID; /* not used */
+void sip_input(
+     gbuf_t    *mp,
+     __unused at_ifaddr_t      *ifID)

 {
        /* Packets arriving here are actually ATP packets, but since
         * A/UX only send dummy responses, we're implementing responder as
 {
        /* Packets arriving here are actually ATP packets, but since
         * A/UX only send dummy responses, we're implementing responder as


@@ -117,7 +120,7 @@ void sip_input(mp, ifID)
        /* assuming that the whole packet is in one contiguous buffer */
        atp = (at_atp_t *)ddp->data;
        
        /* assuming that the whole packet is in one contiguous buffer */
        atp = (at_atp_t *)ddp->data;
        

-       switch(UAL_VALUE(atp->user_bytes)) {
+       switch(UAL_VALUE_NTOH(atp->user_bytes)) {

        case SIP_SYSINFO_CMD :
                /* Sending a response with "AppleTalk driver version" (u_short)
                 * followed by 14 zeros will pacify the interpoll.
        case SIP_SYSINFO_CMD :
                /* Sending a response with "AppleTalk driver version" (u_short)
                 * followed by 14 zeros will pacify the interpoll.


@@ -135,11 +138,11 @@ void sip_input(mp, ifID)
                else
                        resp = (u_char *)gbuf_rptr(tmp);
                bzero(resp, 16);
                else
                        resp = (u_char *)gbuf_rptr(tmp);
                bzero(resp, 16);

-               *(u_short *)resp = SIP_DRIVER_VERSION;
+               *(u_short *)resp = htons(SIP_DRIVER_VERSION);

 
                ubytes.response = SIP_GOOD_RESPONSE;
                ubytes.unused = 0;
 
                ubytes.response = SIP_GOOD_RESPONSE;
                ubytes.unused = 0;

-               ubytes.responder_version = SIP_RESPONDER_VERSION;
+               ubytes.responder_version = htons(SIP_RESPONDER_VERSION);

                break;
        case SIP_DATALINK_CMD :
                /* In this case, the magic spell is to send 2 zeroes after
                break;
        case SIP_DATALINK_CMD :
                /* In this case, the magic spell is to send 2 zeroes after


@@ -156,23 +159,23 @@ void sip_input(mp, ifID)
                else
                        resp = (u_char *)gbuf_rptr(tmp);
                bzero(resp, 16);
                else
                        resp = (u_char *)gbuf_rptr(tmp);
                bzero(resp, 16);

-               *(u_short *)resp = SIP_DRIVER_VERSION;
+               *(u_short *)resp = htons(SIP_DRIVER_VERSION);

 
                ubytes.response = SIP_GOOD_RESPONSE;
                ubytes.unused = 0;
 
                ubytes.response = SIP_GOOD_RESPONSE;
                ubytes.unused = 0;

-               ubytes.responder_version = SIP_RESPONDER_VERSION;
+               ubytes.responder_version = htons(SIP_RESPONDER_VERSION);

                break;
        default :
                /* bad request, send a bad command response back */
                ubytes.response = SIP_BAD_RESPONSE;
                ubytes.unused = 0;
                break;
        default :
                /* bad request, send a bad command response back */
                ubytes.response = SIP_BAD_RESPONSE;
                ubytes.unused = 0;

-               ubytes.responder_version = SIP_RESPONDER_VERSION;
+               ubytes.responder_version = htons(SIP_RESPONDER_VERSION);

        }
 
        NET_NET(ddp->dst_net, ddp->src_net);
        ddp->dst_node = ddp->src_node;
        ddp->dst_socket = ddp->src_socket;
        }
 
        NET_NET(ddp->dst_net, ddp->src_net);
        ddp->dst_node = ddp->src_node;
        ddp->dst_socket = ddp->src_socket;

-       bcopy((caddr_t) &ubytes, (caddr_t) atp->user_bytes, sizeof(ubytes));
+       UAL_ASSIGN_HTON(atp->user_bytes, &ubytes);

        atp->cmd = ATP_CMD_TRESP;
        atp->eom = 1;
        atp->sts = 0;
        atp->cmd = ATP_CMD_TRESP;
        atp->eom = 1;
        atp->sts = 0;


@@ -181,4 +184,3 @@ void sip_input(mp, ifID)
        (void)ddp_output(&mp, DDP_SOCKET_1st_DYNAMIC, FALSE);
        return;
 } /* sip_input */
        (void)ddp_output(&mp, DDP_SOCKET_1st_DYNAMIC, FALSE);
        return;
 } /* sip_input */

-