X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/21362eb3e66fd2c787aee132bce100a44d71a99c..e2fac8b15b12a7979f72090454d850e612fc5b13:/bsd/netat/ddp_sip.c

diff --git a/bsd/netat/ddp_sip.c b/bsd/netat/ddp_sip.c
index 07cb4a9b7..cc4b47495 100644
--- a/bsd/netat/ddp_sip.c
+++ b/bsd/netat/ddp_sip.c
@@ -72,12 +72,12 @@
 
 #include <net/if.h>
 
+#include <netat/sysglue.h>  /* nbp.h needs the gbuf definiton */
 #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/nbp.h>
 #include <netat/atp.h>
 
 #define	SIP_SYSINFO_CMD		1
@@ -95,9 +95,9 @@ typedef	struct {
 	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
@@ -120,7 +120,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.
@@ -138,11 +138,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
@@ -159,23 +159,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;
@@ -184,4 +184,3 @@ void sip_input(mp, ifID)
 	(void)ddp_output(&mp, DDP_SOCKET_1st_DYNAMIC, FALSE);
 	return;
 } /* sip_input */
-