xnu-792.25.20.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..b4cef944bec3dca2a5c7cc00f91301a705362719 100644 (file)
--- a/bsd/netat/ddp_sip.c
+++ b/bsd/netat/ddp_sip.c
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * 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.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -117,7 +114,7 @@ void sip_input(mp, ifID)
        /* 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.
@@ -135,11 +132,11 @@ void sip_input(mp, ifID)
                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.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
@@ -156,23 +153,23 @@ void sip_input(mp, ifID)
                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.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;
-               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;
-       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;