Make a thorough pass through all variables and function names contained within arp and remove CamelCase and improve naming.
Signed-off-by: Joe Hershberger joe.hershberger@ni.com ---
net/arp.c | 69 +++++++++++++++++++++++++++++++------------------------------- net/arp.h | 16 +++++++-------- net/net.c | 16 +++++++-------- net/ping.c | 8 ++++---- 4 files changed, 54 insertions(+), 55 deletions(-)
diff --git a/net/arp.c b/net/arp.c index 691811d..f64f13d 100644 --- a/net/arp.c +++ b/net/arp.c @@ -30,40 +30,40 @@ struct in_addr net_arp_wait_packet_ip; static struct in_addr net_arp_wait_reply_ip; /* MAC address of waiting packet's destination */ -uchar *NetArpWaitPacketMAC; -int NetArpWaitTxPacketSize; -ulong NetArpWaitTimerStart; -int NetArpWaitTry; +uchar *arp_wait_packet_ethaddr; +int arp_wait_tx_packet_size; +ulong arp_wait_timer_start; +int arp_wait_try;
-static uchar *net_arp_tx_packet; /* THE ARP transmit packet */ -static uchar NetArpPacketBuf[PKTSIZE_ALIGN + PKTALIGN]; +static uchar *arp_tx_packet; /* THE ARP transmit packet */ +static uchar arp_tx_packet_buf[PKTSIZE_ALIGN + PKTALIGN];
-void ArpInit(void) +void arp_init(void) { /* XXX problem with bss workaround */ - NetArpWaitPacketMAC = NULL; + arp_wait_packet_ethaddr = NULL; net_arp_wait_packet_ip.s_addr = 0; net_arp_wait_reply_ip.s_addr = 0; - NetArpWaitTxPacketSize = 0; - net_arp_tx_packet = &NetArpPacketBuf[0] + (PKTALIGN - 1); - net_arp_tx_packet -= (ulong)net_arp_tx_packet % PKTALIGN; + arp_wait_tx_packet_size = 0; + arp_tx_packet = &arp_tx_packet_buf[0] + (PKTALIGN - 1); + arp_tx_packet -= (ulong)arp_tx_packet % PKTALIGN; }
-void arp_raw_request(struct in_addr source_ip, const uchar *targetEther, +void arp_raw_request(struct in_addr source_ip, const uchar *target_ethaddr, struct in_addr target_ip) { uchar *pkt; struct arp_hdr *arp; int eth_hdr_size;
- debug_cond(DEBUG_DEV_PKT, "ARP broadcast %d\n", NetArpWaitTry); + debug_cond(DEBUG_DEV_PKT, "ARP broadcast %d\n", arp_wait_try);
- pkt = net_arp_tx_packet; + pkt = arp_tx_packet;
eth_hdr_size = net_set_ether(pkt, net_bcast_ethaddr, PROT_ARP); pkt += eth_hdr_size;
- arp = (struct arp_hdr *) pkt; + arp = (struct arp_hdr *)pkt;
arp->ar_hrd = htons(ARP_ETHER); arp->ar_pro = htons(PROT_IP); @@ -73,13 +73,13 @@ void arp_raw_request(struct in_addr source_ip, const uchar *targetEther,
memcpy(&arp->ar_sha, net_ethaddr, ARP_HLEN); /* source ET addr */ net_write_ip(&arp->ar_spa, source_ip); /* source IP addr */ - memcpy(&arp->ar_tha, targetEther, ARP_HLEN); /* target ET addr */ + memcpy(&arp->ar_tha, target_ethaddr, ARP_HLEN); /* target ET addr */ net_write_ip(&arp->ar_tpa, target_ip); /* target IP addr */
- net_send_packet(net_arp_tx_packet, eth_hdr_size + ARP_HDR_SIZE); + net_send_packet(arp_tx_packet, eth_hdr_size + ARP_HDR_SIZE); }
-void ArpRequest(void) +void arp_request(void) { if ((net_arp_wait_packet_ip.s_addr & net_netmask.s_addr) != (net_ip.s_addr & net_netmask.s_addr)) { @@ -96,7 +96,7 @@ void ArpRequest(void) arp_raw_request(net_ip, net_null_ethaddr, net_arp_wait_reply_ip); }
-void ArpTimeoutCheck(void) +void arp_timeout_check(void) { ulong t;
@@ -106,21 +106,21 @@ void ArpTimeoutCheck(void) t = get_timer(0);
/* check for arp timeout */ - if ((t - NetArpWaitTimerStart) > ARP_TIMEOUT) { - NetArpWaitTry++; + if ((t - arp_wait_timer_start) > ARP_TIMEOUT) { + arp_wait_try++;
- if (NetArpWaitTry >= ARP_TIMEOUT_COUNT) { + if (arp_wait_try >= ARP_TIMEOUT_COUNT) { puts("\nARP Retry count exceeded; starting again\n"); - NetArpWaitTry = 0; + arp_wait_try = 0; NetStartAgain(); } else { - NetArpWaitTimerStart = t; - ArpRequest(); + arp_wait_timer_start = t; + arp_request(); } } }
-void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) +void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) { struct arp_hdr *arp; struct in_addr reply_ip_addr; @@ -205,28 +205,27 @@ void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) /* matched waiting packet's address */ if (reply_ip_addr.s_addr == net_arp_wait_reply_ip.s_addr) { debug_cond(DEBUG_DEV_PKT, - "Got ARP REPLY, set eth addr (%pM)\n", - arp->ar_data); + "Got ARP REPLY, set eth addr (%pM)\n", + arp->ar_data);
/* save address for later use */ - if (NetArpWaitPacketMAC != NULL) - memcpy(NetArpWaitPacketMAC, + if (arp_wait_packet_ethaddr != NULL) + memcpy(arp_wait_packet_ethaddr, &arp->ar_sha, ARP_HLEN);
net_get_arp_handler()((uchar *)arp, 0, reply_ip_addr, - 0, len); + 0, len);
/* set the mac address in the waiting packet's header and transmit it */ memcpy(((struct ethernet_hdr *)net_tx_packet)->et_dest, &arp->ar_sha, ARP_HLEN); - net_send_packet(net_tx_packet, NetArpWaitTxPacketSize); + net_send_packet(net_tx_packet, arp_wait_tx_packet_size);
/* no arp request pending now */ net_arp_wait_packet_ip.s_addr = 0; - NetArpWaitTxPacketSize = 0; - NetArpWaitPacketMAC = NULL; - + arp_wait_tx_packet_size = 0; + arp_wait_packet_ethaddr = NULL; } return; default: diff --git a/net/arp.h b/net/arp.h index 718342b..43c6296 100644 --- a/net/arp.h +++ b/net/arp.h @@ -16,16 +16,16 @@
extern struct in_addr net_arp_wait_packet_ip; /* MAC address of waiting packet's destination */ -extern uchar *NetArpWaitPacketMAC; -extern int NetArpWaitTxPacketSize; -extern ulong NetArpWaitTimerStart; -extern int NetArpWaitTry; +extern uchar *arp_wait_packet_ethaddr; +extern int arp_wait_tx_packet_size; +extern ulong arp_wait_timer_start; +extern int arp_wait_try;
-void ArpInit(void); -void ArpRequest(void); +void arp_init(void); +void arp_request(void); void arp_raw_request(struct in_addr source_ip, const uchar *targetEther, struct in_addr target_ip); -void ArpTimeoutCheck(void); -void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len); +void arp_timeout_check(void); +void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len);
#endif /* __ARP_H__ */ diff --git a/net/net.c b/net/net.c index e0e0724..71f11cd 100644 --- a/net/net.c +++ b/net/net.c @@ -302,7 +302,7 @@ void net_init(void) net_rx_packets[i] = net_tx_packet + (i + 1) * PKTSIZE_ALIGN; } - ArpInit(); + arp_init(); net_clear_handlers();
/* Only need to setup buffer pointers once. */ @@ -495,7 +495,7 @@ restart: goto done; }
- ArpTimeoutCheck(); + arp_timeout_check();
/* * Check for a timeout, and run the timeout handler @@ -733,15 +733,15 @@ int net_send_udp_packet(uchar *ether, struct in_addr dest, int dport, int sport,
/* save the ip and eth addr for the packet to send after arp */ net_arp_wait_packet_ip = dest; - NetArpWaitPacketMAC = ether; + arp_wait_packet_ethaddr = ether;
/* size of the waiting packet */ - NetArpWaitTxPacketSize = pkt_hdr_size + payload_len; + arp_wait_tx_packet_size = pkt_hdr_size + payload_len;
/* and do the ARP request */ - NetArpWaitTry = 1; - NetArpWaitTimerStart = get_timer(0); - ArpRequest(); + arp_wait_try = 1; + arp_wait_timer_start = get_timer(0); + arp_request(); return 1; /* waiting */ } else { debug_cond(DEBUG_DEV_PKT, "sending UDP to %pI4/%pM\n", @@ -1059,7 +1059,7 @@ void net_process_received_packet(uchar *in_packet, int len) switch (eth_proto) {
case PROT_ARP: - ArpReceive(et, ip, len); + arp_receive(et, ip, len); break;
#ifdef CONFIG_CMD_RARP diff --git a/net/ping.c b/net/ping.c index 7c6084c..76e8749 100644 --- a/net/ping.c +++ b/net/ping.c @@ -56,12 +56,12 @@ static int ping_send(void) set_icmp_header(pkt, net_ping_ip);
/* size of the waiting packet */ - NetArpWaitTxPacketSize = eth_hdr_size + IP_ICMP_HDR_SIZE; + arp_wait_tx_packet_size = eth_hdr_size + IP_ICMP_HDR_SIZE;
/* and do the ARP request */ - NetArpWaitTry = 1; - NetArpWaitTimerStart = get_timer(0); - ArpRequest(); + arp_wait_try = 1; + arp_wait_timer_start = get_timer(0); + arp_request(); return 1; /* waiting */ }