StaticProc int aarp_get_rand_node();
StaticProc int aarp_get_next_node();
StaticProc int aarp_get_rand_net();
-atlock_t arpinp_lock;
extern void AARPwakeup(aarp_amt_t *);
extern int pat_output(at_ifaddr_t *, gbuf_t *, unsigned char *, int);
aarp_pkt_t *pkt;
at_ifaddr_t *elapp;
{
- switch (pkt->aarp_cmd) {
+ switch (ntohs(pkt->aarp_cmd)) {
case AARP_REQ_CMD:
return (aarp_req_cmd_in (pkt, elapp));
case AARP_RESP_CMD:
break;
case PROBE_DONE :
- AMT_LOOK(amt_ptr, pkt->src_at_addr, elapp);
+ AMT_LOOK(amt_ptr, pkt->src_at_addr, elapp)
if (amt_ptr == NULL)
return(-1);
if (amt_ptr->tmo) {
* will ALWAYS be removed. If the message is dropped,
* it's not an "error".
*
+ * Parameter dest_at_addr must have the net # in network byte order
****************************************************************************/
int aarp_send_data(m, elapp, dest_at_addr, loop)
register gbuf_t *m;
register at_ifaddr_t *elapp;
- struct atalk_addr *dest_at_addr;
+ struct atalk_addr *dest_at_addr; /* net# in network byte order */
int loop; /* if true, loopback broadcasts */
{
register aarp_amt_t *amt_ptr;
register at_ddp_t *ddp_hdrp;
int error;
- int s;
+ struct timeval timenow;
+ getmicrouptime(&timenow);
if (gbuf_len(m) <= 0)
ddp_hdrp = (at_ddp_t *)gbuf_rptr(gbuf_cont(m));
ddp_input(m, elapp);
return(0);
}
- ATDISABLE(s, arpinp_lock);
AMT_LOOK(amt_ptr, *dest_at_addr, elapp);
if (amt_ptr) {
- if (amt_ptr->m) {
+ if (amt_ptr->m) {
/*
* there's already a packet awaiting transmission, so
* drop this one and let the upper layer retransmit
* later.
*/
- ATENABLE(s, arpinp_lock);
gbuf_freel(m);
return (0);
}
- ATENABLE(s, arpinp_lock);
return (pat_output(elapp, m,
(unsigned char *)&amt_ptr->dest_addr, 0));
}
gbuf_t *newm = 0;
struct etalk_addr *dest_addr;
- ATENABLE(s, arpinp_lock);
dest_addr = &elapp->cable_multicast_addr;
if (loop)
newm = (gbuf_t *)gbuf_dupm(m);
}
return (error);
}
- NEW_AMT(amt_ptr, *dest_at_addr,elapp);
+ NEW_AMT(amt_ptr, *dest_at_addr, elapp)
if (amt_ptr->m) {
/*
* drop this one and let the upper layer retransmit
* later.
*/
- ATENABLE(s, arpinp_lock);
gbuf_freel(m);
return (0);
}
amt_ptr->dest_at_addr = *dest_at_addr;
amt_ptr->dest_at_addr.atalk_unused = 0;
- amt_ptr->last_time = time.tv_sec;
+ getmicrouptime(&timenow);
+ amt_ptr->last_time = timenow.tv_sec;
amt_ptr->m = m;
amt_ptr->elapp = elapp;
amt_ptr->no_of_retries = 0;
- ATENABLE(s, arpinp_lock);
if ((error = aarp_send_req(amt_ptr))) {
aarp_delete_amt_info(amt_ptr);
new_pkt = (aarp_pkt_t *)gbuf_rptr(m);
aarp_build_pkt(new_pkt, elapp);
- new_pkt->aarp_cmd = AARP_RESP_CMD;
+ new_pkt->aarp_cmd = htons(AARP_RESP_CMD);
new_pkt->dest_addr = pkt->src_addr;
new_pkt->dest_at_addr = pkt->src_at_addr;
pkt = (aarp_pkt_t *)gbuf_rptr(m);
aarp_build_pkt(pkt, amt_ptr->elapp);
- pkt->aarp_cmd = AARP_REQ_CMD;
+ pkt->aarp_cmd = htons(AARP_REQ_CMD);
pkt->dest_addr = et_zeroaddr;
pkt->dest_at_addr = amt_ptr->dest_at_addr;
pkt->dest_at_addr.atalk_unused = 0;
pkt = (aarp_pkt_t *)gbuf_rptr(m);
aarp_build_pkt(pkt, probe_cb.elapp);
- pkt->aarp_cmd = AARP_PROBE_CMD;
+ pkt->aarp_cmd = htons(AARP_PROBE_CMD);
pkt->dest_addr = et_zeroaddr;
ATALK_ASSIGN(pkt->src_at_addr, probe_cb.elapp->initial_addr.s_net,
at_ifaddr_t *elapp;
{
register aarp_amt_t *amt_ptr;
- int s;
- ATDISABLE(s, arpinp_lock);
AMT_LOOK(amt_ptr, pkt->src_at_addr, elapp);
if (amt_ptr == NULL) {
NEW_AMT(amt_ptr, pkt->src_at_addr,elapp);
if (amt_ptr->m)
- {
- ATENABLE(s, arpinp_lock);
- return(0); /* no non-busy slots available in the cache */
- }
+ return(0); /* no non-busy slots available in the cache */
amt_ptr->dest_at_addr = pkt->src_at_addr;
amt_ptr->dest_at_addr.atalk_unused = 0;
amt_ptr->dest_addr = pkt->src_addr;
if (FDDI_OR_TOKENRING(elapp->aa_ifp->if_type))
ddp_bit_reverse(&amt_ptr->dest_addr);
- ATENABLE(s, arpinp_lock);
return(1);
}
StaticProc int aarp_delete_amt_info(amt_ptr)
register aarp_amt_t *amt_ptr;
{
- register s;
register gbuf_t *m;
- ATDISABLE(s, arpinp_lock);
amt_ptr->last_time = 0;
ATALK_ASSIGN(amt_ptr->dest_at_addr, 0, 0, 0);
amt_ptr->no_of_retries = 0;
if (amt_ptr->m) {
m = amt_ptr->m;
amt_ptr->m = NULL;
- ATENABLE(s, arpinp_lock);
gbuf_freel(m);
- }
- else
- ATENABLE(s, arpinp_lock);
+ }
return(0);
}
void aarp_sched_probe(void *arg)
{
- boolean_t funnel_state;
- funnel_state = thread_funnel_set(network_flock, TRUE);
+ atalk_lock();
if (probe_cb.elapp->aa_ifp != 0 &&
probe_cb.no_of_retries != AARP_MAX_PROBE_RETRIES) {
AARPwakeup(&probe_cb);
}
- (void) thread_funnel_set(network_flock, FALSE);
+ atalk_unlock();
}
register aarp_pkt_t *pkt;
at_ifaddr_t *elapp;
{
- pkt->hardware_type = AARP_ETHER_HW_TYPE;
- pkt->stack_type = AARP_AT_PROTO;
+ pkt->hardware_type = htons(AARP_ETHER_HW_TYPE);
+ pkt->stack_type = htons(AARP_AT_PROTO);
pkt->hw_addr_len = ETHERNET_ADDR_LEN;
pkt->stack_addr_len = AARP_AT_ADDR_LEN;
bcopy(elapp->xaddr, pkt->src_addr.etalk_addr_octet, sizeof(elapp->xaddr));
StaticProc void aarp_sched_req(arg)
void *arg;
{
- int s, i;
- boolean_t funnel_state;
+ int i;
aarp_amt_t *amt_ptr = (aarp_amt_t *)arg;
- funnel_state = thread_funnel_set(network_flock, TRUE);
+ atalk_lock();
/*
* make sure pointer still valid in case interface removed
/*
* found match - pointer is valid
*/
- ATDISABLE(s, arpinp_lock);
if (amt_ptr->tmo == 0) {
- ATENABLE(s, arpinp_lock);
- (void) thread_funnel_set(network_flock, FALSE);
+ atalk_unlock();
return;
}
if (amt_ptr->no_of_retries < AARP_MAX_REQ_RETRIES) {
- ATENABLE(s, arpinp_lock);
if (aarp_send_req(amt_ptr) == 0) {
- (void) thread_funnel_set(network_flock, FALSE);
+ atalk_unlock();
return;
}
- ATDISABLE(s, arpinp_lock);
}
- ATENABLE(s, arpinp_lock);
aarp_delete_amt_info(amt_ptr);
break;
}
- (void) thread_funnel_set(network_flock, FALSE);
+ atalk_unlock();
return;
}
aarp_amt_t *amtp;
static snmpAarpEnt_t snmp[AMTSIZE];
snmpAarpEnt_t *snmpp;
+ struct atalk_addr addr;
+ u_short tmp_net;
if (*elapId <0 || *elapId >= IF_TOTAL_MAX)
* & etalk_addr positions in the aarp_amt_t struct
* has not changed and copy both at once
*/
- bcopy(&amtp->dest_at_addr, &snmpp->ap_ddpAddr, ENTRY_SIZE);
+ addr.atalk_unused = 0;
+ tmp_net = UAS_VALUE(amtp->dest_at_addr.atalk_net);
+ NET_ASSIGN(addr.atalk_net, tmp_net);
+ addr.atalk_node = amtp->dest_at_addr.atalk_node;
+ bcopy(&addr, &snmpp->ap_ddpAddr, ENTRY_SIZE);
snmpp++;
cnt++;
projects / apple / xnu.git / blobdiff