X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/0b4e3aa066abc0728aacb4bbeb86f53f9737156e..0c530ab8987f0ae6a1a3d9284f40182b88852816:/bsd/netat/ddp_aarp.c diff --git a/bsd/netat/ddp_aarp.c b/bsd/netat/ddp_aarp.c index af578e3be..08c50531a 100644 --- a/bsd/netat/ddp_aarp.c +++ b/bsd/netat/ddp_aarp.c @@ -58,6 +58,8 @@ #include #include +#include + static int probing; /* Following two variables are used to keep track of how many dynamic addresses * we have tried out at startup. @@ -76,7 +78,6 @@ aarp_amt_array *aarp_table[IF_TOTAL_MAX]; int aarp_init1(), aarp_init2(); int aarp_send_data(); -int aarp_sched_probe(); StaticProc int aarp_req_cmd_in(); StaticProc int aarp_resp_cmd_in(); @@ -88,11 +89,10 @@ StaticProc aarp_amt_t *aarp_lru_entry(); StaticProc int aarp_glean_info(); StaticProc int aarp_delete_amt_info(); StaticProc void aarp_build_pkt(); -StaticProc int aarp_sched_req(); +StaticProc void aarp_sched_req(void *); 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); @@ -158,7 +158,13 @@ int aarp_init2(elapp) elapp->ifThisNode = elapp->initial_addr; probing = PROBE_DONE; - + + /* AppleTalk was successfully started up. Send event with node and net. */ + atalk_post_msg(elapp->aa_ifp, KEV_ATALK_ENABLED, &(elapp->ifThisNode), 0); + + /* Set global flag */ + at_state.flags |= AT_ST_STARTED; + return(0); } @@ -174,7 +180,7 @@ int aarp_rcv_pkt(pkt, elapp) 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: @@ -274,7 +280,7 @@ StaticProc int aarp_resp_cmd_in (pkt, elapp) 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) { @@ -415,18 +421,20 @@ int aarp_chk_addr(ddp_hdrp, elapp) * 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)); @@ -442,22 +450,19 @@ int aarp_send_data(m, elapp, dest_at_addr, loop) 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)); } @@ -469,7 +474,6 @@ int aarp_send_data(m, elapp, dest_at_addr, loop) 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); @@ -492,7 +496,7 @@ int aarp_send_data(m, elapp, dest_at_addr, loop) } return (error); } - NEW_AMT(amt_ptr, *dest_at_addr,elapp); + NEW_AMT(amt_ptr, *dest_at_addr, elapp) if (amt_ptr->m) { /* @@ -500,18 +504,17 @@ int aarp_send_data(m, elapp, dest_at_addr, loop) * 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); @@ -547,7 +550,7 @@ StaticProc int aarp_send_resp(elapp, pkt) 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; @@ -589,7 +592,7 @@ register aarp_amt_t *amt_ptr; 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; @@ -632,7 +635,7 @@ StaticProc int aarp_send_probe() 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, @@ -690,9 +693,7 @@ register aarp_pkt_t *pkt; 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) { @@ -702,10 +703,7 @@ at_ifaddr_t *elapp; 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; @@ -718,7 +716,6 @@ at_ifaddr_t *elapp; 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); } @@ -731,9 +728,7 @@ at_ifaddr_t *elapp; 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; @@ -741,11 +736,8 @@ register aarp_amt_t *amt_ptr; 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); } @@ -756,13 +748,13 @@ register aarp_amt_t *amt_ptr; * ****************************************************************************/ -int aarp_sched_probe() +void aarp_sched_probe(void *arg) { - boolean_t funnel_state; - funnel_state = thread_funnel_set(network_flock, TRUE); + atalk_lock(); - if (probe_cb.no_of_retries != AARP_MAX_PROBE_RETRIES) { + if (probe_cb.elapp->aa_ifp != 0 && + probe_cb.no_of_retries != AARP_MAX_PROBE_RETRIES) { if (aarp_send_probe() == -1) AARPwakeup(&probe_cb); } else { @@ -770,8 +762,7 @@ int aarp_sched_probe() AARPwakeup(&probe_cb); } - (void) thread_funnel_set(network_flock, FALSE); - return(0); + atalk_unlock(); } @@ -785,8 +776,8 @@ StaticProc void aarp_build_pkt(pkt, elapp) 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)); @@ -799,13 +790,13 @@ StaticProc void aarp_build_pkt(pkt, elapp) * ****************************************************************************/ -StaticProc int aarp_sched_req(amt_ptr) - register aarp_amt_t *amt_ptr; +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 @@ -813,33 +804,29 @@ StaticProc int aarp_sched_req(amt_ptr) * into one of the amt arrays. */ for (i = 0; i < IF_TOTAL_MAX; i++) { - if (aarp_table[i] == NULL || amt_ptr < aarp_table[i] || amt_ptr >= (aarp_table[i] + 1)) + if (aarp_table[i] == NULL || (void *)amt_ptr < (void *)aarp_table[i] || + (void *)amt_ptr >= (void *)(aarp_table[i] + 1)) continue; /* no match - try next entry */ /* * 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); - return(0); + 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); - return(0); + 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(0); + return; } @@ -967,6 +954,8 @@ snmpAarpEnt_t *getAarp(elapId) 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) @@ -983,7 +972,11 @@ snmpAarpEnt_t *getAarp(elapId) * & 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++;