/*
* 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
- * 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
* 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) 1988-1998 Apple Computer, Inc.
static int netinfo_reply_pending;
static void zip_netinfo_reply(at_x_zip_t *, at_ifaddr_t *);
static void zip_getnetinfo(at_ifaddr_t *);
-static void zip_getnetinfo_funnel(void *);
+static void zip_getnetinfo_locked(void *);
static void send_phony_reply(void *);
/*
/* access the number of nets requested in the Query */
network_count = *((char *)(ddp_received->data) + 1);
- NetAsked = (u_short *)(ddp_received->data+ 2);
+ NetAsked = (u_short *)(ddp_received->data + 2);
/* check the validity of the Query packet */
reply_length = 2; /* 1st byte is ZIP reply code, 2nd is network count */
for (i = 0 ; i < network_count ; i ++, NetAsked++) {
- Entry = rt_blookup(*NetAsked);
+ Entry = rt_blookup(ntohs(*NetAsked));
if (Entry != NULL && ((Entry->EntryState & 0x0F) >= RTE_STATE_SUSPECT) &&
RT_ALL_ZONES_KNOWN(Entry)) { /* this net is well known... */
* and build a separate packet for each extended network requested
*/
- zip_send_ext_reply_to_query(mreceived, ifID, Entry, *NetAsked);
+ zip_send_ext_reply_to_query(mreceived, ifID, Entry, ntohs(*NetAsked));
}
}
register at_ddp_t *ddp;
register at_atp_t *atp;
register at_zip_t *zip;
- register u_long user_bytes;
+ u_char user_bytes[4];
register u_short user_byte;
/* variables for ZipNotify processing */
*/
ifID->ifNumRetries = ZIP_NETINFO_RETRIES;
netinfo_reply_pending = 1;
+ ifID->ifGNIScheduled = 1;
timeout(zip_sched_getnetinfo, (caddr_t) ifID,
2*ZIP_TIMER_INT);
/* Get the user bytes in network order */
- user_bytes = UAL_VALUE(atp->user_bytes);
- user_byte = user_bytes >> 24; /* Get the zeroth byte */
+ *((u_long*)user_bytes) = UAL_VALUE(atp->user_bytes);
+ user_byte = user_bytes[0]; /* Get the zeroth byte */
dPrintf(D_M_ZIP, D_L_INPUT,
("zip_input: received a ZIP_ATP command=%d\n", user_byte));
ifID->ifThisCableStart, ifID->ifThisCableEnd));
/* The packet is in response to our request */
+ ifID->ifGNIScheduled = 0;
untimeout (zip_sched_getnetinfo, (caddr_t) ifID);
netinfo_reply_pending = 0;
zone_name_len = netinfo->data[0];
switch (control) {
case ZIP_ONLINE :
case ZIP_LATE_ROUTER :
- ifID->ifNumRetries = 0;
- /* Get the desired zone name from elap and put it in
- * ifID for zip_getnetinfo() to use.
- */
- if (ifID->startup_zone.len)
- ifID->ifZoneName = ifID->startup_zone;
- zip_getnetinfo(ifID);
+ if (!ifID->ifGNIScheduled) {
+ ifID->ifNumRetries = 0;
+ /* Get the desired zone name from elap and put it in
+ * ifID for zip_getnetinfo() to use.
+ */
+ if (ifID->startup_zone.len)
+ ifID->ifZoneName = ifID->startup_zone;
+ zip_getnetinfo(ifID);
+ }
break;
case ZIP_NO_ROUTER :
ifID->ifZoneName.len = 1;
return (0);
}
-/* funnel version of zip_getnetinfo */
-static void zip_getnetinfo_funnel(arg)
+/* locked version of zip_getnetinfo */
+static void zip_getnetinfo_locked(arg)
void *arg;
{
- at_ifaddr_t *ifID = (at_ifaddr_t *)arg;
- thread_funnel_set(network_flock, TRUE);
- zip_getnetinfo(ifID);
- thread_funnel_set(network_flock, FALSE);
+ at_ifaddr_t *ifID;
+
+ atalk_lock();
+ if (ifID != NULL) { // make sure it hasn't been closed
+ ifID = (at_ifaddr_t *)arg;
+ ifID->ifGNIScheduled = 0;
+ zip_getnetinfo(ifID);
+ }
+ atalk_unlock();
}
void zip_sched_getnetinfo();
register struct atalk_addr *at_dest;
register int size;
+
size = DDP_X_HDR_SIZE + ZIP_X_HDR_SIZE + ifID->ifZoneName.len + 1
+ sizeof(struct atalk_addr) + 1;
*/
dPrintf(D_M_ZIP, D_L_WARNING, ("zip_getnetinfo: no buffer, call later port=%d\n",
ifID->ifPort));
- timeout (zip_getnetinfo_funnel, (caddr_t) ifID, ZIP_TIMER_INT/10);
+ ifID->ifGNIScheduled = 1;
+ timeout (zip_getnetinfo_locked, (caddr_t) ifID, ZIP_TIMER_INT/10);
return;
}
ifID->ifNumRetries++;
netinfo_reply_pending = 1;
-
+ ifID->ifGNIScheduled = 1;
timeout (zip_sched_getnetinfo, (caddr_t) ifID, ZIP_TIMER_INT);
} /* zip_getnetinfo */
void zip_sched_getnetinfo (ifID)
register at_ifaddr_t *ifID;
{
- boolean_t funnel_state;
- funnel_state = thread_funnel_set(network_flock, TRUE);
+ atalk_lock();
+
+ ifID->ifGNIScheduled = 0;
if (ifID->ifNumRetries >= ZIP_NETINFO_RETRIES) {
/* enough packets sent.... give up! */
} else
zip_getnetinfo(ifID);
- (void) thread_funnel_set(network_flock, FALSE);
+ atalk_unlock();
}
register at_atp_t *atp;
register at_ddp_t *ddp;
register at_zip_t *zip;
- register u_long user_bytes;
+ u_char user_bytes[4];
register int user_byte;
ddp = (at_ddp_t *)gbuf_rptr(m);
else
atp = (at_atp_t *)(gbuf_rptr(gbuf_cont(m)));
/* Get the user bytes in network order */
- user_bytes = UAL_VALUE(atp->user_bytes);
- user_byte = user_bytes >> 24; /* Get the zeroth byte */
+ *((u_long*)user_bytes) = UAL_VALUE(atp->user_bytes);
+ user_byte = user_bytes[0]; /* Get the zeroth byte */
if ((user_byte == ZIP_GETMYZONE) ||
(user_byte == ZIP_GETZONELIST) ||
(user_byte == ZIP_GETLOCALZONES))
r_atp->bitmap = 0;
UAS_UAS(r_atp->tid, atp->tid);
ulongtmp = 1;
- ulongtmp = htonl(ulongtmp);
- UAL_ASSIGN(r_atp->user_bytes, ulongtmp); /* no of zones */
+ UAL_ASSIGN_HTON(r_atp->user_bytes, ulongtmp); /* no of zones */
/* fill up atp data part */
bcopy((caddr_t) &ifID->ifZoneName, (caddr_t) r_atp->data, ifID->ifZoneName.len+1);
void *arg;
{
gbuf_t *rm = (gbuf_t *)arg;
- boolean_t funnel_state;
- funnel_state = thread_funnel_set(network_flock, TRUE);
-
+ atalk_lock();
ddp_input(rm, ifID_home);
+ atalk_unlock();
- (void) thread_funnel_set(network_flock, FALSE);
return;
}
/* access the number of nets provided in the ZIP Reply */
- network_count = *(u_char *)(gbuf_rptr(m) + DDP_X_HDR_SIZE + 1);
+ network_count = ntohs(*(u_char *)(gbuf_rptr(m) + DDP_X_HDR_SIZE + 1));
PacketPtr = (char *)(gbuf_rptr(m) + DDP_X_HDR_SIZE + 2);
while (payload_len > 0 && network_count >0) {
- Network = *(at_net_al *)PacketPtr;
+ Network = ntohs(*(at_net_al *)PacketPtr);
PacketPtr += 2;
zname = (at_nvestr_t *)PacketPtr;
if (payload_len)
r_atp->bitmap = 0;
UAS_UAS(r_atp->tid, atp->tid);
ulongtmp = 1;
- ulongtmp = htonl(ulongtmp);
- UAL_ASSIGN(r_atp->user_bytes, ulongtmp); /* no of zones */
+ UAL_ASSIGN_HTON(r_atp->user_bytes, ulongtmp); /* no of zones */
data_ptr = (char *)r_atp->data;
/* get the start index from the ATP request */
- StartPoint = (UAL_VALUE(atp->user_bytes) & 0xffff) -1;
+ StartPoint = (UAL_VALUE_NTOH(atp->user_bytes) & 0xffff) -1;
/* find the next zone to send */
ulongtmp += 0x01000000;
- UAL_ASSIGN(r_atp->user_bytes, ulongtmp); /* # of zones and flag*/
+ UAL_ASSIGN_HTON(r_atp->user_bytes, ulongtmp); /* # of zones and flag*/
size = DDP_X_HDR_SIZE + ATP_HDR_SIZE + PacketLen;
gbuf_winc(rm,size);
/* get the start index from the ATP request */
- Index_wanted = (UAL_VALUE(atp->user_bytes) & 0xffff) -1;
+ Index_wanted = (UAL_VALUE_NTOH(atp->user_bytes) & 0xffff) -1;
dPrintf(D_M_ZIP_LOW, D_L_INFO,
("zip_r_GLZ: for station %d:%d Index_wanted = %d\n",
r_atp->bitmap = 0;
UAS_UAS(r_atp->tid, atp->tid);
ulongtmp = ((last_flag << 24) & 0xFF000000) + ZonesInPacket; /* # of zones and flag*/
- UAL_ASSIGN(r_atp->user_bytes, ulongtmp);
+ UAL_ASSIGN_HTON(r_atp->user_bytes, ulongtmp);
size = DDP_X_HDR_SIZE + ATP_HDR_SIZE + packet_len;
gbuf_winc(rm,size);
DDPLEN_ASSIGN(r_ddp, size);
projects / apple / xnu.git / blobdiff