This patch is simply clean-up to make the IPv4 type that is used match what Linux uses. It also attempts to move all variables that are IP addresses use good naming instead of CamelCase. No functional change.

Signed-off-by: Joe Hershberger joe.hershberger@ni.com ---

Changes in v2: -Fixed build failures in ip conversion patch

common/cmd_net.c | 50 +++++++++---------- common/cmd_pxe.c | 2 +- drivers/net/netconsole.c | 37 +++++++------- drivers/net/sandbox-raw.c | 8 +-- drivers/net/sandbox.c | 14 +++--- include/common.h | 2 +- include/net.h | 63 ++++++++++++----------- lib/net_utils.c | 16 +++--- net/arp.c | 56 ++++++++++----------- net/arp.h | 6 +-- net/bootp.c | 125 +++++++++++++++++++++++++--------------------- net/bootp.h | 8 +-- net/dns.c | 18 +++---- net/eth.c | 8 +-- net/link_local.c | 27 ++++++---- net/net.c | 100 +++++++++++++++++++------------------ net/nfs.c | 40 ++++++++------- net/ping.c | 22 ++++---- net/rarp.c | 8 +-- net/sntp.c | 11 ++-- net/tftp.c | 69 +++++++++++++------------ test/dm/eth.c | 10 ++-- 22 files changed, 363 insertions(+), 337 deletions(-)

diff --git a/common/cmd_net.c b/common/cmd_net.c index 3f52edc..53760a2 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -114,13 +114,13 @@ static void netboot_update_env(void) { char tmp[22];

- if (NetOurGatewayIP) { - ip_to_string(NetOurGatewayIP, tmp); + if (net_gateway.s_addr) { + ip_to_string(net_gateway, tmp); setenv("gatewayip", tmp); }

- if (NetOurSubnetMask) { - ip_to_string(NetOurSubnetMask, tmp); + if (net_netmask.s_addr) { + ip_to_string(net_netmask, tmp); setenv("netmask", tmp); }

@@ -130,8 +130,8 @@ static void netboot_update_env(void) if (NetOurRootPath[0]) setenv("rootpath", NetOurRootPath);

- if (NetOurIP) { - ip_to_string(NetOurIP, tmp); + if (net_ip.s_addr) { + ip_to_string(net_ip, tmp); setenv("ipaddr", tmp); } #if !defined(CONFIG_BOOTP_SERVERIP) @@ -139,18 +139,18 @@ static void netboot_update_env(void) * Only attempt to change serverip if net/bootp.c:BootpCopyNetParams() * could have set it */ - if (NetServerIP) { - ip_to_string(NetServerIP, tmp); + if (net_server_ip.s_addr) { + ip_to_string(net_server_ip, tmp); setenv("serverip", tmp); } #endif - if (NetOurDNSIP) { - ip_to_string(NetOurDNSIP, tmp); + if (net_dns_server.s_addr) { + ip_to_string(net_dns_server, tmp); setenv("dnsip", tmp); } #if defined(CONFIG_BOOTP_DNS2) - if (NetOurDNS2IP) { - ip_to_string(NetOurDNS2IP, tmp); + if (net_dns_server2.s_addr) { + ip_to_string(net_dns_server2, tmp); setenv("dnsip2", tmp); } #endif @@ -166,8 +166,8 @@ static void netboot_update_env(void) #endif #if defined(CONFIG_CMD_SNTP) \ && defined(CONFIG_BOOTP_NTPSERVER) - if (NetNtpServerIP) { - ip_to_string(NetNtpServerIP, tmp); + if (net_ntp_server.s_addr) { + ip_to_string(net_ntp_server, tmp); setenv("ntpserverip", tmp); } #endif @@ -260,8 +260,8 @@ static int do_ping(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (argc < 2) return CMD_RET_USAGE;

- NetPingIP = string_to_ip(argv[1]); - if (NetPingIP == 0) + net_ping_ip = string_to_ip(argv[1]); + if (net_ping_ip.s_addr == 0) return CMD_RET_USAGE;

if (NetLoop(PING) < 0) { @@ -331,14 +331,14 @@ int do_sntp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) char *toff;

if (argc < 2) { - NetNtpServerIP = getenv_IPaddr("ntpserverip"); - if (NetNtpServerIP == 0) { + net_ntp_server = getenv_ip("ntpserverip"); + if (net_ntp_server.s_addr == 0) { printf("ntpserverip not set\n"); return CMD_RET_FAILURE; } } else { - NetNtpServerIP = string_to_ip(argv[1]); - if (NetNtpServerIP == 0) { + net_ntp_server = string_to_ip(argv[1]); + if (net_ntp_server.s_addr == 0) { printf("Bad NTP server IP address\n"); return CMD_RET_FAILURE; } @@ -352,7 +352,7 @@ int do_sntp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])

if (NetLoop(SNTP) < 0) { printf("SNTP failed: host %pI4 not responding\n", - &NetNtpServerIP); + &net_ntp_server); return CMD_RET_FAILURE; }

@@ -421,14 +421,14 @@ static int do_link_local(cmd_tbl_t *cmdtp, int flag, int argc, if (NetLoop(LINKLOCAL) < 0) return CMD_RET_FAILURE;

- NetOurGatewayIP = 0; - ip_to_string(NetOurGatewayIP, tmp); + net_gateway.s_addr = 0; + ip_to_string(net_gateway, tmp); setenv("gatewayip", tmp);

- ip_to_string(NetOurSubnetMask, tmp); + ip_to_string(net_netmask, tmp); setenv("netmask", tmp);

- ip_to_string(NetOurIP, tmp); + ip_to_string(net_ip, tmp); setenv("ipaddr", tmp); setenv("llipaddr", tmp); /* store this for next time */

diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index 96f963d..9eac5c6 100644 --- a/common/cmd_pxe.c +++ b/common/cmd_pxe.c @@ -331,7 +331,7 @@ static int pxe_ipaddr_paths(cmd_tbl_t *cmdtp, void *pxefile_addr_r) char ip_addr[9]; int mask_pos, err;

- sprintf(ip_addr, "%08X", ntohl(NetOurIP)); + sprintf(ip_addr, "%08X", ntohl(net_ip.s_addr));

for (mask_pos = 7; mask_pos >= 0; mask_pos--) { err = get_pxelinux_path(cmdtp, ip_addr, pxefile_addr_r); diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 87cea7a..55f383f 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -23,7 +23,7 @@ static int input_recursion; static int output_recursion; static int net_timeout; static uchar nc_ether[6]; /* server enet address */ -static IPaddr_t nc_ip; /* server ip */ +static struct in_addr nc_ip; /* server ip */ static short nc_out_port; /* target output port */ static short nc_in_port; /* source input port */ static const char *output_packet; /* used by first send udp */ @@ -35,14 +35,14 @@ static int output_packet_len; enum proto_t net_loop_last_protocol = BOOTP;

static void nc_wait_arp_handler(uchar *pkt, unsigned dest, - IPaddr_t sip, unsigned src, + struct in_addr sip, unsigned src, unsigned len) { net_set_state(NETLOOP_SUCCESS); /* got arp reply - quit net loop */ }

-static void nc_handler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, - unsigned len) +static void nc_handler(uchar *pkt, unsigned dest, struct in_addr sip, + unsigned src, unsigned len) { if (input_size) net_set_state(NETLOOP_SUCCESS); /* got input - quit net loop */ @@ -53,24 +53,25 @@ static void nc_timeout(void) net_set_state(NETLOOP_SUCCESS); }

-static int is_broadcast(IPaddr_t ip) +static int is_broadcast(struct in_addr ip) { - static IPaddr_t netmask; - static IPaddr_t our_ip; + static struct in_addr netmask; + static struct in_addr our_ip; static int env_changed_id; int env_id = get_env_id();

/* update only when the environment has changed */ if (env_changed_id != env_id) { - netmask = getenv_IPaddr("netmask"); - our_ip = getenv_IPaddr("ipaddr"); + netmask = getenv_ip("netmask"); + our_ip = getenv_ip("ipaddr");

env_changed_id = env_id; }

- return (ip == ~0 || /* 255.255.255.255 */ - ((netmask & our_ip) == (netmask & ip) && /* on the same net */ - (netmask | ip) == ~0)); /* broadcast to our net */ + return (ip.s_addr == ~0 || /* 255.255.255.255 (global bcast) */ + ((netmask.s_addr & our_ip.s_addr) == + (netmask.s_addr & ip.s_addr) && /* on the same net and */ + (netmask.s_addr | ip.s_addr) == ~0)); /* bcast to our net */ }

static int refresh_settings_from_env(void) @@ -82,8 +83,8 @@ static int refresh_settings_from_env(void) /* update only when the environment has changed */ if (env_changed_id != env_id) { if (getenv("ncip")) { - nc_ip = getenv_IPaddr("ncip"); - if (!nc_ip) + nc_ip = getenv_ip("ncip"); + if (!nc_ip.s_addr) return -1; /* ncip is 0.0.0.0 */ p = strchr(getenv("ncip"), ':'); if (p != NULL) { @@ -91,7 +92,7 @@ static int refresh_settings_from_env(void) nc_in_port = nc_out_port; } } else - nc_ip = ~0; /* ncip is not set, so broadcast */ + nc_ip.s_addr = ~0; /* ncip is not set, so broadcast */

p = getenv("ncoutport"); if (p != NULL) @@ -131,7 +132,7 @@ void NcStart(void) } }

-int nc_input_packet(uchar *pkt, IPaddr_t src_ip, unsigned dest_port, +int nc_input_packet(uchar *pkt, struct in_addr src_ip, unsigned dest_port, unsigned src_port, unsigned len) { int end, chunk; @@ -139,7 +140,7 @@ int nc_input_packet(uchar *pkt, IPaddr_t src_ip, unsigned dest_port, if (dest_port != nc_in_port || !len) return 0; /* not for us */

- if (src_ip != nc_ip && !is_broadcast(nc_ip)) + if (src_ip.s_addr != nc_ip.s_addr && !is_broadcast(nc_ip)) return 0; /* not from our client */

debug_cond(DEBUG_DEV_PKT, "input: "%*.*s"\n", len, len, pkt); @@ -171,7 +172,7 @@ static void nc_send_packet(const char *buf, int len) int inited = 0; uchar *pkt; uchar *ether; - IPaddr_t ip; + struct in_addr ip;

debug_cond(DEBUG_DEV_PKT, "output: "%*.*s"\n", len, len, buf);

diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c index 91da5f5..45c3b18 100644 --- a/drivers/net/sandbox-raw.c +++ b/drivers/net/sandbox-raw.c @@ -16,7 +16,7 @@ DECLARE_GLOBAL_DATA_PTR;

static int reply_arp; -static IPaddr_t arp_ip; +static struct in_addr arp_ip;

static int sb_eth_raw_start(struct udevice *dev) { @@ -55,7 +55,7 @@ static int sb_eth_raw_send(struct udevice *dev, void *packet, int length) * localhost works on a higher-level API in Linux than * ARP packets, so fake it */ - arp_ip = NetReadIP(&arp->ar_tpa); + arp_ip = net_read_ip(&arp->ar_tpa); reply_arp = 1; return 0; } @@ -93,9 +93,9 @@ static int sb_eth_raw_recv(struct udevice *dev, uchar **packetp) /* Any non-zero MAC address will work */ memset(&arp->ar_sha, 0x01, ARP_HLEN); /* Use whatever IP we were looking for (always 127.0.0.1?) */ - NetWriteIP(&arp->ar_spa, arp_ip); + net_write_ip(&arp->ar_spa, arp_ip); memcpy(&arp->ar_tha, pdata->enetaddr, ARP_HLEN); - NetWriteIP(&arp->ar_tpa, NetOurIP); + net_write_ip(&arp->ar_tpa, net_ip); length = ARP_HDR_SIZE; } else { /* If local, the Ethernet header won't be included; skip it */ diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c index db115d0..e239ff4 100644 --- a/drivers/net/sandbox.c +++ b/drivers/net/sandbox.c @@ -24,7 +24,7 @@ DECLARE_GLOBAL_DATA_PTR; */ struct eth_sandbox_priv { uchar fake_host_hwaddr[ARP_HLEN]; - IPaddr_t fake_host_ipaddr; + struct in_addr fake_host_ipaddr; uchar *recv_packet_buffer; int recv_packet_length; }; @@ -73,7 +73,7 @@ static int sb_eth_send(struct udevice *dev, void *packet, int length) struct arp_hdr *arp_recv;

/* store this as the assumed IP of the fake host */ - priv->fake_host_ipaddr = NetReadIP(&arp->ar_tpa); + priv->fake_host_ipaddr = net_read_ip(&arp->ar_tpa); /* Formulate a fake response */ eth_recv = (void *)priv->recv_packet_buffer; memcpy(eth_recv->et_dest, eth->et_src, ARP_HLEN); @@ -90,9 +90,9 @@ static int sb_eth_send(struct udevice *dev, void *packet, int length) arp_recv->ar_op = htons(ARPOP_REPLY); memcpy(&arp_recv->ar_sha, priv->fake_host_hwaddr, ARP_HLEN); - NetWriteIP(&arp_recv->ar_spa, priv->fake_host_ipaddr); + net_write_ip(&arp_recv->ar_spa, priv->fake_host_ipaddr); memcpy(&arp_recv->ar_tha, &arp->ar_sha, ARP_HLEN); - NetCopyIP(&arp_recv->ar_tpa, &arp->ar_spa); + net_copy_ip(&arp_recv->ar_tpa, &arp->ar_spa);

priv->recv_packet_length = ETHER_HDR_SIZE + ARP_HDR_SIZE; @@ -121,9 +121,9 @@ static int sb_eth_send(struct udevice *dev, void *packet, int length) ARP_HLEN); ipr->ip_sum = 0; ipr->ip_off = 0; - NetCopyIP((void *)&ipr->ip_dst, &ip->ip_src); - NetWriteIP((void *)&ipr->ip_src, - priv->fake_host_ipaddr); + net_copy_ip((void *)&ipr->ip_dst, &ip->ip_src); + net_write_ip((void *)&ipr->ip_src, + priv->fake_host_ipaddr); ipr->ip_sum = compute_ip_checksum(ipr, IP_HDR_SIZE);

diff --git a/include/common.h b/include/common.h index 932b2fc..a079f13 100644 --- a/include/common.h +++ b/include/common.h @@ -826,7 +826,7 @@ int zzip(void *dst, unsigned long *lenp, unsigned char *src,

/* lib/net_utils.c */ #include <net.h> -static inline IPaddr_t getenv_IPaddr(char *var) +static inline struct in_addr getenv_ip(char *var) { return string_to_ip(getenv(var)); } diff --git a/include/net.h b/include/net.h index e7f28d7..2699c44 100644 --- a/include/net.h +++ b/include/net.h @@ -39,8 +39,9 @@ #define PKTALIGN ARCH_DMA_MINALIGN

/* IPv4 addresses are always 32 bits in size */ -typedef __be32 IPaddr_t; - +struct in_addr { + __be32 s_addr; +};

/** * An incoming packet handler. @@ -51,7 +52,7 @@ typedef __be32 IPaddr_t; * @param len packet length */ typedef void rxhand_f(uchar *pkt, unsigned dport, - IPaddr_t sip, unsigned sport, + struct in_addr sip, unsigned sport, unsigned len);

/** @@ -65,7 +66,7 @@ typedef void rxhand_f(uchar *pkt, unsigned dport, * @param len packet length */ typedef void rxhand_icmp_f(unsigned type, unsigned code, unsigned dport, - IPaddr_t sip, unsigned sport, uchar *pkt, unsigned len); + struct in_addr sip, unsigned sport, uchar *pkt, unsigned len);

/* * A timeout handler. Called after time interval has expired. @@ -237,7 +238,7 @@ void eth_halt(void); /* stop SCC */ const char *eth_get_name(void); /* get name of current device */

#ifdef CONFIG_MCAST_TFTP -int eth_mcast_join(IPaddr_t mcast_addr, int join); +int eth_mcast_join(struct in_addr mcast_addr, int join); u32 ether_crc(size_t len, unsigned char const *p); #endif

@@ -312,8 +313,8 @@ struct ip_hdr { uchar ip_ttl; /* time to live */ uchar ip_p; /* protocol */ ushort ip_sum; /* checksum */ - IPaddr_t ip_src; /* Source IP address */ - IPaddr_t ip_dst; /* Destination IP address */ + struct in_addr ip_src; /* Source IP address */ + struct in_addr ip_dst; /* Destination IP address */ };

#define IP_OFFS 0x1fff /* ip offset *= 8 */ @@ -336,8 +337,8 @@ struct ip_udp_hdr { uchar ip_ttl; /* time to live */ uchar ip_p; /* protocol */ ushort ip_sum; /* checksum */ - IPaddr_t ip_src; /* Source IP address */ - IPaddr_t ip_dst; /* Destination IP address */ + struct in_addr ip_src; /* Source IP address */ + struct in_addr ip_dst; /* Destination IP address */ ushort udp_src; /* UDP source port */ ushort udp_dst; /* UDP destination port */ ushort udp_len; /* Length of UDP packet */ @@ -452,17 +453,19 @@ struct icmp_hdr { * * Note: * - * All variables of type IPaddr_t are stored in NETWORK byte order + * All variables of type struct in_addr are stored in NETWORK byte order * (big endian). */

/* net.c */ /** BOOTP EXTENTIONS **/ -extern IPaddr_t NetOurGatewayIP; /* Our gateway IP address */ -extern IPaddr_t NetOurSubnetMask; /* Our subnet mask (0 = unknown) */ -extern IPaddr_t NetOurDNSIP; /* Our Domain Name Server (0 = unknown) */ +extern struct in_addr net_gateway; /* Our gateway IP address */ +extern struct in_addr net_netmask; /* Our subnet mask (0 = unknown) */ +/* Our Domain Name Server (0 = unknown) */ +extern struct in_addr net_dns_server; #if defined(CONFIG_BOOTP_DNS2) -extern IPaddr_t NetOurDNS2IP; /* Our 2nd Domain Name Server (0 = unknown) */ +/* Our 2nd Domain Name Server (0 = unknown) */ +extern struct in_addr net_dns_server2; #endif extern char NetOurNISDomain[32]; /* Our NIS domain */ extern char NetOurHostName[32]; /* Our hostname */ @@ -472,8 +475,8 @@ extern ushort NetBootFileSize; /* Our boot file size in blocks */ extern ulong NetBootFileXferSize; /* size of bootfile in bytes */ extern uchar NetOurEther[6]; /* Our ethernet address */ extern uchar NetServerEther[6]; /* Boot server enet address */ -extern IPaddr_t NetOurIP; /* Our IP addr (0 = unknown) */ -extern IPaddr_t NetServerIP; /* Server IP addr (0 = unknown) */ +extern struct in_addr net_ip; /* Our IP addr (0 = unknown) */ +extern struct in_addr net_server_ip; /* Server IP addr (0 = unknown) */ extern uchar *NetTxPacket; /* THE transmit packet */ #ifdef CONFIG_DM_ETH extern uchar *net_rx_packets[PKTBUFSRX]; /* Receive packets */ @@ -507,7 +510,7 @@ extern char *NetDNSenvvar; /* the env var to put the ip into */ #endif

#if defined(CONFIG_CMD_PING) -extern IPaddr_t NetPingIP; /* the ip address to ping */ +extern struct in_addr net_ping_ip; /* the ip address to ping */ #endif

#if defined(CONFIG_CMD_CDP) @@ -527,12 +530,12 @@ static inline int is_cdp_packet(const uchar *et_addr) #endif

#if defined(CONFIG_CMD_SNTP) -extern IPaddr_t NetNtpServerIP; /* the ip address to NTP */ +extern struct in_addr net_ntp_server; /* the ip address to NTP */ extern int NetTimeOffset; /* offset time from UTC */ #endif

#if defined(CONFIG_MCAST_TFTP) -extern IPaddr_t Mcast_addr; +extern struct in_addr net_mcast_addr; #endif

/* Initialize the network adapter */ @@ -553,8 +556,8 @@ int NetSetEther(uchar *, uchar *, uint); int net_update_ether(struct ethernet_hdr *et, uchar *addr, uint prot);

/* Set IP header */ -void net_set_ip_header(uchar *pkt, IPaddr_t dest, IPaddr_t source); -void net_set_udp_header(uchar *pkt, IPaddr_t dest, int dport, +void net_set_ip_header(uchar *pkt, struct in_addr dest, struct in_addr source); +void net_set_udp_header(uchar *pkt, struct in_addr dest, int dport, int sport, int len);

/** @@ -627,7 +630,7 @@ static inline void NetSendPacket(uchar *pkt, int len) * @param sport Source UDP port * @param payload_len Length of data after the UDP header */ -int NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport, +int NetSendUDPPacket(uchar *ether, struct in_addr dest, int dport, int sport, int payload_len);

#ifndef CONFIG_DM_ETH @@ -638,7 +641,7 @@ void net_process_received_packet(uchar *in_packet, int len);

#ifdef CONFIG_NETCONSOLE void NcStart(void); -int nc_input_packet(uchar *pkt, IPaddr_t src_ip, unsigned dest_port, +int nc_input_packet(uchar *pkt, struct in_addr src_ip, unsigned dest_port, unsigned src_port, unsigned len); #endif

@@ -676,9 +679,9 @@ void net_auto_load(void); * footprint in our tests. */ /* return IP *in network byteorder* */ -static inline IPaddr_t NetReadIP(void *from) +static inline struct in_addr net_read_ip(void *from) { - IPaddr_t ip; + struct in_addr ip;

memcpy((void *)&ip, (void *)from, sizeof(ip)); return ip; @@ -694,15 +697,15 @@ static inline ulong NetReadLong(ulong *from) }

/* write IP *in network byteorder* */ -static inline void NetWriteIP(void *to, IPaddr_t ip) +static inline void net_write_ip(void *to, struct in_addr ip) { memcpy(to, (void *)&ip, sizeof(ip)); }

/* copy IP */ -static inline void NetCopyIP(void *to, void *from) +static inline void net_copy_ip(void *to, void *from) { - memcpy((void *)to, from, sizeof(IPaddr_t)); + memcpy((void *)to, from, sizeof(struct in_addr)); }

/* copy ulong */ @@ -782,10 +785,10 @@ static inline void eth_random_addr(uchar *addr) }

/* Convert an IP address to a string */ -void ip_to_string(IPaddr_t x, char *s); +void ip_to_string(struct in_addr x, char *s);

/* Convert a string to ip address */ -IPaddr_t string_to_ip(const char *s); +struct in_addr string_to_ip(const char *s);

/* Convert a VLAN id to a string */ void VLAN_to_string(ushort x, char *s); diff --git a/lib/net_utils.c b/lib/net_utils.c index 8d66163..cfae842 100644 --- a/lib/net_utils.c +++ b/lib/net_utils.c @@ -12,23 +12,25 @@

#include <common.h>

-IPaddr_t string_to_ip(const char *s) +struct in_addr string_to_ip(const char *s) { - IPaddr_t addr; + struct in_addr addr; char *e; int i;

+ addr.s_addr = 0; if (s == NULL) - return(0); + return addr;

- for (addr=0, i=0; i<4; ++i) { + for (addr.s_addr = 0, i = 0; i < 4; ++i) { ulong val = s ? simple_strtoul(s, &e, 10) : 0; - addr <<= 8; - addr |= (val & 0xFF); + addr.s_addr <<= 8; + addr.s_addr |= (val & 0xFF); if (s) { s = (*e) ? e+1 : e; } }

- return (htonl(addr)); + addr.s_addr = htonl(addr.s_addr); + return addr; } diff --git a/net/arp.c b/net/arp.c index 21ed31b..4971a53 100644 --- a/net/arp.c +++ b/net/arp.c @@ -27,8 +27,8 @@ # define ARP_TIMEOUT_COUNT CONFIG_NET_RETRY_COUNT #endif

-IPaddr_t NetArpWaitPacketIP; -static IPaddr_t NetArpWaitReplyIP; +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; @@ -42,15 +42,15 @@ void ArpInit(void) { /* XXX problem with bss workaround */ NetArpWaitPacketMAC = NULL; - NetArpWaitPacketIP = 0; - NetArpWaitReplyIP = 0; + net_arp_wait_packet_ip.s_addr = 0; + net_arp_wait_reply_ip.s_addr = 0; NetArpWaitTxPacketSize = 0; NetArpTxPacket = &NetArpPacketBuf[0] + (PKTALIGN - 1); NetArpTxPacket -= (ulong)NetArpTxPacket % PKTALIGN; }

-void arp_raw_request(IPaddr_t sourceIP, const uchar *targetEther, - IPaddr_t targetIP) +void arp_raw_request(struct in_addr source_ip, const uchar *targetEther, + struct in_addr target_ip) { uchar *pkt; struct arp_hdr *arp; @@ -72,35 +72,35 @@ void arp_raw_request(IPaddr_t sourceIP, const uchar *targetEther, arp->ar_op = htons(ARPOP_REQUEST);

memcpy(&arp->ar_sha, NetOurEther, ARP_HLEN); /* source ET addr */ - NetWriteIP(&arp->ar_spa, sourceIP); /* source IP addr */ + net_write_ip(&arp->ar_spa, source_ip); /* source IP addr */ memcpy(&arp->ar_tha, targetEther, ARP_HLEN); /* target ET addr */ - NetWriteIP(&arp->ar_tpa, targetIP); /* target IP addr */ + net_write_ip(&arp->ar_tpa, target_ip); /* target IP addr */

NetSendPacket(NetArpTxPacket, eth_hdr_size + ARP_HDR_SIZE); }

void ArpRequest(void) { - if ((NetArpWaitPacketIP & NetOurSubnetMask) != - (NetOurIP & NetOurSubnetMask)) { - if (NetOurGatewayIP == 0) { + if ((net_arp_wait_packet_ip.s_addr & net_netmask.s_addr) != + (net_ip.s_addr & net_netmask.s_addr)) { + if (net_gateway.s_addr == 0) { puts("## Warning: gatewayip needed but not set\n"); - NetArpWaitReplyIP = NetArpWaitPacketIP; + net_arp_wait_reply_ip = net_arp_wait_packet_ip; } else { - NetArpWaitReplyIP = NetOurGatewayIP; + net_arp_wait_reply_ip = net_gateway; } } else { - NetArpWaitReplyIP = NetArpWaitPacketIP; + net_arp_wait_reply_ip = net_arp_wait_packet_ip; }

- arp_raw_request(NetOurIP, NetEtherNullAddr, NetArpWaitReplyIP); + arp_raw_request(net_ip, NetEtherNullAddr, net_arp_wait_reply_ip); }

void ArpTimeoutCheck(void) { ulong t;

- if (!NetArpWaitPacketIP) + if (!net_arp_wait_packet_ip.s_addr) return;

t = get_timer(0); @@ -123,7 +123,7 @@ void ArpTimeoutCheck(void) void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) { struct arp_hdr *arp; - IPaddr_t reply_ip_addr; + struct in_addr reply_ip_addr; uchar *pkt; int eth_hdr_size;

@@ -152,10 +152,10 @@ void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) if (arp->ar_pln != ARP_PLEN) return;

- if (NetOurIP == 0) + if (net_ip.s_addr == 0) return;

- if (NetReadIP(&arp->ar_tpa) != NetOurIP) + if (net_read_ip(&arp->ar_tpa).s_addr != net_ip.s_addr) return;

switch (ntohs(arp->ar_op)) { @@ -167,9 +167,9 @@ void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) pkt += eth_hdr_size; arp->ar_op = htons(ARPOP_REPLY); memcpy(&arp->ar_tha, &arp->ar_sha, ARP_HLEN); - NetCopyIP(&arp->ar_tpa, &arp->ar_spa); + net_copy_ip(&arp->ar_tpa, &arp->ar_spa); memcpy(&arp->ar_sha, NetOurEther, ARP_HLEN); - NetCopyIP(&arp->ar_spa, &NetOurIP); + net_copy_ip(&arp->ar_spa, &net_ip);

#ifdef CONFIG_CMD_LINK_LOCAL /* @@ -180,8 +180,8 @@ void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) * reply to ARP request so that our reply will overwrite * the arp-proxy's instead of the other way around. */ - if ((NetReadIP(&arp->ar_tpa) & NetOurSubnetMask) != - (NetReadIP(&arp->ar_spa) & NetOurSubnetMask)) + if ((net_read_ip(&arp->ar_tpa).s_addr & net_netmask.s_addr) != + (net_read_ip(&arp->ar_spa).s_addr & net_netmask.s_addr)) udelay(5000); #endif NetSendPacket((uchar *)et, eth_hdr_size + ARP_HDR_SIZE); @@ -189,21 +189,21 @@ void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)

case ARPOP_REPLY: /* arp reply */ /* are we waiting for a reply */ - if (!NetArpWaitPacketIP) + if (!net_arp_wait_packet_ip.s_addr) break;

#ifdef CONFIG_KEEP_SERVERADDR - if (NetServerIP == NetArpWaitPacketIP) { + if (net_server_ip.s_addr == net_arp_wait_packet_ip.s_addr) { char buf[20]; sprintf(buf, "%pM", &arp->ar_sha); setenv("serveraddr", buf); } #endif

- reply_ip_addr = NetReadIP(&arp->ar_spa); + reply_ip_addr = net_read_ip(&arp->ar_spa);

/* matched waiting packet's address */ - if (reply_ip_addr == NetArpWaitReplyIP) { + 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); @@ -223,7 +223,7 @@ void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) NetSendPacket(NetTxPacket, NetArpWaitTxPacketSize);

/* no arp request pending now */ - NetArpWaitPacketIP = 0; + net_arp_wait_packet_ip.s_addr = 0; NetArpWaitTxPacketSize = 0; NetArpWaitPacketMAC = NULL;

diff --git a/net/arp.h b/net/arp.h index 3a0a13a..718342b 100644 --- a/net/arp.h +++ b/net/arp.h @@ -14,7 +14,7 @@

#include <common.h>

-extern IPaddr_t NetArpWaitPacketIP; +extern struct in_addr net_arp_wait_packet_ip; /* MAC address of waiting packet's destination */ extern uchar *NetArpWaitPacketMAC; extern int NetArpWaitTxPacketSize; @@ -23,8 +23,8 @@ extern int NetArpWaitTry;

void ArpInit(void); void ArpRequest(void); -void arp_raw_request(IPaddr_t sourceIP, const uchar *targetEther, - IPaddr_t targetIP); +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);

diff --git a/net/bootp.c b/net/bootp.c index 8106601..a56ed4c 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -60,9 +60,9 @@ ulong bootp_timeout; #if defined(CONFIG_CMD_DHCP) static dhcp_state_t dhcp_state = INIT; static unsigned long dhcp_leasetime; -static IPaddr_t NetDHCPServerIP; -static void DhcpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, - unsigned len); +static struct in_addr dhcp_server_ip; +static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip, + unsigned src, unsigned len);

/* For Debug */ #if 0 @@ -139,11 +139,11 @@ static int BootpCheckPkt(uchar *pkt, unsigned dest, unsigned src, unsigned len) static void BootpCopyNetParams(struct Bootp_t *bp) { #if !defined(CONFIG_BOOTP_SERVERIP) - IPaddr_t tmp_ip; + struct in_addr tmp_ip;

- NetCopyIP(&tmp_ip, &bp->bp_siaddr); - if (tmp_ip != 0) - NetCopyIP(&NetServerIP, &bp->bp_siaddr); + net_copy_ip(&tmp_ip, &bp->bp_siaddr); + if (tmp_ip.s_addr != 0) + net_copy_ip(&net_server_ip, &bp->bp_siaddr); memcpy(NetServerEther, ((struct ethernet_hdr *)NetRxPacket)->et_src, 6); if (strlen(bp->bp_file) > 0) copy_filename(BootFile, bp->bp_file, sizeof(BootFile)); @@ -157,7 +157,7 @@ static void BootpCopyNetParams(struct Bootp_t *bp) if (*BootFile) setenv("bootfile", BootFile); #endif - NetCopyIP(&NetOurIP, &bp->bp_yiaddr); + net_copy_ip(&net_ip, &bp->bp_yiaddr); }

static int truncate_sz(const char *name, int maxlen, int curlen) @@ -184,26 +184,28 @@ static void BootpVendorFieldProcess(u8 *ext) switch (*ext) { /* Fixed length fields */ case 1: /* Subnet mask */ - if (NetOurSubnetMask == 0) - NetCopyIP(&NetOurSubnetMask, (IPaddr_t *) (ext + 2)); + if (net_netmask.s_addr == 0) + net_copy_ip(&net_netmask, (struct in_addr *)(ext + 2)); break; case 2: /* Time offset - Not yet supported */ break; /* Variable length fields */ case 3: /* Gateways list */ - if (NetOurGatewayIP == 0) - NetCopyIP(&NetOurGatewayIP, (IPaddr_t *) (ext + 2)); + if (net_gateway.s_addr == 0) + net_copy_ip(&net_gateway, (struct in_addr *)(ext + 2)); break; case 4: /* Time server - Not yet supported */ break; case 5: /* IEN-116 name server - Not yet supported */ break; case 6: - if (NetOurDNSIP == 0) - NetCopyIP(&NetOurDNSIP, (IPaddr_t *) (ext + 2)); + if (net_dns_server.s_addr == 0) + net_copy_ip(&net_dns_server, + (struct in_addr *)(ext + 2)); #if defined(CONFIG_BOOTP_DNS2) - if ((NetOurDNS2IP == 0) && (size > 4)) - NetCopyIP(&NetOurDNS2IP, (IPaddr_t *) (ext + 2 + 4)); + if ((net_dns_server2.s_addr == 0) && (size > 4)) + net_copy_ip(&net_dns_server2, + (struct in_addr *)(ext + 2 + 4)); #endif break; case 7: /* Log server - Not yet supported */ @@ -262,7 +264,7 @@ static void BootpVendorFieldProcess(u8 *ext) break; #if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_NTPSERVER) case 42: /* NTP server IP */ - NetCopyIP(&NetNtpServerIP, (IPaddr_t *) (ext + 2)); + net_copy_ip(&net_ntp_server, (struct in_addr *)(ext + 2)); break; #endif /* Application layer fields */ @@ -295,11 +297,11 @@ static void BootpVendorProcess(u8 *ext, int size) }

debug("[BOOTP] Received fields:\n"); - if (NetOurSubnetMask) - debug("NetOurSubnetMask : %pI4\n", &NetOurSubnetMask); + if (net_netmask.s_addr) + debug("net_netmask : %pI4\n", &net_netmask);

- if (NetOurGatewayIP) - debug("NetOurGatewayIP : %pI4", &NetOurGatewayIP); + if (net_gateway.s_addr) + debug("net_gateway : %pI4", &net_gateway);

if (NetBootFileSize) debug("NetBootFileSize : %d\n", NetBootFileSize); @@ -317,17 +319,16 @@ static void BootpVendorProcess(u8 *ext, int size) debug("NetBootFileSize: %d\n", NetBootFileSize);

#if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_NTPSERVER) - if (NetNtpServerIP) - debug("NetNtpServerIP : %pI4\n", &NetNtpServerIP); + if (net_ntp_server) + debug("net_ntp_server : %pI4\n", &net_ntp_server); #endif }

/* * Handle a BOOTP received packet. */ -static void -BootpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, - unsigned len) +static void bootp_handler(uchar *pkt, unsigned dest, struct in_addr sip, + unsigned src, unsigned len) { struct Bootp_t *bp;

@@ -400,8 +401,8 @@ BootpTimeout(void) * Initialize BOOTP extension fields in the request. */ #if defined(CONFIG_CMD_DHCP) -static int DhcpExtended(u8 *e, int message_type, IPaddr_t ServerID, - IPaddr_t RequestedIP) +static int dhcp_extended(u8 *e, int message_type, struct in_addr server_ip, + struct in_addr requested_ip) { u8 *start = e; u8 *cnt; @@ -431,8 +432,8 @@ static int DhcpExtended(u8 *e, int message_type, IPaddr_t ServerID, *e++ = (576 - 312 + OPT_FIELD_SIZE) >> 8; *e++ = (576 - 312 + OPT_FIELD_SIZE) & 0xff;

- if (ServerID) { - int tmp = ntohl(ServerID); + if (server_ip.s_addr) { + int tmp = ntohl(server_ip.s_addr);

*e++ = 54; /* ServerID */ *e++ = 4; @@ -442,8 +443,8 @@ static int DhcpExtended(u8 *e, int message_type, IPaddr_t ServerID, *e++ = tmp & 0xff; }

- if (RequestedIP) { - int tmp = ntohl(RequestedIP); + if (requested_ip.s_addr) { + int tmp = ntohl(requested_ip.s_addr);

*e++ = 50; /* Requested IP */ *e++ = 4; @@ -561,7 +562,7 @@ static int DhcpExtended(u8 *e, int message_type, IPaddr_t ServerID, /* * Warning: no field size check - change CONFIG_BOOTP_* at your own risk! */ -static int BootpExtended(u8 *e) +static int bootp_extended(u8 *e) { u8 *start = e;

@@ -662,6 +663,8 @@ BootpRequest(void) ulong rand_ms; #endif ulong BootpID; + struct in_addr zero_ip; + struct in_addr bcast_ip;

bootstage_mark_name(BOOTSTAGE_ID_BOOTP_START, "bootp_start"); #if defined(CONFIG_CMD_DHCP) @@ -707,18 +710,20 @@ BootpRequest(void) bp->bp_hlen = HWL_ETHER; bp->bp_hops = 0; bp->bp_secs = htons(get_timer(0) / 1000); - NetWriteIP(&bp->bp_ciaddr, 0); - NetWriteIP(&bp->bp_yiaddr, 0); - NetWriteIP(&bp->bp_siaddr, 0); - NetWriteIP(&bp->bp_giaddr, 0); + zero_ip.s_addr = 0; + net_write_ip(&bp->bp_ciaddr, zero_ip); + net_write_ip(&bp->bp_yiaddr, zero_ip); + net_write_ip(&bp->bp_siaddr, zero_ip); + net_write_ip(&bp->bp_giaddr, zero_ip); memcpy(bp->bp_chaddr, NetOurEther, 6); copy_filename(bp->bp_file, BootFile, sizeof(bp->bp_file));

/* Request additional information from the BOOTP/DHCP server */ #if defined(CONFIG_CMD_DHCP) - extlen = DhcpExtended((u8 *)bp->bp_vend, DHCP_DISCOVER, 0, 0); + extlen = dhcp_extended((u8 *)bp->bp_vend, DHCP_DISCOVER, zero_ip, + zero_ip); #else - extlen = BootpExtended((u8 *)bp->bp_vend); + extlen = bootp_extended((u8 *)bp->bp_vend); #endif

/* @@ -740,14 +745,15 @@ BootpRequest(void) */ iplen = BOOTP_HDR_SIZE - OPT_FIELD_SIZE + extlen; pktlen = eth_hdr_size + IP_UDP_HDR_SIZE + iplen; - net_set_udp_header(iphdr, 0xFFFFFFFFL, PORT_BOOTPS, PORT_BOOTPC, iplen); + bcast_ip.s_addr = 0xFFFFFFFFL; + net_set_udp_header(iphdr, bcast_ip, PORT_BOOTPS, PORT_BOOTPC, iplen); NetSetTimeout(bootp_timeout, BootpTimeout);

#if defined(CONFIG_CMD_DHCP) dhcp_state = SELECTING; - net_set_udp_handler(DhcpHandler); + net_set_udp_handler(dhcp_handler); #else - net_set_udp_handler(BootpHandler); + net_set_udp_handler(bootp_handler); #endif NetSendPacket(NetTxPacket, pktlen); } @@ -765,7 +771,7 @@ static void DhcpOptionsProcess(uchar *popt, struct Bootp_t *bp) oplen = *(popt + 1); switch (*popt) { case 1: - NetCopyIP(&NetOurSubnetMask, (popt + 2)); + net_copy_ip(&net_netmask, (popt + 2)); break; #if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_TIMEOFFSET) case 2: /* Time offset */ @@ -775,13 +781,13 @@ static void DhcpOptionsProcess(uchar *popt, struct Bootp_t *bp) break; #endif case 3: - NetCopyIP(&NetOurGatewayIP, (popt + 2)); + net_copy_ip(&net_gateway, (popt + 2)); break; case 6: - NetCopyIP(&NetOurDNSIP, (popt + 2)); + net_copy_ip(&net_dns_server, (popt + 2)); #if defined(CONFIG_BOOTP_DNS2) if (*(popt + 1) > 4) - NetCopyIP(&NetOurDNS2IP, (popt + 2 + 4)); + net_copy_ip(&net_dns_server2, (popt + 2 + 4)); #endif break; case 12: @@ -802,7 +808,7 @@ static void DhcpOptionsProcess(uchar *popt, struct Bootp_t *bp) break; #if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_NTPSERVER) case 42: /* NTP server IP */ - NetCopyIP(&NetNtpServerIP, (popt + 2)); + net_copy_ip(&net_ntp_server, (popt + 2)); break; #endif case 51: @@ -811,7 +817,7 @@ static void DhcpOptionsProcess(uchar *popt, struct Bootp_t *bp) case 53: /* Ignore Message Type Option */ break; case 54: - NetCopyIP(&NetDHCPServerIP, (popt + 2)); + net_copy_ip(&dhcp_server_ip, (popt + 2)); break; case 58: /* Ignore Renewal Time Option */ break; @@ -878,7 +884,9 @@ static void DhcpSendRequestPkt(struct Bootp_t *bp_offer) struct Bootp_t *bp; int pktlen, iplen, extlen; int eth_hdr_size; - IPaddr_t OfferedIP; + struct in_addr offered_ip; + struct in_addr zero_ip; + struct in_addr bcast_ip;

debug("DhcpSendRequestPkt: Sending DHCPREQUEST\n"); pkt = NetTxPacket; @@ -903,7 +911,8 @@ static void DhcpSendRequestPkt(struct Bootp_t *bp_offer) * RFC3046 requires Relay Agents to discard packets with * nonzero and offered giaddr */ - NetWriteIP(&bp->bp_giaddr, 0); + zero_ip.s_addr = 0; + net_write_ip(&bp->bp_giaddr, zero_ip);

memcpy(bp->bp_chaddr, NetOurEther, 6);

@@ -918,13 +927,14 @@ static void DhcpSendRequestPkt(struct Bootp_t *bp_offer) */

/* Copy offered IP into the parameters request list */ - NetCopyIP(&OfferedIP, &bp_offer->bp_yiaddr); - extlen = DhcpExtended((u8 *)bp->bp_vend, DHCP_REQUEST, - NetDHCPServerIP, OfferedIP); + net_copy_ip(&offered_ip, &bp_offer->bp_yiaddr); + extlen = dhcp_extended((u8 *)bp->bp_vend, DHCP_REQUEST, + dhcp_server_ip, offered_ip);

iplen = BOOTP_HDR_SIZE - OPT_FIELD_SIZE + extlen; pktlen = eth_hdr_size + IP_UDP_HDR_SIZE + iplen; - net_set_udp_header(iphdr, 0xFFFFFFFFL, PORT_BOOTPS, PORT_BOOTPC, iplen); + bcast_ip.s_addr = 0xFFFFFFFFL; + net_set_udp_header(iphdr, bcast_ip, PORT_BOOTPS, PORT_BOOTPC, iplen);

#ifdef CONFIG_BOOTP_DHCP_REQUEST_DELAY udelay(CONFIG_BOOTP_DHCP_REQUEST_DELAY); @@ -936,9 +946,8 @@ static void DhcpSendRequestPkt(struct Bootp_t *bp_offer) /* * Handle DHCP received packets. */ -static void -DhcpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, - unsigned len) +static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip, + unsigned src, unsigned len) { struct Bootp_t *bp = (struct Bootp_t *)pkt;

@@ -993,7 +1002,7 @@ DhcpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, BootpCopyNetParams(bp); dhcp_state = BOUND; printf("DHCP client bound to address %pI4 (%lu ms)\n", - &NetOurIP, get_timer(bootp_start)); + &net_ip, get_timer(bootp_start)); bootstage_mark_name(BOOTSTAGE_ID_BOOTP_STOP, "bootp_stop");

diff --git a/net/bootp.h b/net/bootp.h index 3b95a0a..16f40dc 100644 --- a/net/bootp.h +++ b/net/bootp.h @@ -41,10 +41,10 @@ struct Bootp_t { ulong bp_id; /* Transaction ID */ ushort bp_secs; /* Seconds since boot */ ushort bp_spare1; /* Alignment */ - IPaddr_t bp_ciaddr; /* Client IP address */ - IPaddr_t bp_yiaddr; /* Your (client) IP address */ - IPaddr_t bp_siaddr; /* Server IP address */ - IPaddr_t bp_giaddr; /* Gateway IP address */ + struct in_addr bp_ciaddr; /* Client IP address */ + struct in_addr bp_yiaddr; /* Your (client) IP address */ + struct in_addr bp_siaddr; /* Server IP address */ + struct in_addr bp_giaddr; /* Gateway IP address */ uchar bp_chaddr[16]; /* Client hardware address */ char bp_sname[64]; /* Server host name */ char bp_file[128]; /* Boot file name */ diff --git a/net/dns.c b/net/dns.c index dd45320..6f8b1f2 100644 --- a/net/dns.c +++ b/net/dns.c @@ -5,7 +5,7 @@ * Copyright (c) 2009 Robin Getz rgetz@blackfin.uclinux.org * * This is a simple DNS implementation for U-Boot. It will use the first IP - * in the DNS response as NetServerIP. This can then be used for any other + * in the DNS response as net_server_ip. This can then be used for any other * network related activities. * * The packet handling is partly based on TADNS, original copyrights @@ -89,8 +89,8 @@ DnsSend(void)

DnsOurPort = random_port();

- NetSendUDPPacket(NetServerEther, NetOurDNSIP, DNS_SERVICE_PORT, - DnsOurPort, n); + NetSendUDPPacket(NetServerEther, net_dns_server, DNS_SERVICE_PORT, + DnsOurPort, n); debug("DNS packet sent\n"); }

@@ -101,15 +101,15 @@ DnsTimeout(void) net_set_state(NETLOOP_FAIL); }

-static void -DnsHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, unsigned len) +static void dns_handler(uchar *pkt, unsigned dest, struct in_addr sip, + unsigned src, unsigned len) { struct header *header; const unsigned char *p, *e, *s; u16 type, i; int found, stop, dlen; char IPStr[22]; - IPaddr_t IPAddress; + struct in_addr ip_addr;

debug("%s\n", __func__); @@ -180,10 +180,10 @@ DnsHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, unsigned len)

dlen = get_unaligned_be16(p+10); p += 12; - memcpy(&IPAddress, p, 4); + memcpy(&ip_addr, p, 4);

if (p + dlen <= e) { - ip_to_string(IPAddress, IPStr); + ip_to_string(ip_addr, IPStr); printf("%s\n", IPStr); if (NetDNSenvvar) setenv(NetDNSenvvar, IPStr); @@ -200,7 +200,7 @@ DnsStart(void) debug("%s\n", __func__);

NetSetTimeout(DNS_TIMEOUT, DnsTimeout); - net_set_udp_handler(DnsHandler); + net_set_udp_handler(dns_handler);

/* Clear a previous MAC address, the server IP might have changed. */ memset(NetServerEther, 0, sizeof(NetServerEther)); diff --git a/net/eth.c b/net/eth.c index 13b7723..930470e 100644 --- a/net/eth.c +++ b/net/eth.c @@ -766,14 +766,14 @@ int eth_initialize(void) * mcast_addr: multicast ipaddr from which multicast Mac is made * join: 1=join, 0=leave. */ -int eth_mcast_join(IPaddr_t mcast_ip, int join) +int eth_mcast_join(struct in_addr mcast_ip, int join) { u8 mcast_mac[6]; if (!eth_current || !eth_current->mcast) return -1; - mcast_mac[5] = htonl(mcast_ip) & 0xff; - mcast_mac[4] = (htonl(mcast_ip)>>8) & 0xff; - mcast_mac[3] = (htonl(mcast_ip)>>16) & 0x7f; + mcast_mac[5] = htonl(mcast_ip.s_addr) & 0xff; + mcast_mac[4] = (htonl(mcast_ip.s_addr)>>8) & 0xff; + mcast_mac[3] = (htonl(mcast_ip.s_addr)>>16) & 0x7f; mcast_mac[2] = 0x5e; mcast_mac[1] = 0x0; mcast_mac[0] = 0x1; diff --git a/net/link_local.c b/net/link_local.c index 4152fae..6d92c55 100644 --- a/net/link_local.c +++ b/net/link_local.c @@ -49,7 +49,7 @@ static enum ll_state_t { DISABLED } state = DISABLED;

-static IPaddr_t ip; +static struct in_addr ip; static int timeout_ms = -1; static unsigned deadline_ms; static unsigned conflicts; @@ -64,14 +64,16 @@ static void link_local_timeout(void); * Pick a random link local IP address on 169.254/16, except that * the first and last 256 addresses are reserved. */ -static IPaddr_t pick(void) +static struct in_addr pick(void) { unsigned tmp; + struct in_addr ip;

do { tmp = rand_r(&seed) & IN_CLASSB_HOST; } while (tmp > (IN_CLASSB_HOST - 0x0200)); - return (IPaddr_t) htonl((LINKLOCAL_ADDR + 0x0100) + tmp); + ip.s_addr = htonl((LINKLOCAL_ADDR + 0x0100) + tmp); + return ip; }

/** @@ -102,16 +104,17 @@ static void configure_wait(void)

void link_local_start(void) { - ip = getenv_IPaddr("llipaddr"); - if (ip != 0 && (ntohl(ip) & IN_CLASSB_NET) != LINKLOCAL_ADDR) { + ip = getenv_ip("llipaddr"); + if (ip.s_addr != 0 && + (ntohl(ip.s_addr) & IN_CLASSB_NET) != LINKLOCAL_ADDR) { puts("invalid link address"); net_set_state(NETLOOP_FAIL); return; } - NetOurSubnetMask = IN_CLASSB_NET; + net_netmask.s_addr = IN_CLASSB_NET;

seed = seed_mac(); - if (ip == 0) + if (ip.s_addr == 0) ip = pick();

state = PROBE; @@ -131,10 +134,12 @@ static void link_local_timeout(void) /* timeouts in the PROBE state mean no conflicting ARP packets have been received, so we can progress through the states */ if (nprobes < PROBE_NUM) { + struct in_addr zero_ip = {.s_addr = 0}; + nprobes++; debug_cond(DEBUG_LL_STATE, "probe/%u %s@%pI4\n", nprobes, eth_get_name(), &ip); - arp_raw_request(0, NetEtherNullAddr, ip); + arp_raw_request(zero_ip, NetEtherNullAddr, ip); timeout_ms = PROBE_MIN * 1000; timeout_ms += random_delay_ms(PROBE_MAX - PROBE_MIN); } else { @@ -172,7 +177,7 @@ static void link_local_timeout(void) /* Switch to monitor state */ state = MONITOR; printf("Successfully assigned %pI4\n", &ip); - NetCopyIP(&NetOurIP, &ip); + net_copy_ip(&net_ip, &ip); ready = 1; conflicts = 0; timeout_ms = -1; @@ -206,7 +211,7 @@ void link_local_receive_arp(struct arp_hdr *arp, int len) { int source_ip_conflict; int target_ip_conflict; - IPaddr_t null_ip = 0; + struct in_addr null_ip = {.s_addr = 0};

if (state == DISABLED) return; @@ -322,7 +327,7 @@ void link_local_receive_arp(struct arp_hdr *arp, int len) state = PROBE; debug("defend conflict -- starting over\n"); ready = 0; - NetOurIP = 0; + net_ip.s_addr = 0;

/* restart the whole protocol */ ip = pick(); diff --git a/net/net.c b/net/net.c index 69f38f7..b1b822d 100644 --- a/net/net.c +++ b/net/net.c @@ -112,14 +112,14 @@ DECLARE_GLOBAL_DATA_PTR; /** BOOTP EXTENTIONS **/

/* Our subnet mask (0=unknown) */ -IPaddr_t NetOurSubnetMask; +struct in_addr net_netmask; /* Our gateways IP address */ -IPaddr_t NetOurGatewayIP; +struct in_addr net_gateway; /* Our DNS IP address */ -IPaddr_t NetOurDNSIP; +struct in_addr net_dns_server; #if defined(CONFIG_BOOTP_DNS2) /* Our 2nd DNS IP address */ -IPaddr_t NetOurDNS2IP; +struct in_addr net_dns_server2; #endif /* Our NIS domain */ char NetOurNISDomain[32] = {0,}; @@ -131,7 +131,7 @@ char NetOurRootPath[64] = {0,}; ushort NetBootFileSize;

#ifdef CONFIG_MCAST_TFTP /* Multicast TFTP */ -IPaddr_t Mcast_addr; +struct in_addr net_mcast_addr; #endif

/** END OF BOOTP EXTENTIONS **/ @@ -143,9 +143,9 @@ uchar NetOurEther[6]; /* Boot server enet address */ uchar NetServerEther[6]; /* Our IP addr (0 = unknown) */ -IPaddr_t NetOurIP; +struct in_addr net_ip; /* Server IP addr (0 = unknown) */ -IPaddr_t NetServerIP; +struct in_addr net_server_ip; /* Current receive packet */ uchar *NetRxPacket; /* Current rx packet length */ @@ -178,7 +178,7 @@ char BootFile[128];

#if defined(CONFIG_CMD_SNTP) /* NTP server IP address */ -IPaddr_t NetNtpServerIP; +struct in_addr net_ntp_server; /* offset time from UTC */ int NetTimeOffset; #endif @@ -267,14 +267,14 @@ static void NetInitLoop(void)

/* update only when the environment has changed */ if (env_changed_id != env_id) { - NetOurIP = getenv_IPaddr("ipaddr"); - NetOurGatewayIP = getenv_IPaddr("gatewayip"); - NetOurSubnetMask = getenv_IPaddr("netmask"); - NetServerIP = getenv_IPaddr("serverip"); + net_ip = getenv_ip("ipaddr"); + net_gateway = getenv_ip("gatewayip"); + net_netmask = getenv_ip("netmask"); + net_server_ip = getenv_ip("serverip"); NetOurNativeVLAN = getenv_VLAN("nvlan"); NetOurVLAN = getenv_VLAN("vlan"); #if defined(CONFIG_CMD_DNS) - NetOurDNSIP = getenv_IPaddr("dnsip"); + net_dns_server = getenv_ip("dnsip"); #endif env_changed_id = env_id; } @@ -397,21 +397,21 @@ restart: #if defined(CONFIG_CMD_DHCP) case DHCP: BootpReset(); - NetOurIP = 0; + net_ip.s_addr = 0; DhcpRequest(); /* Basically same as BOOTP */ break; #endif

case BOOTP: BootpReset(); - NetOurIP = 0; + net_ip.s_addr = 0; BootpRequest(); break;

#if defined(CONFIG_CMD_RARP) case RARP: RarpTry = 0; - NetOurIP = 0; + net_ip.s_addr = 0; RarpRequest(); break; #endif @@ -496,7 +496,7 @@ restart: */ if (ctrlc()) { /* cancel any ARP that may not have completed */ - NetArpWaitPacketIP = 0; + net_arp_wait_packet_ip.s_addr = 0;

net_cleanup_loop(); eth_halt(); @@ -660,7 +660,7 @@ int NetStartAgain(void) */

static void dummy_handler(uchar *pkt, unsigned dport, - IPaddr_t sip, unsigned sport, + struct in_addr sip, unsigned sport, unsigned len) { } @@ -716,7 +716,7 @@ NetSetTimeout(ulong iv, thand_f *f) } }

-int NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport, int sport, +int NetSendUDPPacket(uchar *ether, struct in_addr dest, int dport, int sport, int payload_len) { uchar *pkt; @@ -729,11 +729,11 @@ int NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport, int sport, return -1;

/* convert to new style broadcast */ - if (dest == 0) - dest = 0xFFFFFFFF; + if (dest.s_addr == 0) + dest.s_addr = 0xFFFFFFFF;

/* if broadcast, make the ether address a broadcast and don't do ARP */ - if (dest == 0xFFFFFFFF) + if (dest.s_addr == 0xFFFFFFFF) ether = NetBcastAddr;

pkt = (uchar *)NetTxPacket; @@ -748,7 +748,7 @@ int NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport, int sport, debug_cond(DEBUG_DEV_PKT, "sending ARP for %pI4\n", &dest);

/* save the ip and eth addr for the packet to send after arp */ - NetArpWaitPacketIP = dest; + net_arp_wait_packet_ip = dest; NetArpWaitPacketMAC = ether;

/* size of the waiting packet */ @@ -946,7 +946,7 @@ static inline struct ip_udp_hdr *NetDefragment(struct ip_udp_hdr *ip, int *lenp) * @parma ip IP packet containing the ICMP */ static void receive_icmp(struct ip_udp_hdr *ip, int len, - IPaddr_t src_ip, struct ethernet_hdr *et) + struct in_addr src_ip, struct ethernet_hdr *et) { struct icmp_hdr *icmph = (struct icmp_hdr *)&ip->udp_src;

@@ -975,8 +975,8 @@ void net_process_received_packet(uchar *in_packet, int len) { struct ethernet_hdr *et; struct ip_udp_hdr *ip; - IPaddr_t dst_ip; - IPaddr_t src_ip; + struct in_addr dst_ip; + struct in_addr src_ip; int eth_proto; #if defined(CONFIG_CMD_CDP) int iscdp; @@ -1112,15 +1112,16 @@ void net_process_received_packet(uchar *in_packet, int len) return; } /* If it is not for us, ignore it */ - dst_ip = NetReadIP(&ip->ip_dst); - if (NetOurIP && dst_ip != NetOurIP && dst_ip != 0xFFFFFFFF) { + dst_ip = net_read_ip(&ip->ip_dst); + if (net_ip.s_addr && dst_ip.s_addr != net_ip.s_addr && + dst_ip.s_addr != 0xFFFFFFFF) { #ifdef CONFIG_MCAST_TFTP - if (Mcast_addr != dst_ip) + if (net_mcast_addr != dst_ip) #endif return; } /* Read source IP address for later use */ - src_ip = NetReadIP(&ip->ip_src); + src_ip = net_read_ip(&ip->ip_src); /* * The function returns the unchanged packet if it's not * a fragment, and either the complete packet or NULL if @@ -1169,10 +1170,10 @@ void net_process_received_packet(uchar *in_packet, int len)

xsum = ip->ip_p; xsum += (ntohs(ip->udp_len)); - xsum += (ntohl(ip->ip_src) >> 16) & 0x0000ffff; - xsum += (ntohl(ip->ip_src) >> 0) & 0x0000ffff; - xsum += (ntohl(ip->ip_dst) >> 16) & 0x0000ffff; - xsum += (ntohl(ip->ip_dst) >> 0) & 0x0000ffff; + xsum += (ntohl(ip->ip_src.s_addr) >> 16) & 0x0000ffff; + xsum += (ntohl(ip->ip_src.s_addr) >> 0) & 0x0000ffff; + xsum += (ntohl(ip->ip_dst.s_addr) >> 16) & 0x0000ffff; + xsum += (ntohl(ip->ip_dst.s_addr) >> 0) & 0x0000ffff;

sumlen = ntohs(ip->udp_len); sumptr = (ushort *) &(ip->udp_src); @@ -1232,7 +1233,7 @@ static int net_check_prereq(enum proto_t protocol) /* Fall through */ #if defined(CONFIG_CMD_PING) case PING: - if (NetPingIP == 0) { + if (net_ping_ip.s_addr == 0) { puts("*** ERROR: ping address not given\n"); return 1; } @@ -1240,7 +1241,7 @@ static int net_check_prereq(enum proto_t protocol) #endif #if defined(CONFIG_CMD_SNTP) case SNTP: - if (NetNtpServerIP == 0) { + if (net_ntp_server.s_addr == 0) { puts("*** ERROR: NTP server address not given\n"); return 1; } @@ -1248,7 +1249,7 @@ static int net_check_prereq(enum proto_t protocol) #endif #if defined(CONFIG_CMD_DNS) case DNS: - if (NetOurDNSIP == 0) { + if (net_dns_server.s_addr == 0) { puts("*** ERROR: DNS server address not given\n"); return 1; } @@ -1259,7 +1260,7 @@ static int net_check_prereq(enum proto_t protocol) #endif case TFTPGET: case TFTPPUT: - if (NetServerIP == 0) { + if (net_server_ip.s_addr == 0) { puts("*** ERROR: `serverip' not set\n"); return 1; } @@ -1271,7 +1272,7 @@ common:

case NETCONS: case TFTPSRV: - if (NetOurIP == 0) { + if (net_ip.s_addr == 0) { puts("*** ERROR: `ipaddr' not set\n"); return 1; } @@ -1373,7 +1374,7 @@ int net_update_ether(struct ethernet_hdr *et, uchar *addr, uint prot) } }

-void net_set_ip_header(uchar *pkt, IPaddr_t dest, IPaddr_t source) +void net_set_ip_header(uchar *pkt, struct in_addr dest, struct in_addr source) { struct ip_udp_hdr *ip = (struct ip_udp_hdr *)pkt;

@@ -1389,12 +1390,12 @@ void net_set_ip_header(uchar *pkt, IPaddr_t dest, IPaddr_t source) ip->ip_ttl = 255; ip->ip_sum = 0; /* already in network byte order */ - NetCopyIP((void *)&ip->ip_src, &source); + net_copy_ip((void *)&ip->ip_src, &source); /* already in network byte order */ - NetCopyIP((void *)&ip->ip_dst, &dest); + net_copy_ip((void *)&ip->ip_dst, &dest); }

-void net_set_udp_header(uchar *pkt, IPaddr_t dest, int dport, int sport, +void net_set_udp_header(uchar *pkt, struct in_addr dest, int dport, int sport, int len) { struct ip_udp_hdr *ip = (struct ip_udp_hdr *)pkt; @@ -1407,7 +1408,7 @@ void net_set_udp_header(uchar *pkt, IPaddr_t dest, int dport, int sport, if (len & 1) pkt[IP_UDP_HDR_SIZE + len] = 0;

- net_set_ip_header(pkt, dest, NetOurIP); + net_set_ip_header(pkt, dest, net_ip); ip->ip_len = htons(IP_UDP_HDR_SIZE + len); ip->ip_p = IPPROTO_UDP; ip->ip_sum = compute_ip_checksum(ip, IP_HDR_SIZE); @@ -1444,13 +1445,14 @@ unsigned int random_port(void) } #endif

-void ip_to_string(IPaddr_t x, char *s) +void ip_to_string(struct in_addr x, char *s) { - x = ntohl(x); + x.s_addr = ntohl(x.s_addr); sprintf(s, "%d.%d.%d.%d", - (int) ((x >> 24) & 0xff), - (int) ((x >> 16) & 0xff), - (int) ((x >> 8) & 0xff), (int) ((x >> 0) & 0xff) + (int) ((x.s_addr >> 24) & 0xff), + (int) ((x.s_addr >> 16) & 0xff), + (int) ((x.s_addr >> 8) & 0xff), + (int) ((x.s_addr >> 0) & 0xff) ); }

diff --git a/net/nfs.c b/net/nfs.c index 8e05ae5..34e5051 100644 --- a/net/nfs.c +++ b/net/nfs.c @@ -51,7 +51,7 @@ static char dirfh[NFS_FHSIZE]; /* file handle of directory */ static char filefh[NFS_FHSIZE]; /* file handle of kernel image */

static enum net_loop_state nfs_download_state; -static IPaddr_t NfsServerIP; +static struct in_addr nfs_server_ip; static int NfsSrvMountPort; static int NfsSrvNfsPort; static int NfsOurPort; @@ -211,8 +211,8 @@ rpc_req(int rpc_prog, int rpc_proc, uint32_t *data, int datalen) else sport = NfsSrvNfsPort;

- NetSendUDPPacket(NetServerEther, NfsServerIP, sport, NfsOurPort, - pktlen); + NetSendUDPPacket(NetServerEther, nfs_server_ip, sport, NfsOurPort, + pktlen); }

/************************************************************************** @@ -600,8 +600,8 @@ NfsTimeout(void) } }

-static void -NfsHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, unsigned len) +static void nfs_handler(uchar *pkt, unsigned dest, struct in_addr sip, + unsigned src, unsigned len) { int rlen; int reply; @@ -715,7 +715,7 @@ NfsStart(void) debug("%s\n", __func__); nfs_download_state = NETLOOP_FAIL;

- NfsServerIP = NetServerIP; + nfs_server_ip = net_server_ip; nfs_path = (char *)nfs_path_buff;

if (nfs_path == NULL) { @@ -726,10 +726,10 @@ NfsStart(void)

if (BootFile[0] == '\0') { sprintf(default_filename, "/nfsroot/%02X%02X%02X%02X.img", - NetOurIP & 0xFF, - (NetOurIP >> 8) & 0xFF, - (NetOurIP >> 16) & 0xFF, - (NetOurIP >> 24) & 0xFF); + net_ip.s_addr & 0xFF, + (net_ip.s_addr >> 8) & 0xFF, + (net_ip.s_addr >> 16) & 0xFF, + (net_ip.s_addr >> 24) & 0xFF); strcpy(nfs_path, default_filename);

printf("*** Warning: no boot file name; using '%s'\n", @@ -740,7 +740,7 @@ NfsStart(void) p = strchr(p, ':');

if (p != NULL) { - NfsServerIP = string_to_ip(BootFile); + nfs_server_ip = string_to_ip(BootFile); ++p; strcpy(nfs_path, p); } else { @@ -753,17 +753,19 @@ NfsStart(void)

printf("Using %s device\n", eth_get_name());

- printf("File transfer via NFS from server %pI4" - "; our IP address is %pI4", &NfsServerIP, &NetOurIP); + printf("File transfer via NFS from server %pI4; our IP address is %pI4", + &nfs_server_ip, &net_ip);

/* Check if we need to send across this subnet */ - if (NetOurGatewayIP && NetOurSubnetMask) { - IPaddr_t OurNet = NetOurIP & NetOurSubnetMask; - IPaddr_t ServerNet = NetServerIP & NetOurSubnetMask; + if (net_gateway.s_addr && net_netmask.s_addr) { + struct in_addr our_net; + struct in_addr server_net;

- if (OurNet != ServerNet) + our_net.s_addr = net_ip.s_addr & net_netmask.s_addr; + server_net.s_addr = net_server_ip.s_addr & net_netmask.s_addr; + if (our_net.s_addr != server_net.s_addr) printf("; sending through gateway %pI4", - &NetOurGatewayIP); + &net_gateway); } printf("\nFilename '%s/%s'.", nfs_path, nfs_filename);

@@ -775,7 +777,7 @@ NfsStart(void) "Loading: *\b", load_addr);

NetSetTimeout(nfs_timeout, NfsTimeout); - net_set_udp_handler(NfsHandler); + net_set_udp_handler(nfs_handler);

NfsTimeoutCount = 0; NfsState = STATE_PRCLOOKUP_PROG_MOUNT_REQ; diff --git a/net/ping.c b/net/ping.c index 366f518..4918a1c 100644 --- a/net/ping.c +++ b/net/ping.c @@ -15,9 +15,9 @@ static ushort PingSeqNo;

/* The ip address to ping */ -IPaddr_t NetPingIP; +struct in_addr net_ping_ip;

-static void set_icmp_header(uchar *pkt, IPaddr_t dest) +static void set_icmp_header(uchar *pkt, struct in_addr dest) { /* * Construct an IP and ICMP header. @@ -25,7 +25,7 @@ static void set_icmp_header(uchar *pkt, IPaddr_t dest) struct ip_hdr *ip = (struct ip_hdr *)pkt; struct icmp_hdr *icmp = (struct icmp_hdr *)(pkt + IP_HDR_SIZE);

- net_set_ip_header(pkt, dest, NetOurIP); + net_set_ip_header(pkt, dest, net_ip);

ip->ip_len = htons(IP_ICMP_HDR_SIZE); ip->ip_p = IPPROTO_ICMP; @@ -46,14 +46,14 @@ static int ping_send(void)

/* XXX always send arp request */

- debug_cond(DEBUG_DEV_PKT, "sending ARP for %pI4\n", &NetPingIP); + debug_cond(DEBUG_DEV_PKT, "sending ARP for %pI4\n", &net_ping_ip);

- NetArpWaitPacketIP = NetPingIP; + net_arp_wait_packet_ip = net_ping_ip;

eth_hdr_size = NetSetEther(NetTxPacket, NetEtherNullAddr, PROT_IP); pkt = (uchar *)NetTxPacket + eth_hdr_size;

- set_icmp_header(pkt, NetPingIP); + set_icmp_header(pkt, net_ping_ip);

/* size of the waiting packet */ NetArpWaitTxPacketSize = eth_hdr_size + IP_ICMP_HDR_SIZE; @@ -82,13 +82,13 @@ void ping_start(void) void ping_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) { struct icmp_hdr *icmph = (struct icmp_hdr *)&ip->udp_src; - IPaddr_t src_ip; + struct in_addr src_ip; int eth_hdr_size;

switch (icmph->type) { case ICMP_ECHO_REPLY: - src_ip = NetReadIP((void *)&ip->ip_src); - if (src_ip == NetPingIP) + src_ip = net_read_ip((void *)&ip->ip_src); + if (src_ip.s_addr == net_ping_ip.s_addr) net_set_state(NETLOOP_SUCCESS); return; case ICMP_ECHO_REQUEST: @@ -99,8 +99,8 @@ void ping_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)

ip->ip_sum = 0; ip->ip_off = 0; - NetCopyIP((void *)&ip->ip_dst, &ip->ip_src); - NetCopyIP((void *)&ip->ip_src, &NetOurIP); + net_copy_ip((void *)&ip->ip_dst, &ip->ip_src); + net_copy_ip((void *)&ip->ip_src, &net_ip); ip->ip_sum = compute_ip_checksum(ip, IP_HDR_SIZE);

icmph->type = ICMP_ECHO_REPLY; diff --git a/net/rarp.c b/net/rarp.c index a8e0851..3e1c74c 100644 --- a/net/rarp.c +++ b/net/rarp.c @@ -43,9 +43,9 @@ void rarp_receive(struct ip_udp_hdr *ip, unsigned len)

puts("invalid RARP header\n"); } else { - NetCopyIP(&NetOurIP, &arp->ar_data[16]); - if (NetServerIP == 0) - NetCopyIP(&NetServerIP, &arp->ar_data[6]); + net_copy_ip(&net_ip, &arp->ar_data[16]); + if (net_server_ip.s_addr == 0) + net_copy_ip(&net_server_ip, &arp->ar_data[6]); memcpy(NetServerEther, &arp->ar_data[0], 6); debug_cond(DEBUG_DEV_PKT, "Got good RARP\n"); net_auto_load(); @@ -88,7 +88,7 @@ void RarpRequest(void) rarp->ar_pln = 4; rarp->ar_op = htons(RARPOP_REQUEST); memcpy(&rarp->ar_data[0], NetOurEther, 6); /* source ET addr */ - memcpy(&rarp->ar_data[6], &NetOurIP, 4); /* source IP addr */ + memcpy(&rarp->ar_data[6], &net_ip, 4); /* source IP addr */ /* dest ET addr = source ET addr ??*/ memcpy(&rarp->ar_data[10], NetOurEther, 6); /* dest IP addr set to broadcast */ diff --git a/net/sntp.c b/net/sntp.c index 5de1952..3e45a83 100644 --- a/net/sntp.c +++ b/net/sntp.c @@ -37,8 +37,8 @@ SntpSend(void) SntpOurPort = 10000 + (get_timer(0) % 4096); sport = NTP_SERVICE_PORT;

- NetSendUDPPacket(NetServerEther, NetNtpServerIP, sport, SntpOurPort, - pktlen); + NetSendUDPPacket(NetServerEther, net_ntp_server, sport, SntpOurPort, + pktlen); }

static void @@ -49,9 +49,8 @@ SntpTimeout(void) return; }

-static void -SntpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, - unsigned len) +static void sntp_handler(uchar *pkt, unsigned dest, struct in_addr sip, + unsigned src, unsigned len) { struct sntp_pkt_t *rpktp = (struct sntp_pkt_t *)pkt; struct rtc_time tm; @@ -85,7 +84,7 @@ SntpStart(void) debug("%s\n", __func__);

NetSetTimeout(SNTP_TIMEOUT, SntpTimeout); - net_set_udp_handler(SntpHandler); + net_set_udp_handler(sntp_handler); memset(NetServerEther, 0, sizeof(NetServerEther));

SntpSend(); diff --git a/net/tftp.c b/net/tftp.c index 51c67be..4c985fa 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -65,7 +65,7 @@ enum { TFTP_ERR_FILE_ALREADY_EXISTS = 6, };

-static IPaddr_t TftpRemoteIP; +static struct in_addr tftp_remote_ip; /* The UDP port at their end */ static int TftpRemotePort; /* The UDP port at our end */ @@ -146,12 +146,14 @@ static void parse_multicast_oack(char *pkt, int len); static void mcast_cleanup(void) { - if (Mcast_addr) - eth_mcast_join(Mcast_addr, 0); + if (net_mcast_addr) + eth_mcast_join(net_mcast_addr, 0); if (Bitmap) free(Bitmap); Bitmap = NULL; - Mcast_addr = Multicast = Mcast_port = 0; + net_mcast_addr.s_addr = 0; + Multicast = 0; + Mcast_port = 0; TftpEndingBlock = -1; }

@@ -433,13 +435,14 @@ TftpSend(void) break; }

- NetSendUDPPacket(NetServerEther, TftpRemoteIP, TftpRemotePort, + NetSendUDPPacket(NetServerEther, tftp_remote_ip, TftpRemotePort, TftpOurPort, len); }

#ifdef CONFIG_CMD_TFTPPUT static void icmp_handler(unsigned type, unsigned code, unsigned dest, - IPaddr_t sip, unsigned src, uchar *pkt, unsigned len) + struct in_addr sip, unsigned src, uchar *pkt, + unsigned len) { if (type == ICMP_NOT_REACH && code == ICMP_NOT_REACH_PORT) { /* Oh dear the other end has gone away */ @@ -448,9 +451,8 @@ static void icmp_handler(unsigned type, unsigned code, unsigned dest, } #endif

-static void -TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, - unsigned len) +static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, + unsigned src, unsigned len) { __be16 proto; __be16 *s; @@ -507,7 +509,7 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, #ifdef CONFIG_CMD_TFTPSRV case TFTP_WRQ: debug("Got WRQ\n"); - TftpRemoteIP = sip; + tftp_remote_ip = sip; TftpRemotePort = src; TftpOurPort = 1024 + (get_timer(0) % 3072); new_transfer(); @@ -717,13 +719,13 @@ void TftpStart(enum proto_t protocol) debug("TFTP blocksize = %i, timeout = %ld ms\n", TftpBlkSizeOption, TftpTimeoutMSecs);

- TftpRemoteIP = NetServerIP; + tftp_remote_ip = net_server_ip; if (BootFile[0] == '\0') { sprintf(default_filename, "%02X%02X%02X%02X.img", - NetOurIP & 0xFF, - (NetOurIP >> 8) & 0xFF, - (NetOurIP >> 16) & 0xFF, - (NetOurIP >> 24) & 0xFF); + net_ip.s_addr & 0xFF, + (net_ip.s_addr >> 8) & 0xFF, + (net_ip.s_addr >> 16) & 0xFF, + (net_ip.s_addr >> 24) & 0xFF);

strncpy(tftp_filename, default_filename, MAX_LEN); tftp_filename[MAX_LEN-1] = 0; @@ -737,7 +739,7 @@ void TftpStart(enum proto_t protocol) strncpy(tftp_filename, BootFile, MAX_LEN); tftp_filename[MAX_LEN-1] = 0; } else { - TftpRemoteIP = string_to_ip(BootFile); + tftp_remote_ip = string_to_ip(BootFile); strncpy(tftp_filename, p + 1, MAX_LEN); tftp_filename[MAX_LEN-1] = 0; } @@ -750,16 +752,17 @@ void TftpStart(enum proto_t protocol) #else "from", #endif - &TftpRemoteIP, &NetOurIP); + &tftp_remote_ip, &net_ip);

/* Check if we need to send across this subnet */ - if (NetOurGatewayIP && NetOurSubnetMask) { - IPaddr_t OurNet = NetOurIP & NetOurSubnetMask; - IPaddr_t RemoteNet = TftpRemoteIP & NetOurSubnetMask; - - if (OurNet != RemoteNet) - printf("; sending through gateway %pI4", - &NetOurGatewayIP); + if (net_gateway.s_addr && net_netmask.s_addr) { + struct in_addr our_net; + struct in_addr remote_net; + + our_net.s_addr = net_ip.s_addr & net_netmask.s_addr; + remote_net.s_addr = tftp_remote_ip.s_addr & net_netmask.s_addr; + if (our_net.s_addr != remote_net.s_addr) + printf("; sending through gateway %pI4", &net_gateway); } putc('\n');

@@ -792,7 +795,7 @@ void TftpStart(enum proto_t protocol) TftpTimeoutCountMax = TftpRRQTimeoutCountMax;

NetSetTimeout(TftpTimeoutMSecs, TftpTimeout); - net_set_udp_handler(TftpHandler); + net_set_udp_handler(tftp_handler); #ifdef CONFIG_CMD_TFTPPUT net_set_icmp_handler(icmp_handler); #endif @@ -833,7 +836,7 @@ TftpStartServer(void) tftp_filename[0] = 0;

printf("Using %s device\n", eth_get_name()); - printf("Listening for TFTP transfer on %pI4\n", &NetOurIP); + printf("Listening for TFTP transfer on %pI4\n", &net_ip); printf("Load address: 0x%lx\n", load_addr);

puts("Loading: *\b"); @@ -854,7 +857,7 @@ TftpStartServer(void) #endif

TftpState = STATE_RECV_WRQ; - net_set_udp_handler(TftpHandler); + net_set_udp_handler(tftp_handler);

/* zero out server ether in case the server ip has changed */ memset(NetServerEther, 0, 6); @@ -880,7 +883,7 @@ TftpStartServer(void) static void parse_multicast_oack(char *pkt, int len) { int i; - IPaddr_t addr; + struct in_addr addr; char *mc_adr, *port, *mc;

mc_adr = port = mc = NULL; @@ -935,11 +938,11 @@ static void parse_multicast_oack(char *pkt, int len) Multicast = 1; } addr = string_to_ip(mc_adr); - if (Mcast_addr != addr) { - if (Mcast_addr) - eth_mcast_join(Mcast_addr, 0); - Mcast_addr = addr; - if (eth_mcast_join(Mcast_addr, 1)) { + if (net_mcast_addr.s_addr != addr.s_addr) { + if (net_mcast_addr.s_addr) + eth_mcast_join(net_mcast_addr, 0); + net_mcast_addr = addr; + if (eth_mcast_join(net_mcast_addr, 1)) { printf("Fail to set mcast, revert to TFTP\n"); ProhibitMcast = 1; mcast_cleanup(); diff --git a/test/dm/eth.c b/test/dm/eth.c index 1923670..22fd26e 100644 --- a/test/dm/eth.c +++ b/test/dm/eth.c @@ -20,7 +20,7 @@ DECLARE_GLOBAL_DATA_PTR;

static int dm_test_eth(struct dm_test_state *dms) { - NetPingIP = string_to_ip("1.1.2.2"); + net_ping_ip = string_to_ip("1.1.2.2");

setenv("ethact", "eth@10002000"); ut_assertok(NetLoop(PING)); @@ -40,7 +40,7 @@ DM_TEST(dm_test_eth, DM_TESTF_SCAN_FDT);

static int dm_test_eth_alias(struct dm_test_state *dms) { - NetPingIP = string_to_ip("1.1.2.2"); + net_ping_ip = string_to_ip("1.1.2.2"); setenv("ethact", "eth0"); ut_assertok(NetLoop(PING)); ut_asserteq_str("eth@10002000", getenv("ethact")); @@ -64,7 +64,7 @@ DM_TEST(dm_test_eth_alias, DM_TESTF_SCAN_FDT);

static int dm_test_eth_prime(struct dm_test_state *dms) { - NetPingIP = string_to_ip("1.1.2.2"); + net_ping_ip = string_to_ip("1.1.2.2");

/* Expected to be "eth@10003000" because of ethprime variable */ setenv("ethact", NULL); @@ -87,7 +87,7 @@ static int dm_test_eth_rotate(struct dm_test_state *dms) char ethaddr[18];

/* Invalidate eth1's MAC address */ - NetPingIP = string_to_ip("1.1.2.2"); + net_ping_ip = string_to_ip("1.1.2.2"); strcpy(ethaddr, getenv("eth1addr")); setenv("eth1addr", NULL);

@@ -126,7 +126,7 @@ DM_TEST(dm_test_eth_rotate, DM_TESTF_SCAN_FDT);

static int dm_test_net_retry(struct dm_test_state *dms) { - NetPingIP = string_to_ip("1.1.2.2"); + net_ping_ip = string_to_ip("1.1.2.2");

/* * eth1 is disabled and netretry is yes, so the ping should succeed and

Remove CamelCase variable naming. Move the definition to the same compilation unit as the primary use.

Signed-off-by: Joe Hershberger joe.hershberger@ni.com ---

Changes in v2: None

common/cmd_net.c | 12 ++++++------ include/net.h | 6 +++--- net/bootp.c | 51 +++++++++++++++++++++++++++------------------------ net/net.c | 6 ------ 4 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/common/cmd_net.c b/common/cmd_net.c index d75718c..87c4ed1 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -124,11 +124,11 @@ static void netboot_update_env(void) setenv("netmask", tmp); }

- if (NetOurHostName[0]) - setenv("hostname", NetOurHostName); + if (net_hostname[0]) + setenv("hostname", net_hostname);

- if (NetOurRootPath[0]) - setenv("rootpath", NetOurRootPath); + if (net_root_path[0]) + setenv("rootpath", net_root_path);

if (net_ip.s_addr) { ip_to_string(net_ip, tmp); @@ -154,8 +154,8 @@ static void netboot_update_env(void) setenv("dnsip2", tmp); } #endif - if (NetOurNISDomain[0]) - setenv("domain", NetOurNISDomain); + if (net_nis_domain[0]) + setenv("domain", net_nis_domain);

#if defined(CONFIG_CMD_SNTP) \ && defined(CONFIG_BOOTP_TIMEOFFSET) diff --git a/include/net.h b/include/net.h index b484d4c..2664865 100644 --- a/include/net.h +++ b/include/net.h @@ -467,9 +467,9 @@ extern struct in_addr net_dns_server; /* Our 2nd Domain Name Server (0 = unknown) */ extern struct in_addr net_dns_server2; #endif -extern char NetOurNISDomain[32]; /* Our NIS domain */ -extern char NetOurHostName[32]; /* Our hostname */ -extern char NetOurRootPath[64]; /* Our root path */ +extern char net_nis_domain[32]; /* Our IS domain */ +extern char net_hostname[32]; /* Our hostname */ +extern char net_root_path[64]; /* Our root path */ /** END OF BOOTP EXTENTIONS **/ extern uchar NetOurEther[6]; /* Our ethernet address */ extern uchar NetServerEther[6]; /* Boot server enet address */ diff --git a/net/bootp.c b/net/bootp.c index 0148c19..9251e91 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -56,6 +56,9 @@ unsigned int bootp_num_ids; int BootpTry; ulong bootp_start; ulong bootp_timeout; +char net_nis_domain[32] = {0,}; /* Our NIS domain */ +char net_hostname[32] = {0,}; /* Our hostname */ +char net_root_path[64] = {0,}; /* Our bootpath */

#if defined(CONFIG_CMD_DHCP) static dhcp_state_t dhcp_state = INIT; @@ -220,11 +223,11 @@ static void BootpVendorFieldProcess(u8 *ext) case 11: /* RPL server - Not yet supported */ break; case 12: /* Host name */ - if (NetOurHostName[0] == 0) { + if (net_hostname[0] == 0) { size = truncate_sz("Host Name", - sizeof(NetOurHostName), size); - memcpy(&NetOurHostName, ext + 2, size); - NetOurHostName[size] = 0; + sizeof(net_hostname), size); + memcpy(&net_hostname, ext + 2, size); + net_hostname[size] = 0; } break; case 13: /* Boot file size */ @@ -242,11 +245,11 @@ static void BootpVendorFieldProcess(u8 *ext) case 16: /* Swap server - Not yet supported */ break; case 17: /* Root path */ - if (NetOurRootPath[0] == 0) { + if (net_root_path[0] == 0) { size = truncate_sz("Root Path", - sizeof(NetOurRootPath), size); - memcpy(&NetOurRootPath, ext + 2, size); - NetOurRootPath[size] = 0; + sizeof(net_root_path), size); + memcpy(&net_root_path, ext + 2, size); + net_root_path[size] = 0; } break; case 18: /* Extension path - Not yet supported */ @@ -258,11 +261,11 @@ static void BootpVendorFieldProcess(u8 *ext) break; /* IP host layer fields */ case 40: /* NIS Domain name */ - if (NetOurNISDomain[0] == 0) { + if (net_nis_domain[0] == 0) { size = truncate_sz("NIS Domain Name", - sizeof(NetOurNISDomain), size); - memcpy(&NetOurNISDomain, ext + 2, size); - NetOurNISDomain[size] = 0; + sizeof(net_nis_domain), size); + memcpy(&net_nis_domain, ext + 2, size); + net_nis_domain[size] = 0; } break; #if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_NTPSERVER) @@ -310,14 +313,14 @@ static void BootpVendorProcess(u8 *ext, int size) debug("net_boot_file_expected_size_in_blocks : %d\n", net_boot_file_expected_size_in_blocks);

- if (NetOurHostName[0]) - debug("NetOurHostName : %s\n", NetOurHostName); + if (net_hostname[0]) + debug("net_hostname : %s\n", net_hostname);

- if (NetOurRootPath[0]) - debug("NetOurRootPath : %s\n", NetOurRootPath); + if (net_root_path[0]) + debug("net_root_path : %s\n", net_root_path);

- if (NetOurNISDomain[0]) - debug("NetOurNISDomain : %s\n", NetOurNISDomain); + if (net_nis_domain[0]) + debug("net_nis_domain : %s\n", net_nis_domain);

#if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_NTPSERVER) if (net_ntp_server) @@ -793,17 +796,17 @@ static void DhcpOptionsProcess(uchar *popt, struct Bootp_t *bp) break; case 12: size = truncate_sz("Host Name", - sizeof(NetOurHostName), oplen); - memcpy(&NetOurHostName, popt + 2, size); - NetOurHostName[size] = 0; + sizeof(net_hostname), oplen); + memcpy(&net_hostname, popt + 2, size); + net_hostname[size] = 0; break; case 15: /* Ignore Domain Name Option */ break; case 17: size = truncate_sz("Root Path", - sizeof(NetOurRootPath), oplen); - memcpy(&NetOurRootPath, popt + 2, size); - NetOurRootPath[size] = 0; + sizeof(net_root_path), oplen); + memcpy(&net_root_path, popt + 2, size); + net_root_path[size] = 0; break; case 28: /* Ignore Broadcast Address Option */ break; diff --git a/net/net.c b/net/net.c index f60998b..bfa326e 100644 --- a/net/net.c +++ b/net/net.c @@ -121,12 +121,6 @@ struct in_addr net_dns_server; /* Our 2nd DNS IP address */ struct in_addr net_dns_server2; #endif -/* Our NIS domain */ -char NetOurNISDomain[32] = {0,}; -/* Our hostname */ -char NetOurHostName[32] = {0,}; -/* Our bootpath */ -char NetOurRootPath[64] = {0,};

#ifdef CONFIG_MCAST_TFTP /* Multicast TFTP */ struct in_addr net_mcast_addr;

This patch cleans up the names of internal packet buffer names that are used within the network stack and the functions that use them.

Signed-off-by: Joe Hershberger joe.hershberger@ni.com ---

Changes in v2: None

arch/powerpc/cpu/mpc8260/ether_fcc.c | 4 ++-- drivers/net/netconsole.c | 13 +++++------ include/net.h | 16 +++++++------- net/arp.c | 20 ++++++++--------- net/bootp.c | 16 +++++++------- net/cdp.c | 10 ++++----- net/dns.c | 7 +++--- net/net.c | 42 ++++++++++++++++++------------------ net/nfs.c | 8 +++---- net/ping.c | 6 +++--- net/rarp.c | 6 +++--- net/sntp.c | 8 +++---- net/tftp.c | 6 +++--- 13 files changed, 82 insertions(+), 80 deletions(-)

diff --git a/arch/powerpc/cpu/mpc8260/ether_fcc.c b/arch/powerpc/cpu/mpc8260/ether_fcc.c index 240e7ae..50d1654 100644 --- a/arch/powerpc/cpu/mpc8260/ether_fcc.c +++ b/arch/powerpc/cpu/mpc8260/ether_fcc.c @@ -720,8 +720,8 @@ eth_loopback_test (void) bdp->cbd_sc = BD_ENET_TX_READY | BD_ENET_TX_PAD | \ BD_ENET_TX_LAST | BD_ENET_TX_TC;

- memset ((void *)bp, patbytes[i], ELBT_BUFSZ); - NetSetEther(bp, net_bcast_ethaddr, 0x8000); + memset((void *)bp, patbytes[i], ELBT_BUFSZ); + net_set_ether(bp, net_bcast_ethaddr, 0x8000); } ecp->txbd[ELBT_NTXBD - 1].cbd_sc |= BD_ENET_TX_WRAP;

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 0d81b44..9aba0c5 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -125,10 +125,11 @@ void NcStart(void) /* send arp request */ uchar *pkt; net_set_arp_handler(nc_wait_arp_handler); - pkt = (uchar *)NetTxPacket + NetEthHdrSize() + IP_UDP_HDR_SIZE; + pkt = (uchar *)net_tx_packet + net_eth_hdr_size() + + IP_UDP_HDR_SIZE; memcpy(pkt, output_packet, output_packet_len); - NetSendUDPPacket(nc_ether, nc_ip, nc_out_port, nc_in_port, - output_packet_len); + net_send_udp_packet(nc_ether, nc_ip, nc_out_port, nc_in_port, + output_packet_len); } }

@@ -202,11 +203,11 @@ static void nc_send_packet(const char *buf, int len)

inited = 1; } - pkt = (uchar *)NetTxPacket + NetEthHdrSize() + IP_UDP_HDR_SIZE; + pkt = (uchar *)net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE; memcpy(pkt, buf, len); ether = nc_ether; ip = nc_ip; - NetSendUDPPacket(ether, ip, nc_out_port, nc_in_port, len); + net_send_udp_packet(ether, ip, nc_out_port, nc_in_port, len);

if (inited) { if (eth_is_on_demand_init()) @@ -229,7 +230,7 @@ static int nc_start(struct stdio_dev *dev)

/* * Initialize the static IP settings and buffer pointers - * incase we call NetSendUDPPacket before NetLoop + * incase we call net_send_udp_packet before NetLoop */ net_init();

diff --git a/include/net.h b/include/net.h index 33e542f..18ae7d2 100644 --- a/include/net.h +++ b/include/net.h @@ -475,14 +475,14 @@ extern u8 net_ethaddr[6]; /* Our ethernet address */ extern u8 net_server_ethaddr[6]; /* Boot server enet address */ extern struct in_addr net_ip; /* Our IP addr (0 = unknown) */ extern struct in_addr net_server_ip; /* Server IP addr (0 = unknown) */ -extern uchar *NetTxPacket; /* THE transmit packet */ +extern uchar *net_tx_packet; /* THE transmit packet */ #ifdef CONFIG_DM_ETH extern uchar *net_rx_packets[PKTBUFSRX]; /* Receive packets */ #else extern uchar *NetRxPackets[PKTBUFSRX]; /* Receive packets */ #endif -extern uchar *NetRxPacket; /* Current receive packet */ -extern int NetRxPacketLen; /* Current rx packet length */ +extern uchar *net_rx_packet; /* Current receive packet */ +extern int net_rx_packet_len; /* Current rx packet length */ extern unsigned NetIPID; /* IP ID (counting) */ extern const u8 net_bcast_ethaddr[6]; /* Ethernet broadcast address */ extern const u8 net_null_ethaddr[6]; @@ -550,10 +550,10 @@ void NetStop(void); int NetStartAgain(void);

/* Get size of the ethernet header when we send */ -int NetEthHdrSize(void); +int net_eth_hdr_size(void);

/* Set ethernet header; returns the size of the header */ -int NetSetEther(uchar *xet, const uchar *dest_ethaddr, uint prot); +int net_set_ether(uchar *xet, const uchar *dest_ethaddr, uint prot); int net_update_ether(struct ethernet_hdr *et, uchar *addr, uint prot);

/* Set IP header */ @@ -615,14 +615,14 @@ static inline void net_set_state(enum net_loop_state state) }

/* Transmit a packet */ -static inline void NetSendPacket(uchar *pkt, int len) +static inline void net_send_packet(uchar *pkt, int len) { /* Currently no way to return errors from eth_send() */ (void) eth_send(pkt, len); }

/* - * Transmit "NetTxPacket" as UDP packet, performing ARP request if needed + * Transmit "net_tx_packet" as UDP packet, performing ARP request if needed * (ether will be populated) * * @param ether Raw packet buffer @@ -631,7 +631,7 @@ static inline void NetSendPacket(uchar *pkt, int len) * @param sport Source UDP port * @param payload_len Length of data after the UDP header */ -int NetSendUDPPacket(uchar *ether, struct in_addr dest, int dport, +int net_send_udp_packet(uchar *ether, struct in_addr dest, int dport, int sport, int payload_len);

#ifndef CONFIG_DM_ETH diff --git a/net/arp.c b/net/arp.c index c613609..6841b61 100644 --- a/net/arp.c +++ b/net/arp.c @@ -35,7 +35,7 @@ int NetArpWaitTxPacketSize; ulong NetArpWaitTimerStart; int NetArpWaitTry;

-static uchar *NetArpTxPacket; /* THE ARP transmit packet */ +static uchar *net_arp_tx_packet; /* THE ARP transmit packet */ static uchar NetArpPacketBuf[PKTSIZE_ALIGN + PKTALIGN];

void ArpInit(void) @@ -45,8 +45,8 @@ void ArpInit(void) net_arp_wait_packet_ip.s_addr = 0; net_arp_wait_reply_ip.s_addr = 0; NetArpWaitTxPacketSize = 0; - NetArpTxPacket = &NetArpPacketBuf[0] + (PKTALIGN - 1); - NetArpTxPacket -= (ulong)NetArpTxPacket % PKTALIGN; + net_arp_tx_packet = &NetArpPacketBuf[0] + (PKTALIGN - 1); + net_arp_tx_packet -= (ulong)net_arp_tx_packet % PKTALIGN; }

void arp_raw_request(struct in_addr source_ip, const uchar *targetEther, @@ -58,9 +58,9 @@ void arp_raw_request(struct in_addr source_ip, const uchar *targetEther,

debug_cond(DEBUG_DEV_PKT, "ARP broadcast %d\n", NetArpWaitTry);

- pkt = NetArpTxPacket; + pkt = net_arp_tx_packet;

- eth_hdr_size = NetSetEther(pkt, net_bcast_ethaddr, PROT_ARP); + eth_hdr_size = net_set_ether(pkt, net_bcast_ethaddr, PROT_ARP); pkt += eth_hdr_size;

arp = (struct arp_hdr *) pkt; @@ -76,7 +76,7 @@ void arp_raw_request(struct in_addr source_ip, const uchar *targetEther, memcpy(&arp->ar_tha, targetEther, ARP_HLEN); /* target ET addr */ net_write_ip(&arp->ar_tpa, target_ip); /* target IP addr */

- NetSendPacket(NetArpTxPacket, eth_hdr_size + ARP_HDR_SIZE); + net_send_packet(net_arp_tx_packet, eth_hdr_size + ARP_HDR_SIZE); }

void ArpRequest(void) @@ -184,7 +184,7 @@ void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) (net_read_ip(&arp->ar_spa).s_addr & net_netmask.s_addr)) udelay(5000); #endif - NetSendPacket((uchar *)et, eth_hdr_size + ARP_HDR_SIZE); + net_send_packet((uchar *)et, eth_hdr_size + ARP_HDR_SIZE); return;

case ARPOP_REPLY: /* arp reply */ @@ -218,9 +218,9 @@ void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)

/* set the mac address in the waiting packet's header and transmit it */ - memcpy(((struct ethernet_hdr *)NetTxPacket)->et_dest, - &arp->ar_sha, ARP_HLEN); - NetSendPacket(NetTxPacket, NetArpWaitTxPacketSize); + memcpy(((struct ethernet_hdr *)net_tx_packet)->et_dest, + &arp->ar_sha, ARP_HLEN); + net_send_packet(net_tx_packet, NetArpWaitTxPacketSize);

/* no arp request pending now */ net_arp_wait_packet_ip.s_addr = 0; diff --git a/net/bootp.c b/net/bootp.c index 9b27d4c..9788b52 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -147,8 +147,8 @@ static void BootpCopyNetParams(struct Bootp_t *bp) net_copy_ip(&tmp_ip, &bp->bp_siaddr); if (tmp_ip.s_addr != 0) net_copy_ip(&net_server_ip, &bp->bp_siaddr); - memcpy(net_server_ethaddr, ((struct ethernet_hdr *)NetRxPacket)->et_src, - 6); + memcpy(net_server_ethaddr, + ((struct ethernet_hdr *)net_rx_packet)->et_src, 6); if (strlen(bp->bp_file) > 0) copy_filename(net_boot_file_name, bp->bp_file, sizeof(net_boot_file_name)); @@ -691,10 +691,10 @@ BootpRequest(void) #endif /* CONFIG_BOOTP_RANDOM_DELAY */

printf("BOOTP broadcast %d\n", ++BootpTry); - pkt = NetTxPacket; + pkt = net_tx_packet; memset((void *)pkt, 0, PKTSIZE);

- eth_hdr_size = NetSetEther(pkt, net_bcast_ethaddr, PROT_IP); + eth_hdr_size = net_set_ether(pkt, net_bcast_ethaddr, PROT_IP); pkt += eth_hdr_size;

/* @@ -760,7 +760,7 @@ BootpRequest(void) #else net_set_udp_handler(bootp_handler); #endif - NetSendPacket(NetTxPacket, pktlen); + net_send_packet(net_tx_packet, pktlen); }

#if defined(CONFIG_CMD_DHCP) @@ -894,10 +894,10 @@ static void DhcpSendRequestPkt(struct Bootp_t *bp_offer) struct in_addr bcast_ip;

debug("DhcpSendRequestPkt: Sending DHCPREQUEST\n"); - pkt = NetTxPacket; + pkt = net_tx_packet; memset((void *)pkt, 0, PKTSIZE);

- eth_hdr_size = NetSetEther(pkt, net_bcast_ethaddr, PROT_IP); + eth_hdr_size = net_set_ether(pkt, net_bcast_ethaddr, PROT_IP); pkt += eth_hdr_size;

iphdr = pkt; /* We'll need this later to set proper pkt size */ @@ -945,7 +945,7 @@ static void DhcpSendRequestPkt(struct Bootp_t *bp_offer) udelay(CONFIG_BOOTP_DHCP_REQUEST_DELAY); #endif /* CONFIG_BOOTP_DHCP_REQUEST_DELAY */ debug("Transmitting DHCPREQUEST packet: len = %d\n", pktlen); - NetSendPacket(NetTxPacket, pktlen); + net_send_packet(net_tx_packet, pktlen); }

/* diff --git a/net/cdp.c b/net/cdp.c index e8e7a67..392437d 100644 --- a/net/cdp.c +++ b/net/cdp.c @@ -118,7 +118,7 @@ CDPSendTrigger(void) char buf[32]; #endif

- pkt = NetTxPacket; + pkt = net_tx_packet; et = (struct ethernet_hdr *)pkt;

/* NOTE: trigger sent not on any VLAN */ @@ -207,17 +207,17 @@ CDPSendTrigger(void) #endif

/* length of ethernet packet */ - len = (uchar *)s - ((uchar *)NetTxPacket + ETHER_HDR_SIZE); + len = (uchar *)s - ((uchar *)net_tx_packet + ETHER_HDR_SIZE); et->et_protlen = htons(len);

len = ETHER_HDR_SIZE + sizeof(CDP_SNAP_hdr); - chksum = CDP_compute_csum((uchar *)NetTxPacket + len, - (uchar *)s - (NetTxPacket + len)); + chksum = CDP_compute_csum((uchar *)net_tx_packet + len, + (uchar *)s - (net_tx_packet + len)); if (chksum == 0) chksum = 0xFFFF; *cp = htons(chksum);

- NetSendPacket(NetTxPacket, (uchar *)s - NetTxPacket); + net_send_packet(net_tx_packet, (uchar *)s - net_tx_packet); return 0; }

diff --git a/net/dns.c b/net/dns.c index 0ff2b75..50d78ae 100644 --- a/net/dns.c +++ b/net/dns.c @@ -45,7 +45,8 @@ DnsSend(void) enum dns_query_type qtype = DNS_A_RECORD;

name = NetDNSResolve; - pkt = p = (uchar *)(NetTxPacket + NetEthHdrSize() + IP_UDP_HDR_SIZE); + pkt = (uchar *)(net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE); + p = pkt;

/* Prepare DNS packet header */ header = (struct header *) pkt; @@ -89,8 +90,8 @@ DnsSend(void)

DnsOurPort = random_port();

- NetSendUDPPacket(net_server_ethaddr, net_dns_server, DNS_SERVICE_PORT, - DnsOurPort, n); + net_send_udp_packet(net_server_ethaddr, net_dns_server, + DNS_SERVICE_PORT, DnsOurPort, n); debug("DNS packet sent\n"); }

diff --git a/net/net.c b/net/net.c index 6db2b9c..0e8e9c9 100644 --- a/net/net.c +++ b/net/net.c @@ -137,9 +137,9 @@ struct in_addr net_ip; /* Server IP addr (0 = unknown) */ struct in_addr net_server_ip; /* Current receive packet */ -uchar *NetRxPacket; +uchar *net_rx_packet; /* Current rx packet length */ -int NetRxPacketLen; +int net_rx_packet_len; /* IP packet ID */ unsigned NetIPID; /* Ethernet bcast address */ @@ -177,7 +177,7 @@ struct in_addr net_ntp_server; int NetTimeOffset; #endif

-static uchar PktBuf[(PKTBUFSRX+1) * PKTSIZE_ALIGN + PKTALIGN]; +static uchar net_pkt_buf[(PKTBUFSRX+1) * PKTSIZE_ALIGN + PKTALIGN]; #ifdef CONFIG_DM_ETH /* Receive packets */ uchar *net_rx_packets[PKTBUFSRX]; @@ -200,7 +200,7 @@ static ulong timeStart; /* Current timeout value */ static ulong timeDelta; /* THE transmit packet */ -uchar *NetTxPacket; +uchar *net_tx_packet;

static int net_check_prereq(enum proto_t protocol);

@@ -301,16 +301,17 @@ void net_init(void) */ int i;

- NetTxPacket = &PktBuf[0] + (PKTALIGN - 1); - NetTxPacket -= (ulong)NetTxPacket % PKTALIGN; + net_tx_packet = &net_pkt_buf[0] + (PKTALIGN - 1); + net_tx_packet -= (ulong)net_tx_packet % PKTALIGN; #ifdef CONFIG_DM_ETH for (i = 0; i < PKTBUFSRX; i++) { - net_rx_packets[i] = NetTxPacket + (i + 1) * - PKTSIZE_ALIGN; + net_rx_packets[i] = net_tx_packet + + (i + 1) * PKTSIZE_ALIGN; } #else for (i = 0; i < PKTBUFSRX; i++) - NetRxPackets[i] = NetTxPacket + (i + 1) * PKTSIZE_ALIGN; + NetRxPackets[i] = net_tx_packet + + (i + 1) * PKTSIZE_ALIGN; #endif ArpInit(); net_clear_handlers(); @@ -710,16 +711,16 @@ NetSetTimeout(ulong iv, thand_f *f) } }

-int NetSendUDPPacket(uchar *ether, struct in_addr dest, int dport, int sport, +int net_send_udp_packet(uchar *ether, struct in_addr dest, int dport, int sport, int payload_len) { uchar *pkt; int eth_hdr_size; int pkt_hdr_size;

- /* make sure the NetTxPacket is initialized (NetInit() was called) */ - assert(NetTxPacket != NULL); - if (NetTxPacket == NULL) + /* make sure the net_tx_packet is initialized (NetInit() was called) */ + assert(net_tx_packet != NULL); + if (net_tx_packet == NULL) return -1;

/* convert to new style broadcast */ @@ -730,9 +731,9 @@ int NetSendUDPPacket(uchar *ether, struct in_addr dest, int dport, int sport, if (dest.s_addr == 0xFFFFFFFF) ether = (uchar *)net_bcast_ethaddr;

- pkt = (uchar *)NetTxPacket; + pkt = (uchar *)net_tx_packet;

- eth_hdr_size = NetSetEther(pkt, ether, PROT_IP); + eth_hdr_size = net_set_ether(pkt, ether, PROT_IP); pkt += eth_hdr_size; net_set_udp_header(pkt, dest, dport, sport, payload_len); pkt_hdr_size = eth_hdr_size + IP_UDP_HDR_SIZE; @@ -756,7 +757,7 @@ int NetSendUDPPacket(uchar *ether, struct in_addr dest, int dport, int sport, } else { debug_cond(DEBUG_DEV_PKT, "sending UDP to %pI4/%pM\n", &dest, ether); - NetSendPacket(NetTxPacket, pkt_hdr_size + payload_len); + net_send_packet(net_tx_packet, pkt_hdr_size + payload_len); return 0; /* transmitted */ } } @@ -979,8 +980,8 @@ void net_process_received_packet(uchar *in_packet, int len)

debug_cond(DEBUG_NET_PKT, "packet received\n");

- NetRxPacket = in_packet; - NetRxPacketLen = len; + net_rx_packet = in_packet; + net_rx_packet_len = len; et = (struct ethernet_hdr *)in_packet;

/* too small packet? */ @@ -1307,7 +1308,7 @@ common: /**********************************************************************/

int -NetEthHdrSize(void) +net_eth_hdr_size(void) { ushort myvlanid;

@@ -1319,8 +1320,7 @@ NetEthHdrSize(void) VLAN_ETHER_HDR_SIZE; }

-int -NetSetEther(uchar *xet, const uchar *dest_ethaddr, uint prot) +int net_set_ether(uchar *xet, const uchar *dest_ethaddr, uint prot) { struct ethernet_hdr *et = (struct ethernet_hdr *)xet; ushort myvlanid; diff --git a/net/nfs.c b/net/nfs.c index 23a9cc3..6899265 100644 --- a/net/nfs.c +++ b/net/nfs.c @@ -201,8 +201,8 @@ rpc_req(int rpc_prog, int rpc_proc, uint32_t *data, int datalen)

pktlen = (char *)p + datalen*sizeof(uint32_t) - (char *)&pkt;

- memcpy((char *)NetTxPacket + NetEthHdrSize() + IP_UDP_HDR_SIZE, - (char *)&pkt, pktlen); + memcpy((char *)net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE, + (char *)&pkt, pktlen);

if (rpc_prog == PROG_PORTMAP) sport = SUNRPC_PORT; @@ -211,8 +211,8 @@ rpc_req(int rpc_prog, int rpc_proc, uint32_t *data, int datalen) else sport = NfsSrvNfsPort;

- NetSendUDPPacket(net_server_ethaddr, nfs_server_ip, sport, NfsOurPort, - pktlen); + net_send_udp_packet(net_server_ethaddr, nfs_server_ip, sport, + NfsOurPort, pktlen); }

/************************************************************************** diff --git a/net/ping.c b/net/ping.c index e4e3086..7c6084c 100644 --- a/net/ping.c +++ b/net/ping.c @@ -50,8 +50,8 @@ static int ping_send(void)

net_arp_wait_packet_ip = net_ping_ip;

- eth_hdr_size = NetSetEther(NetTxPacket, net_null_ethaddr, PROT_IP); - pkt = (uchar *)NetTxPacket + eth_hdr_size; + eth_hdr_size = net_set_ether(net_tx_packet, net_null_ethaddr, PROT_IP); + pkt = (uchar *)net_tx_packet + eth_hdr_size;

set_icmp_header(pkt, net_ping_ip);

@@ -106,7 +106,7 @@ void ping_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) icmph->type = ICMP_ECHO_REPLY; icmph->checksum = 0; icmph->checksum = compute_ip_checksum(icmph, len - IP_HDR_SIZE); - NetSendPacket((uchar *)et, eth_hdr_size + len); + net_send_packet((uchar *)et, eth_hdr_size + len); return; /* default: return;*/ diff --git a/net/rarp.c b/net/rarp.c index 2f5c104..f50d2fb 100644 --- a/net/rarp.c +++ b/net/rarp.c @@ -75,9 +75,9 @@ void RarpRequest(void) int eth_hdr_size;

printf("RARP broadcast %d\n", ++RarpTry); - pkt = NetTxPacket; + pkt = net_tx_packet;

- eth_hdr_size = NetSetEther(pkt, net_bcast_ethaddr, PROT_RARP); + eth_hdr_size = net_set_ether(pkt, net_bcast_ethaddr, PROT_RARP); pkt += eth_hdr_size;

rarp = (struct arp_hdr *)pkt; @@ -94,7 +94,7 @@ void RarpRequest(void) /* dest IP addr set to broadcast */ memset(&rarp->ar_data[16], 0xff, 4);

- NetSendPacket(NetTxPacket, eth_hdr_size + ARP_HDR_SIZE); + net_send_packet(net_tx_packet, eth_hdr_size + ARP_HDR_SIZE);

NetSetTimeout(TIMEOUT, RarpTimeout); } diff --git a/net/sntp.c b/net/sntp.c index b99aa3e..1e2b678 100644 --- a/net/sntp.c +++ b/net/sntp.c @@ -31,14 +31,14 @@ SntpSend(void) pkt.vn = NTP_VERSION; pkt.mode = NTP_MODE_CLIENT;

- memcpy((char *)NetTxPacket + NetEthHdrSize() + IP_UDP_HDR_SIZE, - (char *)&pkt, pktlen); + memcpy((char *)net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE, + (char *)&pkt, pktlen);

SntpOurPort = 10000 + (get_timer(0) % 4096); sport = NTP_SERVICE_PORT;

- NetSendUDPPacket(net_server_ethaddr, net_ntp_server, sport, SntpOurPort, - pktlen); + net_send_udp_packet(net_server_ethaddr, net_ntp_server, sport, + SntpOurPort, pktlen); }

static void diff --git a/net/tftp.c b/net/tftp.c index 8ddc7be..f25abaa 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -337,7 +337,7 @@ TftpSend(void) * We will always be sending some sort of packet, so * cobble together the packet headers now. */ - pkt = NetTxPacket + NetEthHdrSize() + IP_UDP_HDR_SIZE; + pkt = net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE;

switch (TftpState) { case STATE_SEND_RRQ: @@ -435,8 +435,8 @@ TftpSend(void) break; }

- NetSendUDPPacket(net_server_ethaddr, tftp_remote_ip, TftpRemotePort, - TftpOurPort, len); + net_send_udp_packet(net_server_ethaddr, tftp_remote_ip, TftpRemotePort, + TftpOurPort, len); }

#ifdef CONFIG_CMD_TFTPPUT

Make a thorough pass through all variables and function names contained within tftp and remove CamelCase and improve naming.

Signed-off-by: Joe Hershberger joe.hershberger@ni.com ---

Changes in v2: None

common/update.c | 16 +- net/net.c | 6 +- net/tftp.c | 483 ++++++++++++++++++++++++++++---------------------------- net/tftp.h | 8 +- 4 files changed, 259 insertions(+), 254 deletions(-)

diff --git a/common/update.c b/common/update.c index bc0c48f..1bf2f82 100644 --- a/common/update.c +++ b/common/update.c @@ -39,8 +39,8 @@ #define CONFIG_UPDATE_TFTP_CNT_MAX 0 #endif

-extern ulong TftpRRQTimeoutMSecs; -extern int TftpRRQTimeoutCountMax; +extern ulong tftp_timeout_ms; +extern int tftp_timeout_count_max; extern flash_info_t flash_info[]; extern ulong load_addr;

@@ -55,14 +55,14 @@ static int update_load(char *filename, ulong msec_max, int cnt_max, ulong addr)

rv = 0; /* save used globals and env variable */ - saved_timeout_msecs = TftpRRQTimeoutMSecs; - saved_timeout_count = TftpRRQTimeoutCountMax; + saved_timeout_msecs = tftp_timeout_ms; + saved_timeout_count = tftp_timeout_count_max; saved_netretry = strdup(getenv("netretry")); saved_bootfile = strdup(net_boot_file_name);

/* set timeouts for auto-update */ - TftpRRQTimeoutMSecs = msec_max; - TftpRRQTimeoutCountMax = cnt_max; + tftp_timeout_ms = msec_max; + tftp_timeout_count_max = cnt_max;

/* we don't want to retry the connection if errors occur */ setenv("netretry", "no"); @@ -78,8 +78,8 @@ static int update_load(char *filename, ulong msec_max, int cnt_max, ulong addr) flush_cache(addr, size);

/* restore changed globals and env variable */ - TftpRRQTimeoutMSecs = saved_timeout_msecs; - TftpRRQTimeoutCountMax = saved_timeout_count; + tftp_timeout_ms = saved_timeout_msecs; + tftp_timeout_count_max = saved_timeout_count;

setenv("netretry", saved_netretry); if (saved_netretry != NULL) diff --git a/net/net.c b/net/net.c index 5898260..b8acbb4 100644 --- a/net/net.c +++ b/net/net.c @@ -247,7 +247,7 @@ void net_auto_load(void) net_set_state(NETLOOP_SUCCESS); return; } - TftpStart(TFTPGET); + tftp_start(TFTPGET); }

static void NetInitLoop(void) @@ -372,11 +372,11 @@ restart: case TFTPPUT: #endif /* always use ARP to get server ethernet address */ - TftpStart(protocol); + tftp_start(protocol); break; #ifdef CONFIG_CMD_TFTPSRV case TFTPSRV: - TftpStartServer(); + tftp_start_server(); break; #endif #if defined(CONFIG_CMD_DHCP) diff --git a/net/tftp.c b/net/tftp.c index f25abaa..14acf04 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -39,21 +39,21 @@ #define TFTP_ERROR 5 #define TFTP_OACK 6

-static ulong TftpTimeoutMSecs = TIMEOUT; -static int TftpTimeoutCountMax = TIMEOUT_COUNT; +static ulong timeout_ms = TIMEOUT; +static int timeout_count_max = TIMEOUT_COUNT; static ulong time_start; /* Record time we started tftp */

/* * These globals govern the timeout behavior when attempting a connection to a - * TFTP server. TftpRRQTimeoutMSecs specifies the number of milliseconds to + * TFTP server. tftp_timeout_ms specifies the number of milliseconds to * wait for the server to respond to initial connection. Second global, - * TftpRRQTimeoutCountMax, gives the number of such connection retries. - * TftpRRQTimeoutCountMax must be non-negative and TftpRRQTimeoutMSecs must be + * tftp_timeout_count_max, gives the number of such connection retries. + * tftp_timeout_count_max must be non-negative and tftp_timeout_ms must be * positive. The globals are meant to be set (and restored) by code needing * non-standard timeout behavior when initiating a TFTP transfer. */ -ulong TftpRRQTimeoutMSecs = TIMEOUT; -int TftpRRQTimeoutCountMax = TIMEOUT_COUNT; +ulong tftp_timeout_ms = TIMEOUT; +int tftp_timeout_count_max = TIMEOUT_COUNT;

enum { TFTP_ERR_UNDEFINED = 0, @@ -67,30 +67,32 @@ enum {

static struct in_addr tftp_remote_ip; /* The UDP port at their end */ -static int TftpRemotePort; +static int tftp_remote_port; /* The UDP port at our end */ -static int TftpOurPort; -static int TftpTimeoutCount; +static int tftp_our_port; +static int timeout_count; /* packet sequence number */ -static ulong TftpBlock; +static ulong tftp_cur_block; /* last packet sequence number received */ -static ulong TftpLastBlock; +static ulong tftp_prev_block; /* count of sequence number wraparounds */ -static ulong TftpBlockWrap; +static ulong tftp_block_wrap; /* memory offset due to wrapping */ -static ulong TftpBlockWrapOffset; -static int TftpState; +static ulong tftp_block_wrap_offset; +static int tftp_state; #ifdef CONFIG_TFTP_TSIZE /* The file size reported by the server */ -static int TftpTsize; +static int tftp_tsize; /* The number of hashes we printed */ -static short TftpNumchars; +static short tftp_tsize_num_hash; #endif #ifdef CONFIG_CMD_TFTPPUT -static int TftpWriting; /* 1 if writing, else 0 */ -static int TftpFinalBlock; /* 1 if we have sent the last block */ +/* 1 if writing, else 0 */ +static int tftp_put_active; +/* 1 if we have sent the last block */ +static int tftp_put_final_block_sent; #else -#define TftpWriting 0 +#define tftp_put_active 0 #endif

#define STATE_SEND_RRQ 1 @@ -128,41 +130,42 @@ static char tftp_filename[MAX_LEN]; #define TFTP_MTU_BLOCKSIZE 1468 #endif

-static unsigned short TftpBlkSize = TFTP_BLOCK_SIZE; -static unsigned short TftpBlkSizeOption = TFTP_MTU_BLOCKSIZE; +static unsigned short tftp_block_size = TFTP_BLOCK_SIZE; +static unsigned short tftp_block_size_option = TFTP_MTU_BLOCKSIZE;

#ifdef CONFIG_MCAST_TFTP #include <malloc.h> #define MTFTP_BITMAPSIZE 0x1000 -static unsigned *Bitmap; -static int PrevBitmapHole, Mapsize = MTFTP_BITMAPSIZE; -static uchar ProhibitMcast, MasterClient; -static uchar Multicast; -static int Mcast_port; -static ulong TftpEndingBlock; /* can get 'last' block before done..*/ +static unsigned *tftp_mcast_bitmap; +static int tftp_mcast_prev_hole; +static int tftp_mcast_bitmap_size = MTFTP_BITMAPSIZE; +static int tftp_mcast_disabled; +static int tftp_mcast_master_client; +static int tftp_mcast_active; +static int tftp_mcast_port; +/* can get 'last' block before done..*/ +static ulong tftp_mcast_ending_block;

static void parse_multicast_oack(char *pkt, int len);

-static void -mcast_cleanup(void) +static void mcast_cleanup(void) { if (net_mcast_addr) eth_mcast_join(net_mcast_addr, 0); - if (Bitmap) - free(Bitmap); - Bitmap = NULL; + if (tftp_mcast_bitmap) + free(tftp_mcast_bitmap); + tftp_mcast_bitmap = NULL; net_mcast_addr.s_addr = 0; - Multicast = 0; - Mcast_port = 0; - TftpEndingBlock = -1; + tftp_mcast_active = 0; + tftp_mcast_port = 0; + tftp_mcast_ending_block = -1; }

#endif /* CONFIG_MCAST_TFTP */

-static inline void -store_block(int block, uchar *src, unsigned len) +static inline void store_block(int block, uchar *src, unsigned len) { - ulong offset = block * TftpBlkSize + TftpBlockWrapOffset; + ulong offset = block * tftp_block_size + tftp_block_wrap_offset; ulong newsize = offset + len; #ifdef CONFIG_SYS_DIRECT_FLASH_TFTP int i, rc = 0; @@ -193,8 +196,8 @@ store_block(int block, uchar *src, unsigned len) unmap_sysmem(ptr); } #ifdef CONFIG_MCAST_TFTP - if (Multicast) - ext2_set_bit(block, Bitmap); + if (tftp_mcast_active) + ext2_set_bit(block, tftp_mcast_bitmap); #endif

if (net_boot_file_size < newsize) @@ -204,11 +207,11 @@ store_block(int block, uchar *src, unsigned len) /* Clear our state ready for a new transfer */ static void new_transfer(void) { - TftpLastBlock = 0; - TftpBlockWrap = 0; - TftpBlockWrapOffset = 0; + tftp_prev_block = 0; + tftp_block_wrap = 0; + tftp_block_wrap_offset = 0; #ifdef CONFIG_CMD_TFTPPUT - TftpFinalBlock = 0; + tftp_put_final_block_sent = 0; #endif }

@@ -224,38 +227,39 @@ static void new_transfer(void) static int load_block(unsigned block, uchar *dst, unsigned len) { /* We may want to get the final block from the previous set */ - ulong offset = ((int)block - 1) * len + TftpBlockWrapOffset; + ulong offset = ((int)block - 1) * len + tftp_block_wrap_offset; ulong tosend = len;

tosend = min(net_boot_file_size - offset, tosend); (void)memcpy(dst, (void *)(save_addr + offset), tosend); debug("%s: block=%d, offset=%ld, len=%d, tosend=%ld\n", __func__, - block, offset, len, tosend); + block, offset, len, tosend); return tosend; } #endif

-static void TftpSend(void); -static void TftpTimeout(void); +static void tftp_send(void); +static void tftp_timeout_handler(void);

/**********************************************************************/

static void show_block_marker(void) { #ifdef CONFIG_TFTP_TSIZE - if (TftpTsize) { - ulong pos = TftpBlock * TftpBlkSize + TftpBlockWrapOffset; + if (tftp_tsize) { + ulong pos = tftp_cur_block * tftp_block_size + + tftp_block_wrap_offset;

- while (TftpNumchars < pos * 50 / TftpTsize) { + while (tftp_tsize_num_hash < pos * 50 / tftp_tsize) { putc('#'); - TftpNumchars++; + tftp_tsize_num_hash++; } } else #endif { - if (((TftpBlock - 1) % 10) == 0) + if (((tftp_cur_block - 1) % 10) == 0) putc('#'); - else if ((TftpBlock % (10 * HASHES_PER_LINE)) == 0) + else if ((tftp_cur_block % (10 * HASHES_PER_LINE)) == 0) puts("\n\t "); } } @@ -287,10 +291,10 @@ static void update_block_number(void) * number of 0 this means that there was a wrap * around of the (16 bit) counter. */ - if (TftpBlock == 0 && TftpLastBlock != 0) { - TftpBlockWrap++; - TftpBlockWrapOffset += TftpBlkSize * TFTP_SEQUENCE_SIZE; - TftpTimeoutCount = 0; /* we've done well, reset thhe timeout */ + if (tftp_cur_block == 0 && tftp_prev_block != 0) { + tftp_block_wrap++; + tftp_block_wrap_offset += tftp_block_size * TFTP_SEQUENCE_SIZE; + timeout_count = 0; /* we've done well, reset the timeout */ } else { show_block_marker(); } @@ -301,12 +305,12 @@ static void tftp_complete(void) { #ifdef CONFIG_TFTP_TSIZE /* Print hash marks for the last packet received */ - while (TftpTsize && TftpNumchars < 49) { + while (tftp_tsize && tftp_tsize_num_hash < 49) { putc('#'); - TftpNumchars++; + tftp_tsize_num_hash++; } puts(" "); - print_size(TftpTsize, ""); + print_size(tftp_tsize, ""); #endif time_start = get_timer(time_start); if (time_start > 0) { @@ -318,8 +322,7 @@ static void tftp_complete(void) net_set_state(NETLOOP_SUCCESS); }

-static void -TftpSend(void) +static void tftp_send(void) { uchar *pkt; uchar *xp; @@ -328,9 +331,8 @@ TftpSend(void)

#ifdef CONFIG_MCAST_TFTP /* Multicast TFTP.. non-MasterClients do not ACK data. */ - if (Multicast - && (TftpState == STATE_DATA) - && (MasterClient == 0)) + if (tftp_mcast_active && tftp_state == STATE_DATA && + tftp_mcast_master_client == 0) return; #endif /* @@ -339,13 +341,13 @@ TftpSend(void) */ pkt = net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE;

- switch (TftpState) { + switch (tftp_state) { case STATE_SEND_RRQ: case STATE_SEND_WRQ: xp = pkt; s = (ushort *)pkt; #ifdef CONFIG_CMD_TFTPPUT - *s++ = htons(TftpState == STATE_SEND_RRQ ? TFTP_RRQ : + *s++ = htons(tftp_state == STATE_SEND_RRQ ? TFTP_RRQ : TFTP_WRQ); #else *s++ = htons(TFTP_RRQ); @@ -357,7 +359,7 @@ TftpSend(void) pkt += 5 /*strlen("octet")*/ + 1; strcpy((char *)pkt, "timeout"); pkt += 7 /*strlen("timeout")*/ + 1; - sprintf((char *)pkt, "%lu", TftpTimeoutMSecs / 1000); + sprintf((char *)pkt, "%lu", timeout_ms / 1000); debug("send option "timeout %s"\n", (char *)pkt); pkt += strlen((char *)pkt) + 1; #ifdef CONFIG_TFTP_TSIZE @@ -366,14 +368,14 @@ TftpSend(void) #endif /* try for more effic. blk size */ pkt += sprintf((char *)pkt, "blksize%c%d%c", - 0, TftpBlkSizeOption, 0); + 0, tftp_block_size_option, 0); #ifdef CONFIG_MCAST_TFTP /* Check all preconditions before even trying the option */ - if (!ProhibitMcast) { - Bitmap = malloc(Mapsize); - if (Bitmap && eth_get_dev()->mcast) { - free(Bitmap); - Bitmap = NULL; + if (!tftp_mcast_disabled) { + tftp_mcast_bitmap = malloc(tftp_mcast_bitmap_size); + if (tftp_mcast_bitmap && eth_get_dev()->mcast) { + free(tftp_mcast_bitmap); + tftp_mcast_bitmap = NULL; pkt += sprintf((char *)pkt, "multicast%c%c", 0, 0); } @@ -384,11 +386,12 @@ TftpSend(void)

case STATE_OACK: #ifdef CONFIG_MCAST_TFTP - /* My turn! Start at where I need blocks I missed.*/ - if (Multicast) - TftpBlock = ext2_find_next_zero_bit(Bitmap, - (Mapsize*8), 0); - /*..falling..*/ + /* My turn! Start at where I need blocks I missed. */ + if (tftp_mcast_active) + tftp_cur_block = ext2_find_next_zero_bit( + tftp_mcast_bitmap, + tftp_mcast_bitmap_size * 8, 0); + /* fall through */ #endif

case STATE_RECV_WRQ: @@ -396,16 +399,16 @@ TftpSend(void) xp = pkt; s = (ushort *)pkt; s[0] = htons(TFTP_ACK); - s[1] = htons(TftpBlock); + s[1] = htons(tftp_cur_block); pkt = (uchar *)(s + 2); #ifdef CONFIG_CMD_TFTPPUT - if (TftpWriting) { - int toload = TftpBlkSize; - int loaded = load_block(TftpBlock, pkt, toload); + if (tftp_put_active) { + int toload = tftp_block_size; + int loaded = load_block(tftp_cur_block, pkt, toload);

s[0] = htons(TFTP_DATA); pkt += loaded; - TftpFinalBlock = (loaded < toload); + tftp_put_final_block_sent = (loaded < toload); } #endif len = pkt - xp; @@ -435,8 +438,8 @@ TftpSend(void) break; }

- net_send_udp_packet(net_server_ethaddr, tftp_remote_ip, TftpRemotePort, - TftpOurPort, len); + net_send_udp_packet(net_server_ethaddr, tftp_remote_ip, + tftp_remote_port, tftp_our_port, len); }

#ifdef CONFIG_CMD_TFTPPUT @@ -458,15 +461,15 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, __be16 *s; int i;

- if (dest != TftpOurPort) { + if (dest != tftp_our_port) { #ifdef CONFIG_MCAST_TFTP - if (Multicast - && (!Mcast_port || (dest != Mcast_port))) + if (tftp_mcast_active && + (!tftp_mcast_port || dest != tftp_mcast_port)) #endif return; } - if (TftpState != STATE_SEND_RRQ && src != TftpRemotePort && - TftpState != STATE_RECV_WRQ && TftpState != STATE_SEND_WRQ) + if (tftp_state != STATE_SEND_RRQ && src != tftp_remote_port && + tftp_state != STATE_RECV_WRQ && tftp_state != STATE_SEND_WRQ) return;

if (len < 2) @@ -477,14 +480,13 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, proto = *s++; pkt = (uchar *)s; switch (ntohs(proto)) { - case TFTP_RRQ: break;

case TFTP_ACK: #ifdef CONFIG_CMD_TFTPPUT - if (TftpWriting) { - if (TftpFinalBlock) { + if (tftp_put_active) { + if (tftp_put_final_block_sent) { tftp_complete(); } else { /* @@ -492,12 +494,12 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, * count to wrap just like the other end! */ int block = ntohs(*s); - int ack_ok = (TftpBlock == block); + int ack_ok = (tftp_cur_block == block);

- TftpBlock = (unsigned short)(block + 1); + tftp_cur_block = (unsigned short)(block + 1); update_block_number(); if (ack_ok) - TftpSend(); /* Send next data block */ + tftp_send(); /* Send next data block */ } } #endif @@ -510,101 +512,98 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, case TFTP_WRQ: debug("Got WRQ\n"); tftp_remote_ip = sip; - TftpRemotePort = src; - TftpOurPort = 1024 + (get_timer(0) % 3072); + tftp_remote_port = src; + tftp_our_port = 1024 + (get_timer(0) % 3072); new_transfer(); - TftpSend(); /* Send ACK(0) */ + tftp_send(); /* Send ACK(0) */ break; #endif

case TFTP_OACK: debug("Got OACK: %s %s\n", - pkt, - pkt + strlen((char *)pkt) + 1); - TftpState = STATE_OACK; - TftpRemotePort = src; + pkt, pkt + strlen((char *)pkt) + 1); + tftp_state = STATE_OACK; + tftp_remote_port = src; /* * Check for 'blksize' option. * Careful: "i" is signed, "len" is unsigned, thus * something like "len-8" may give a *huge* number */ for (i = 0; i+8 < len; i++) { - if (strcmp((char *)pkt+i, "blksize") == 0) { - TftpBlkSize = (unsigned short) - simple_strtoul((char *)pkt+i+8, NULL, - 10); + if (strcmp((char *)pkt + i, "blksize") == 0) { + tftp_block_size = (unsigned short) + simple_strtoul((char *)pkt + i + 8, + NULL, 10); debug("Blocksize ack: %s, %d\n", - (char *)pkt+i+8, TftpBlkSize); + (char *)pkt + i + 8, tftp_block_size); } #ifdef CONFIG_TFTP_TSIZE if (strcmp((char *)pkt+i, "tsize") == 0) { - TftpTsize = simple_strtoul((char *)pkt+i+6, + tftp_tsize = simple_strtoul((char *)pkt + i + 6, NULL, 10); debug("size = %s, %d\n", - (char *)pkt+i+6, TftpTsize); + (char *)pkt + i + 6, tftp_tsize); } #endif } #ifdef CONFIG_MCAST_TFTP - parse_multicast_oack((char *)pkt, len-1); - if ((Multicast) && (!MasterClient)) - TftpState = STATE_DATA; /* passive.. */ + parse_multicast_oack((char *)pkt, len - 1); + if ((tftp_mcast_active) && (!tftp_mcast_master_client)) + tftp_state = STATE_DATA; /* passive.. */ else #endif #ifdef CONFIG_CMD_TFTPPUT - if (TftpWriting) { + if (tftp_put_active) { /* Get ready to send the first block */ - TftpState = STATE_DATA; - TftpBlock++; + tftp_state = STATE_DATA; + tftp_cur_block++; } #endif - TftpSend(); /* Send ACK or first data block */ + tftp_send(); /* Send ACK or first data block */ break; case TFTP_DATA: if (len < 2) return; len -= 2; - TftpBlock = ntohs(*(__be16 *)pkt); + tftp_cur_block = ntohs(*(__be16 *)pkt);

update_block_number();

- if (TftpState == STATE_SEND_RRQ) + if (tftp_state == STATE_SEND_RRQ) debug("Server did not acknowledge timeout option!\n");

- if (TftpState == STATE_SEND_RRQ || TftpState == STATE_OACK || - TftpState == STATE_RECV_WRQ) { + if (tftp_state == STATE_SEND_RRQ || tftp_state == STATE_OACK || + tftp_state == STATE_RECV_WRQ) { /* first block received */ - TftpState = STATE_DATA; - TftpRemotePort = src; + tftp_state = STATE_DATA; + tftp_remote_port = src; new_transfer();

#ifdef CONFIG_MCAST_TFTP - if (Multicast) { /* start!=1 common if mcast */ - TftpLastBlock = TftpBlock - 1; + if (tftp_mcast_active) { /* start!=1 common if mcast */ + tftp_prev_block = tftp_cur_block - 1; } else #endif - if (TftpBlock != 1) { /* Assertion */ - printf("\nTFTP error: " - "First block is not block 1 (%ld)\n" - "Starting again\n\n", - TftpBlock); + if (tftp_cur_block != 1) { /* Assertion */ + puts("\nTFTP error: "); + printf("First block is not block 1 (%ld)\n", + tftp_cur_block); + puts("Starting again\n\n"); NetStartAgain(); break; } }

- if (TftpBlock == TftpLastBlock) { - /* - * Same block again; ignore it. - */ + if (tftp_cur_block == tftp_prev_block) { + /* Same block again; ignore it. */ break; }

- TftpLastBlock = TftpBlock; - TftpTimeoutCountMax = TIMEOUT_COUNT; - NetSetTimeout(TftpTimeoutMSecs, TftpTimeout); + tftp_prev_block = tftp_cur_block; + timeout_count_max = TIMEOUT_COUNT; + NetSetTimeout(timeout_ms, tftp_timeout_handler);

- store_block(TftpBlock - 1, pkt + 2, len); + store_block(tftp_cur_block - 1, pkt + 2, len);

/* * Acknowledge the block just received, which will prompt @@ -614,39 +613,41 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, /* if I am the MasterClient, actively calculate what my next * needed block is; else I'm passive; not ACKING */ - if (Multicast) { - if (len < TftpBlkSize) { - TftpEndingBlock = TftpBlock; - } else if (MasterClient) { - TftpBlock = PrevBitmapHole = - ext2_find_next_zero_bit( - Bitmap, - (Mapsize*8), - PrevBitmapHole); - if (TftpBlock > ((Mapsize*8) - 1)) { - printf("tftpfile too big\n"); + if (tftp_mcast_active) { + if (len < tftp_block_size) { + tftp_mcast_ending_block = tftp_cur_block; + } else if (tftp_mcast_master_client) { + tftp_mcast_prev_hole = ext2_find_next_zero_bit( + tftp_mcast_bitmap, + tftp_mcast_bitmap_size * 8, + tftp_mcast_prev_hole); + tftp_cur_block = tftp_mcast_prev_hole; + if (tftp_cur_block > + ((tftp_mcast_bitmap_size * 8) - 1)) { + debug("tftpfile too big\n"); /* try to double it and retry */ - Mapsize <<= 1; + tftp_mcast_bitmap_size <<= 1; mcast_cleanup(); NetStartAgain(); return; } - TftpLastBlock = TftpBlock; + tftp_prev_block = tftp_cur_block; } } #endif - TftpSend(); + tftp_send();

#ifdef CONFIG_MCAST_TFTP - if (Multicast) { - if (MasterClient && (TftpBlock >= TftpEndingBlock)) { + if (tftp_mcast_active) { + if (tftp_mcast_master_client && + (tftp_cur_block >= tftp_mcast_ending_block)) { puts("\nMulticast tftp done\n"); mcast_cleanup(); net_set_state(NETLOOP_SUCCESS); } } else #endif - if (len < TftpBlkSize) + if (len < tftp_block_size) tftp_complete(); break;

@@ -679,21 +680,20 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, }

-static void -TftpTimeout(void) +static void tftp_timeout_handler(void) { - if (++TftpTimeoutCount > TftpTimeoutCountMax) { + if (++timeout_count > timeout_count_max) { restart("Retry count exceeded"); } else { puts("T "); - NetSetTimeout(TftpTimeoutMSecs, TftpTimeout); - if (TftpState != STATE_RECV_WRQ) - TftpSend(); + NetSetTimeout(timeout_ms, tftp_timeout_handler); + if (tftp_state != STATE_RECV_WRQ) + tftp_send(); } }

-void TftpStart(enum proto_t protocol) +void tftp_start(enum proto_t protocol) { char *ep; /* Environment pointer */

@@ -703,21 +703,20 @@ void TftpStart(enum proto_t protocol) */ ep = getenv("tftpblocksize"); if (ep != NULL) - TftpBlkSizeOption = simple_strtol(ep, NULL, 10); + tftp_block_size_option = simple_strtol(ep, NULL, 10);

ep = getenv("tftptimeout"); if (ep != NULL) - TftpTimeoutMSecs = simple_strtol(ep, NULL, 10); + timeout_ms = simple_strtol(ep, NULL, 10);

- if (TftpTimeoutMSecs < 1000) { - printf("TFTP timeout (%ld ms) too low, " - "set minimum = 1000 ms\n", - TftpTimeoutMSecs); - TftpTimeoutMSecs = 1000; + if (timeout_ms < 1000) { + printf("TFTP timeout (%ld ms) too low, set min = 1000 ms\n", + timeout_ms); + timeout_ms = 1000; }

debug("TFTP blocksize = %i, timeout = %ld ms\n", - TftpBlkSizeOption, TftpTimeoutMSecs); + tftp_block_size_option, timeout_ms);

tftp_remote_ip = net_server_ip; if (net_boot_file_name[0] == '\0') { @@ -728,20 +727,20 @@ void TftpStart(enum proto_t protocol) (net_ip.s_addr >> 24) & 0xFF);

strncpy(tftp_filename, default_filename, MAX_LEN); - tftp_filename[MAX_LEN-1] = 0; + tftp_filename[MAX_LEN - 1] = 0;

printf("*** Warning: no boot file name; using '%s'\n", - tftp_filename); + tftp_filename); } else { char *p = strchr(net_boot_file_name, ':');

if (p == NULL) { strncpy(tftp_filename, net_boot_file_name, MAX_LEN); - tftp_filename[MAX_LEN-1] = 0; + tftp_filename[MAX_LEN - 1] = 0; } else { tftp_remote_ip = string_to_ip(net_boot_file_name); strncpy(tftp_filename, p + 1, MAX_LEN); - tftp_filename[MAX_LEN-1] = 0; + tftp_filename[MAX_LEN - 1] = 0; } }

@@ -750,9 +749,9 @@ void TftpStart(enum proto_t protocol) #ifdef CONFIG_CMD_TFTPPUT protocol == TFTPPUT ? "to" : "from", #else - "from", + "from", #endif - &tftp_remote_ip, &net_ip); + &tftp_remote_ip, &net_ip);

/* Check if we need to send across this subnet */ if (net_gateway.s_addr && net_netmask.s_addr) { @@ -776,63 +775,62 @@ void TftpStart(enum proto_t protocol)

putc('\n'); #ifdef CONFIG_CMD_TFTPPUT - TftpWriting = (protocol == TFTPPUT); - if (TftpWriting) { + tftp_put_active = (protocol == TFTPPUT); + if (tftp_put_active) { printf("Save address: 0x%lx\n", save_addr); printf("Save size: 0x%lx\n", save_size); net_boot_file_size = save_size; puts("Saving: *\b"); - TftpState = STATE_SEND_WRQ; + tftp_state = STATE_SEND_WRQ; new_transfer(); } else #endif { printf("Load address: 0x%lx\n", load_addr); puts("Loading: *\b"); - TftpState = STATE_SEND_RRQ; + tftp_state = STATE_SEND_RRQ; }

time_start = get_timer(0); - TftpTimeoutCountMax = TftpRRQTimeoutCountMax; + timeout_count_max = tftp_timeout_count_max;

- NetSetTimeout(TftpTimeoutMSecs, TftpTimeout); + NetSetTimeout(timeout_ms, tftp_timeout_handler); net_set_udp_handler(tftp_handler); #ifdef CONFIG_CMD_TFTPPUT net_set_icmp_handler(icmp_handler); #endif - TftpRemotePort = WELL_KNOWN_PORT; - TftpTimeoutCount = 0; + tftp_remote_port = WELL_KNOWN_PORT; + timeout_count = 0; /* Use a pseudo-random port unless a specific port is set */ - TftpOurPort = 1024 + (get_timer(0) % 3072); + tftp_our_port = 1024 + (get_timer(0) % 3072);

#ifdef CONFIG_TFTP_PORT ep = getenv("tftpdstp"); if (ep != NULL) - TftpRemotePort = simple_strtol(ep, NULL, 10); + tftp_remote_port = simple_strtol(ep, NULL, 10); ep = getenv("tftpsrcp"); if (ep != NULL) - TftpOurPort = simple_strtol(ep, NULL, 10); + tftp_our_port = simple_strtol(ep, NULL, 10); #endif - TftpBlock = 0; + tftp_cur_block = 0;

/* zero out server ether in case the server ip has changed */ memset(net_server_ethaddr, 0, 6); - /* Revert TftpBlkSize to dflt */ - TftpBlkSize = TFTP_BLOCK_SIZE; + /* Revert tftp_block_size to dflt */ + tftp_block_size = TFTP_BLOCK_SIZE; #ifdef CONFIG_MCAST_TFTP mcast_cleanup(); #endif #ifdef CONFIG_TFTP_TSIZE - TftpTsize = 0; - TftpNumchars = 0; + tftp_tsize = 0; + tftp_tsize_num_hash = 0; #endif

- TftpSend(); + tftp_send(); }

#ifdef CONFIG_CMD_TFTPSRV -void -TftpStartServer(void) +void tftp_start_server(void) { tftp_filename[0] = 0;

@@ -842,22 +840,22 @@ TftpStartServer(void)

puts("Loading: *\b");

- TftpTimeoutCountMax = TIMEOUT_COUNT; - TftpTimeoutCount = 0; - TftpTimeoutMSecs = TIMEOUT; - NetSetTimeout(TftpTimeoutMSecs, TftpTimeout); + timeout_count_max = TIMEOUT_COUNT; + timeout_count = 0; + timeout_ms = TIMEOUT; + NetSetTimeout(timeout_ms, tftp_timeout_handler);

- /* Revert TftpBlkSize to dflt */ - TftpBlkSize = TFTP_BLOCK_SIZE; - TftpBlock = 0; - TftpOurPort = WELL_KNOWN_PORT; + /* Revert tftp_block_size to dflt */ + tftp_block_size = TFTP_BLOCK_SIZE; + tftp_cur_block = 0; + tftp_our_port = WELL_KNOWN_PORT;

#ifdef CONFIG_TFTP_TSIZE - TftpTsize = 0; - TftpNumchars = 0; + tftp_tsize = 0; + tftp_tsize_num_hash = 0; #endif

- TftpState = STATE_RECV_WRQ; + tftp_state = STATE_RECV_WRQ; net_set_udp_handler(tftp_handler);

/* zero out server ether in case the server ip has changed */ @@ -866,10 +864,12 @@ TftpStartServer(void) #endif /* CONFIG_CMD_TFTPSRV */

#ifdef CONFIG_MCAST_TFTP -/* Credits: atftp project. +/* + * Credits: atftp project. */

-/* pick up BcastAddr, Port, and whether I am [now] the master-client. * +/* + * Pick up BcastAddr, Port, and whether I am [now] the master-client. * Frame: * +-------+-----------+---+-------~~-------+---+ * | opc | multicast | 0 | addr, port, mc | 0 | @@ -885,58 +885,62 @@ static void parse_multicast_oack(char *pkt, int len) { int i; struct in_addr addr; - char *mc_adr, *port, *mc; + char *mc_adr; + char *port; + char *mc;

- mc_adr = port = mc = NULL; + mc_adr = NULL; + port = NULL; + mc = NULL; /* march along looking for 'multicast\0', which has to start at least * 14 bytes back from the end. */ - for (i = 0; i < len-14; i++) - if (strcmp(pkt+i, "multicast") == 0) + for (i = 0; i < len - 14; i++) + if (strcmp(pkt + i, "multicast") == 0) break; - if (i >= (len-14)) /* non-Multicast OACK, ign. */ + if (i >= (len - 14)) /* non-Multicast OACK, ign. */ return;

i += 10; /* strlen multicast */ - mc_adr = pkt+i; + mc_adr = pkt + i; for (; i < len; i++) { - if (*(pkt+i) == ',') { - *(pkt+i) = '\0'; + if (*(pkt + i) == ',') { + *(pkt + i) = '\0'; if (port) { - mc = pkt+i+1; + mc = pkt + i + 1; break; } else { - port = pkt+i+1; + port = pkt + i + 1; } } } if (!port || !mc_adr || !mc) return; - if (Multicast && MasterClient) { + if (tftp_mcast_active && tftp_mcast_master_client) { printf("I got a OACK as master Client, WRONG!\n"); return; } /* ..I now accept packets destined for this MCAST addr, port */ - if (!Multicast) { - if (Bitmap) { + if (!tftp_mcast_active) { + if (tftp_mcast_bitmap) { printf("Internal failure! no mcast.\n"); - free(Bitmap); - Bitmap = NULL; - ProhibitMcast = 1; - return ; + free(tftp_mcast_bitmap); + tftp_mcast_bitmap = NULL; + tftp_mcast_disabled = 1; + return; } /* I malloc instead of pre-declare; so that if the file ends * up being too big for this bitmap I can retry */ - Bitmap = malloc(Mapsize); - if (!Bitmap) { - printf("No Bitmap, no multicast. Sorry.\n"); - ProhibitMcast = 1; + tftp_mcast_bitmap = malloc(tftp_mcast_bitmap_size); + if (!tftp_mcast_bitmap) { + printf("No bitmap, no multicast. Sorry.\n"); + tftp_mcast_disabled = 1; return; } - memset(Bitmap, 0, Mapsize); - PrevBitmapHole = 0; - Multicast = 1; + memset(tftp_mcast_bitmap, 0, tftp_mcast_bitmap_size); + tftp_mcast_prev_hole = 0; + tftp_mcast_active = 1; } addr = string_to_ip(mc_adr); if (net_mcast_addr.s_addr != addr.s_addr) { @@ -945,14 +949,15 @@ static void parse_multicast_oack(char *pkt, int len) net_mcast_addr = addr; if (eth_mcast_join(net_mcast_addr, 1)) { printf("Fail to set mcast, revert to TFTP\n"); - ProhibitMcast = 1; + tftp_mcast_disabled = 1; mcast_cleanup(); NetStartAgain(); } } - MasterClient = (unsigned char)simple_strtoul((char *)mc, NULL, 10); - Mcast_port = (unsigned short)simple_strtoul(port, NULL, 10); - printf("Multicast: %s:%d [%d]\n", mc_adr, Mcast_port, MasterClient); + tftp_mcast_master_client = simple_strtoul((char *)mc, NULL, 10); + tftp_mcast_port = (unsigned short)simple_strtoul(port, NULL, 10); + printf("Multicast: %s:%d [%d]\n", mc_adr, tftp_mcast_port, + tftp_mcast_master_client); return; }

diff --git a/net/tftp.h b/net/tftp.h index 2b686e3..c411c9b 100644 --- a/net/tftp.h +++ b/net/tftp.h @@ -16,14 +16,14 @@ */

/* tftp.c */ -void TftpStart(enum proto_t protocol); /* Begin TFTP get/put */ +void tftp_start(enum proto_t protocol); /* Begin TFTP get/put */

#ifdef CONFIG_CMD_TFTPSRV -extern void TftpStartServer(void); /* Wait for incoming TFTP put */ +void tftp_start_server(void); /* Wait for incoming TFTP put */ #endif

-extern ulong TftpRRQTimeoutMSecs; -extern int TftpRRQTimeoutCountMax; +extern ulong tftp_timeout_ms; +extern int tftp_timeout_count_max;

/**********************************************************************/

Make a thorough pass through all variables and function names contained within bootp.c and remove CamelCase and improve naming.

Signed-off-by: Joe Hershberger joe.hershberger@ni.com ---

Changes in v2: None

net/bootp.c | 119 +++++++++++++++++++++++++++++------------------------------- net/bootp.h | 14 +++---- net/net.c | 8 ++-- 3 files changed, 69 insertions(+), 72 deletions(-)

diff --git a/net/bootp.c b/net/bootp.c index 9788b52..fa75125 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -53,7 +53,7 @@

ulong bootp_ids[CONFIG_BOOTP_ID_CACHE_SIZE]; unsigned int bootp_num_ids; -int BootpTry; +int bootp_try; ulong bootp_start; ulong bootp_timeout; char net_nis_domain[32] = {0,}; /* Our NIS domain */ @@ -109,14 +109,14 @@ static bool bootp_match_id(ulong id) return false; }

-static int BootpCheckPkt(uchar *pkt, unsigned dest, unsigned src, unsigned len) +static int check_packet(uchar *pkt, unsigned dest, unsigned src, unsigned len) { - struct Bootp_t *bp = (struct Bootp_t *) pkt; + struct bootp_hdr *bp = (struct bootp_hdr *)pkt; int retval = 0;

if (dest != PORT_BOOTPC || src != PORT_BOOTPS) retval = -1; - else if (len < sizeof(struct Bootp_t) - OPT_FIELD_SIZE) + else if (len < sizeof(struct bootp_hdr) - OPT_FIELD_SIZE) retval = -2; else if (bp->bp_op != OP_BOOTREQUEST && bp->bp_op != OP_BOOTREPLY && @@ -139,7 +139,7 @@ static int BootpCheckPkt(uchar *pkt, unsigned dest, unsigned src, unsigned len) /* * Copy parameters of interest from BOOTP_REPLY/DHCP_OFFER packet */ -static void BootpCopyNetParams(struct Bootp_t *bp) +static void store_net_params(struct bootp_hdr *bp) { #if !defined(CONFIG_BOOTP_SERVERIP) struct in_addr tmp_ip; @@ -177,12 +177,12 @@ static int truncate_sz(const char *name, int maxlen, int curlen)

#if !defined(CONFIG_CMD_DHCP)

-static void BootpVendorFieldProcess(u8 *ext) +static void bootp_process_vendor_field(u8 *ext) { int size = *(ext + 1);

debug("[BOOTP] Processing extension %d... (%d bytes)\n", *ext, - *(ext + 1)); + *(ext + 1));

net_boot_file_expected_size_in_blocks = 0;

@@ -285,7 +285,7 @@ static void BootpVendorFieldProcess(u8 *ext) } }

-static void BootpVendorProcess(u8 *ext, int size) +static void bootp_process_vendor(u8 *ext, int size) { u8 *end = ext + size;

@@ -299,7 +299,7 @@ static void BootpVendorProcess(u8 *ext, int size)

ext += ext[1] + 2; if (ext <= end) - BootpVendorFieldProcess(opt); + bootp_process_vendor_field(opt); } }

@@ -335,15 +335,15 @@ static void BootpVendorProcess(u8 *ext, int size) static void bootp_handler(uchar *pkt, unsigned dest, struct in_addr sip, unsigned src, unsigned len) { - struct Bootp_t *bp; + struct bootp_hdr *bp;

debug("got BOOTP packet (src=%d, dst=%d, len=%d want_len=%zu)\n", - src, dest, len, sizeof(struct Bootp_t)); + src, dest, len, sizeof(struct bootp_hdr));

- bp = (struct Bootp_t *)pkt; + bp = (struct bootp_hdr *)pkt;

/* Filter out pkts we don't want */ - if (BootpCheckPkt(pkt, dest, src, len)) + if (check_packet(pkt, dest, src, len)) return;

/* @@ -353,11 +353,11 @@ static void bootp_handler(uchar *pkt, unsigned dest, struct in_addr sip, status_led_set(STATUS_LED_BOOT, STATUS_LED_OFF); #endif

- BootpCopyNetParams(bp); /* Store net parameters from reply */ + store_net_params(bp); /* Store net parameters from reply */

/* Retrieve extended information (we must parse the vendor area) */ if (NetReadLong((ulong *)&bp->bp_vend[0]) == htonl(BOOTP_VENDOR_MAGIC)) - BootpVendorProcess((uchar *)&bp->bp_vend[4], len); + bootp_process_vendor((uchar *)&bp->bp_vend[4], len);

NetSetTimeout(0, (thand_f *)0); bootstage_mark_name(BOOTSTAGE_ID_BOOTP_STOP, "bootp_stop"); @@ -371,8 +371,7 @@ static void bootp_handler(uchar *pkt, unsigned dest, struct in_addr sip, /* * Timeout on BOOTP/DHCP request. */ -static void -BootpTimeout(void) +static void bootp_timeout_handler(void) { ulong time_taken = get_timer(bootp_start);

@@ -388,8 +387,8 @@ BootpTimeout(void) bootp_timeout *= 2; if (bootp_timeout > 2000) bootp_timeout = 2000; - NetSetTimeout(bootp_timeout, BootpTimeout); - BootpRequest(); + NetSetTimeout(bootp_timeout, bootp_timeout_handler); + bootp_request(); } }

@@ -649,25 +648,24 @@ static int bootp_extended(u8 *e) } #endif

-void BootpReset(void) +void bootp_reset(void) { bootp_num_ids = 0; - BootpTry = 0; + bootp_try = 0; bootp_start = get_timer(0); bootp_timeout = 250; }

-void -BootpRequest(void) +void bootp_request(void) { uchar *pkt, *iphdr; - struct Bootp_t *bp; + struct bootp_hdr *bp; int extlen, pktlen, iplen; int eth_hdr_size; #ifdef CONFIG_BOOTP_RANDOM_DELAY ulong rand_ms; #endif - ulong BootpID; + ulong bootp_id; struct in_addr zero_ip; struct in_addr bcast_ip;

@@ -677,11 +675,11 @@ BootpRequest(void) #endif

#ifdef CONFIG_BOOTP_RANDOM_DELAY /* Random BOOTP delay */ - if (BootpTry == 0) + if (bootp_try == 0) srand_mac();

- if (BootpTry <= 2) /* Start with max 1024 * 1ms */ - rand_ms = rand() >> (22 - BootpTry); + if (bootp_try <= 2) /* Start with max 1024 * 1ms */ + rand_ms = rand() >> (22 - bootp_try); else /* After 3rd BOOTP request max 8192 * 1ms */ rand_ms = rand() >> 19;

@@ -690,7 +688,7 @@ BootpRequest(void)

#endif /* CONFIG_BOOTP_RANDOM_DELAY */

- printf("BOOTP broadcast %d\n", ++BootpTry); + printf("BOOTP broadcast %d\n", ++bootp_try); pkt = net_tx_packet; memset((void *)pkt, 0, PKTSIZE);

@@ -705,11 +703,11 @@ BootpRequest(void) * C. Hallinan, DS4.COM, Inc. */ /* net_set_udp_header(pkt, 0xFFFFFFFFL, PORT_BOOTPS, PORT_BOOTPC, - sizeof (struct Bootp_t)); */ + sizeof (struct bootp_hdr)); */ iphdr = pkt; /* We need this later for net_set_udp_header() */ pkt += IP_UDP_HDR_SIZE;

- bp = (struct Bootp_t *)pkt; + bp = (struct bootp_hdr *)pkt; bp->bp_op = OP_BOOTREQUEST; bp->bp_htype = HWT_ETHER; bp->bp_hlen = HWL_ETHER; @@ -735,14 +733,14 @@ BootpRequest(void) * Bootp ID is the lower 4 bytes of our ethernet address * plus the current time in ms. */ - BootpID = ((ulong)net_ethaddr[2] << 24) + bootp_id = ((ulong)net_ethaddr[2] << 24) | ((ulong)net_ethaddr[3] << 16) | ((ulong)net_ethaddr[4] << 8) | (ulong)net_ethaddr[5]; - BootpID += get_timer(0); - BootpID = htonl(BootpID); - bootp_add_id(BootpID); - NetCopyLong(&bp->bp_id, &BootpID); + bootp_id += get_timer(0); + bootp_id = htonl(bootp_id); + bootp_add_id(bootp_id); + NetCopyLong(&bp->bp_id, &bootp_id);

/* * Calculate proper packet lengths taking into account the @@ -752,7 +750,7 @@ BootpRequest(void) pktlen = eth_hdr_size + IP_UDP_HDR_SIZE + iplen; bcast_ip.s_addr = 0xFFFFFFFFL; net_set_udp_header(iphdr, bcast_ip, PORT_BOOTPS, PORT_BOOTPC, iplen); - NetSetTimeout(bootp_timeout, BootpTimeout); + NetSetTimeout(bootp_timeout, bootp_timeout_handler);

#if defined(CONFIG_CMD_DHCP) dhcp_state = SELECTING; @@ -764,7 +762,7 @@ BootpRequest(void) }

#if defined(CONFIG_CMD_DHCP) -static void DhcpOptionsProcess(uchar *popt, struct Bootp_t *bp) +static void dhcp_process_options(uchar *popt, struct bootp_hdr *bp) { uchar *end = popt + BOOTP_HDR_SIZE; int oplen, size; @@ -851,7 +849,7 @@ static void DhcpOptionsProcess(uchar *popt, struct Bootp_t *bp) * to me */ printf("*** WARNING: using vendor " - "optional boot file\n"); + "optional boot file\n"); memcpy(bp->bp_file, popt + 2, size); bp->bp_file[size] = '\0'; } @@ -862,14 +860,14 @@ static void DhcpOptionsProcess(uchar *popt, struct Bootp_t *bp) break; #endif printf("*** Unhandled DHCP Option in OFFER/ACK:" - " %d\n", *popt); + " %d\n", *popt); break; } popt += oplen + 2; /* Process next option */ } }

-static int DhcpMessageType(unsigned char *popt) +static int dhcp_message_type(unsigned char *popt) { if (NetReadLong((ulong *)popt) != htonl(BOOTP_VENDOR_MAGIC)) return -1; @@ -883,17 +881,17 @@ static int DhcpMessageType(unsigned char *popt) return -1; }

-static void DhcpSendRequestPkt(struct Bootp_t *bp_offer) +static void dhcp_send_request_packet(struct bootp_hdr *bp_offer) { uchar *pkt, *iphdr; - struct Bootp_t *bp; + struct bootp_hdr *bp; int pktlen, iplen, extlen; int eth_hdr_size; struct in_addr offered_ip; struct in_addr zero_ip; struct in_addr bcast_ip;

- debug("DhcpSendRequestPkt: Sending DHCPREQUEST\n"); + debug("dhcp_send_request_packet: Sending DHCPREQUEST\n"); pkt = net_tx_packet; memset((void *)pkt, 0, PKTSIZE);

@@ -903,7 +901,7 @@ static void DhcpSendRequestPkt(struct Bootp_t *bp_offer) iphdr = pkt; /* We'll need this later to set proper pkt size */ pkt += IP_UDP_HDR_SIZE;

- bp = (struct Bootp_t *)pkt; + bp = (struct bootp_hdr *)pkt; bp->bp_op = OP_BOOTREQUEST; bp->bp_htype = HWT_ETHER; bp->bp_hlen = HWL_ETHER; @@ -954,17 +952,17 @@ static void DhcpSendRequestPkt(struct Bootp_t *bp_offer) static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip, unsigned src, unsigned len) { - struct Bootp_t *bp = (struct Bootp_t *)pkt; + struct bootp_hdr *bp = (struct bootp_hdr *)pkt;

debug("DHCPHandler: got packet: (src=%d, dst=%d, len=%d) state: %d\n", - src, dest, len, dhcp_state); + src, dest, len, dhcp_state);

/* Filter out pkts we don't want */ - if (BootpCheckPkt(pkt, dest, src, len)) + if (check_packet(pkt, dest, src, len)) return;

- debug("DHCPHandler: got DHCP packet: (src=%d, dst=%d, len=%d) state:" - " %d\n", src, dest, len, dhcp_state); + debug("DHCPHandler: got DHCP packet: (src=%d, dst=%d, len=%d) state: " + "%d\n", src, dest, len, dhcp_state);

switch (dhcp_state) { case SELECTING: @@ -986,10 +984,10 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip,

if (NetReadLong((ulong *)&bp->bp_vend[0]) == htonl(BOOTP_VENDOR_MAGIC)) - DhcpOptionsProcess((u8 *)&bp->bp_vend[4], bp); + dhcp_process_options((u8 *)&bp->bp_vend[4], bp);

- NetSetTimeout(5000, BootpTimeout); - DhcpSendRequestPkt(bp); + NetSetTimeout(5000, bootp_timeout_handler); + dhcp_send_request_packet(bp); #ifdef CONFIG_SYS_BOOTFILE_PREFIX } #endif /* CONFIG_SYS_BOOTFILE_PREFIX */ @@ -999,17 +997,17 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip, case REQUESTING: debug("DHCP State: REQUESTING\n");

- if (DhcpMessageType((u8 *)bp->bp_vend) == DHCP_ACK) { + if (dhcp_message_type((u8 *)bp->bp_vend) == DHCP_ACK) { if (NetReadLong((ulong *)&bp->bp_vend[0]) == htonl(BOOTP_VENDOR_MAGIC)) - DhcpOptionsProcess((u8 *)&bp->bp_vend[4], bp); + dhcp_process_options((u8 *)&bp->bp_vend[4], bp); /* Store net params from reply */ - BootpCopyNetParams(bp); + store_net_params(bp); dhcp_state = BOUND; printf("DHCP client bound to address %pI4 (%lu ms)\n", - &net_ip, get_timer(bootp_start)); + &net_ip, get_timer(bootp_start)); bootstage_mark_name(BOOTSTAGE_ID_BOOTP_STOP, - "bootp_stop"); + "bootp_stop");

net_auto_load(); return; @@ -1022,11 +1020,10 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip, puts("DHCP: INVALID STATE\n"); break; } - }

-void DhcpRequest(void) +void dhcp_request(void) { - BootpRequest(); + bootp_request(); } #endif /* CONFIG_CMD_DHCP */ diff --git a/net/bootp.h b/net/bootp.h index 8c591a6..efc2100 100644 --- a/net/bootp.h +++ b/net/bootp.h @@ -29,7 +29,7 @@ extern u8 *dhcp_vendorex_proc(u8 *e); /*rtn next e if mine,else NULL */ #define OPT_FIELD_SIZE 64 #endif

-struct Bootp_t { +struct bootp_hdr { uchar bp_op; /* Operation */ # define OP_BOOTREQUEST 1 # define OP_BOOTREPLY 2 @@ -51,7 +51,7 @@ struct Bootp_t { char bp_vend[OPT_FIELD_SIZE]; /* Vendor information */ };

-#define BOOTP_HDR_SIZE sizeof(struct Bootp_t) +#define BOOTP_HDR_SIZE sizeof(struct bootp_hdr)

/**********************************************************************/ /* @@ -59,16 +59,16 @@ struct Bootp_t { */

/* bootp.c */ -extern ulong BootpID; /* ID of cur BOOTP request */ -extern int BootpTry; +extern ulong bootp_id; /* ID of cur BOOTP request */ +extern int bootp_try;

/* Send a BOOTP request */ -extern void BootpReset(void); -extern void BootpRequest(void); +void bootp_reset(void); +void bootp_request(void);

/****************** DHCP Support *********************/ -extern void DhcpRequest(void); +void dhcp_request(void);

/* DHCP States */ typedef enum { INIT, diff --git a/net/net.c b/net/net.c index 9a4290b..f740052 100644 --- a/net/net.c +++ b/net/net.c @@ -381,16 +381,16 @@ restart: #endif #if defined(CONFIG_CMD_DHCP) case DHCP: - BootpReset(); + bootp_reset(); net_ip.s_addr = 0; - DhcpRequest(); /* Basically same as BOOTP */ + dhcp_request(); /* Basically same as BOOTP */ break; #endif

case BOOTP: - BootpReset(); + bootp_reset(); net_ip.s_addr = 0; - BootpRequest(); + bootp_request(); break;

#if defined(CONFIG_CMD_RARP)

Make a thorough pass through all variables and function names contained within rarp.c and remove CamelCase and improve naming.

Signed-off-by: Joe Hershberger joe.hershberger@ni.com ---

Changes in v2: None

net/net.c | 4 ++-- net/rarp.c | 23 +++++++++++------------ net/rarp.h | 6 +++--- 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/net/net.c b/net/net.c index bb67884..6c23293 100644 --- a/net/net.c +++ b/net/net.c @@ -395,9 +395,9 @@ restart:

#if defined(CONFIG_CMD_RARP) case RARP: - RarpTry = 0; + rarp_try = 0; net_ip.s_addr = 0; - RarpRequest(); + rarp_request(); break; #endif #if defined(CONFIG_CMD_PING) diff --git a/net/rarp.c b/net/rarp.c index f50d2fb..204e03c 100644 --- a/net/rarp.c +++ b/net/rarp.c @@ -20,7 +20,7 @@ #define TIMEOUT_COUNT (CONFIG_NET_RETRY_COUNT) #endif

-int RarpTry; +int rarp_try;

/* * Handle a RARP received packet. @@ -37,10 +37,9 @@ void rarp_receive(struct ip_udp_hdr *ip, unsigned len) }

if ((ntohs(arp->ar_op) != RARPOP_REPLY) || - (ntohs(arp->ar_hrd) != ARP_ETHER) || - (ntohs(arp->ar_pro) != PROT_IP) || - (arp->ar_hln != 6) || (arp->ar_pln != 4)) { - + (ntohs(arp->ar_hrd) != ARP_ETHER) || + (ntohs(arp->ar_pro) != PROT_IP) || + (arp->ar_hln != 6) || (arp->ar_pln != 4)) { puts("invalid RARP header\n"); } else { net_copy_ip(&net_ip, &arp->ar_data[16]); @@ -56,25 +55,25 @@ void rarp_receive(struct ip_udp_hdr *ip, unsigned len) /* * Timeout on BOOTP request. */ -static void RarpTimeout(void) +static void rarp_timeout_handler(void) { - if (RarpTry >= TIMEOUT_COUNT) { + if (rarp_try >= TIMEOUT_COUNT) { puts("\nRetry count exceeded; starting again\n"); NetStartAgain(); } else { - NetSetTimeout(TIMEOUT, RarpTimeout); - RarpRequest(); + NetSetTimeout(TIMEOUT, rarp_timeout_handler); + rarp_request(); } }

-void RarpRequest(void) +void rarp_request(void) { uchar *pkt; struct arp_hdr *rarp; int eth_hdr_size;

- printf("RARP broadcast %d\n", ++RarpTry); + printf("RARP broadcast %d\n", ++rarp_try); pkt = net_tx_packet;

eth_hdr_size = net_set_ether(pkt, net_bcast_ethaddr, PROT_RARP); @@ -96,5 +95,5 @@ void RarpRequest(void)

net_send_packet(net_tx_packet, eth_hdr_size + ARP_HDR_SIZE);

- NetSetTimeout(TIMEOUT, RarpTimeout); + NetSetTimeout(TIMEOUT, rarp_timeout_handler); } diff --git a/net/rarp.h b/net/rarp.h index 93e1889..1ca8833 100644 --- a/net/rarp.h +++ b/net/rarp.h @@ -17,11 +17,11 @@ * Global functions and variables. */

-extern int RarpTry; +extern int rarp_try;

/* Process the receipt of a RARP packet */ -extern void rarp_receive(struct ip_udp_hdr *ip, unsigned len); -extern void RarpRequest(void); /* Send a RARP request */ +void rarp_receive(struct ip_udp_hdr *ip, unsigned len); +void rarp_request(void); /* Send a RARP request */

/**********************************************************************/

Make a thorough pass through all variables and function names contained within ping.c and remove CamelCase and improve naming.

Signed-off-by: Joe Hershberger joe.hershberger@ni.com ---

Changes in v2: None

net/ping.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/net/ping.c b/net/ping.c index 76e8749..87da555 100644 --- a/net/ping.c +++ b/net/ping.c @@ -12,7 +12,7 @@ #include "ping.h" #include "arp.h"

-static ushort PingSeqNo; +static ushort ping_seq_number;

/* The ip address to ping */ struct in_addr net_ping_ip; @@ -35,7 +35,7 @@ static void set_icmp_header(uchar *pkt, struct in_addr dest) icmp->code = 0; icmp->checksum = 0; icmp->un.echo.id = 0; - icmp->un.echo.sequence = htons(PingSeqNo++); + icmp->un.echo.sequence = htons(ping_seq_number++); icmp->checksum = compute_ip_checksum(icmp, ICMP_HDR_SIZE); }

@@ -65,7 +65,7 @@ static int ping_send(void) return 1; /* waiting */ }

-static void ping_timeout(void) +static void ping_timeout_handler(void) { eth_halt(); net_set_state(NETLOOP_FAIL); /* we did not get the reply */ @@ -74,7 +74,7 @@ static void ping_timeout(void) void ping_start(void) { printf("Using %s device\n", eth_get_name()); - NetSetTimeout(10000UL, ping_timeout); + NetSetTimeout(10000UL, ping_timeout_handler);

ping_send(); } @@ -94,8 +94,9 @@ void ping_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) case ICMP_ECHO_REQUEST: eth_hdr_size = net_update_ether(et, et->et_src, PROT_IP);

- debug_cond(DEBUG_DEV_PKT, "Got ICMP ECHO REQUEST, return " - "%d bytes\n", eth_hdr_size + len); + debug_cond(DEBUG_DEV_PKT, + "Got ICMP ECHO REQUEST, return %d bytes\n", + eth_hdr_size + len);

ip->ip_sum = 0; ip->ip_off = 0;

Make a thorough pass through all variables and function names contained within dns.c and remove CamelCase and improve naming.

Signed-off-by: Joe Hershberger joe.hershberger@ni.com ---

Changes in v2: None

common/cmd_net.c | 6 +++--- include/net.h | 4 ++-- net/dns.c | 53 +++++++++++++++++++++++++---------------------------- net/dns.h | 2 +- net/net.c | 2 +- 5 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/common/cmd_net.c b/common/cmd_net.c index 1deebf2..0270ac3 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -393,12 +393,12 @@ int do_dns(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return CMD_RET_FAILURE; }

- NetDNSResolve = argv[1]; + net_dns_resolve = argv[1];

if (argc == 3) - NetDNSenvvar = argv[2]; + net_dns_env_var = argv[2]; else - NetDNSenvvar = NULL; + net_dns_env_var = NULL;

if (NetLoop(DNS) < 0) { printf("dns lookup of %s failed, check setup\n", argv[1]); diff --git a/include/net.h b/include/net.h index 9343ade..1275ffe 100644 --- a/include/net.h +++ b/include/net.h @@ -502,8 +502,8 @@ extern u32 net_boot_file_size; extern u32 net_boot_file_expected_size_in_blocks;

#if defined(CONFIG_CMD_DNS) -extern char *NetDNSResolve; /* The host to resolve */ -extern char *NetDNSenvvar; /* the env var to put the ip into */ +extern char *net_dns_resolve; /* The host to resolve */ +extern char *net_dns_env_var; /* the env var to put the ip into */ #endif

#if defined(CONFIG_CMD_PING) diff --git a/net/dns.c b/net/dns.c index 50d78ae..cf4ed86 100644 --- a/net/dns.c +++ b/net/dns.c @@ -29,13 +29,12 @@

#include "dns.h"

-char *NetDNSResolve; /* The host to resolve */ -char *NetDNSenvvar; /* The envvar to store the answer in */ +char *net_dns_resolve; /* The host to resolve */ +char *net_dns_env_var; /* The envvar to store the answer in */

-static int DnsOurPort; +static int dns_our_port;

-static void -DnsSend(void) +static void dns_send(void) { struct header *header; int n, name_len; @@ -44,12 +43,12 @@ DnsSend(void) const char *name; enum dns_query_type qtype = DNS_A_RECORD;

- name = NetDNSResolve; + name = net_dns_resolve; pkt = (uchar *)(net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE); p = pkt;

/* Prepare DNS packet header */ - header = (struct header *) pkt; + header = (struct header *)pkt; header->tid = 1; header->flags = htons(0x100); /* standard query */ header->nqueries = htons(1); /* Just one query */ @@ -59,7 +58,7 @@ DnsSend(void)

/* Encode DNS name */ name_len = strlen(name); - p = (uchar *) &header->data; /* For encoding host name into packet */ + p = (uchar *)&header->data; /* For encoding host name into packet */

do { s = strchr(name, '.'); @@ -88,15 +87,14 @@ DnsSend(void) n = p - pkt; /* Total packet length */ debug("Packet size %d\n", n);

- DnsOurPort = random_port(); + dns_our_port = random_port();

net_send_udp_packet(net_server_ethaddr, net_dns_server, - DNS_SERVICE_PORT, DnsOurPort, n); + DNS_SERVICE_PORT, dns_our_port, n); debug("DNS packet sent\n"); }

-static void -DnsTimeout(void) +static void dns_timeout_handler(void) { puts("Timeout\n"); net_set_state(NETLOOP_FAIL); @@ -109,20 +107,20 @@ static void dns_handler(uchar *pkt, unsigned dest, struct in_addr sip, const unsigned char *p, *e, *s; u16 type, i; int found, stop, dlen; - char IPStr[22]; + char ip_str[22]; struct in_addr ip_addr;

debug("%s\n", __func__); - if (dest != DnsOurPort) + if (dest != dns_our_port) return;

for (i = 0; i < len; i += 4) debug("0x%p - 0x%.2x 0x%.2x 0x%.2x 0x%.2x\n", - pkt+i, pkt[i], pkt[i+1], pkt[i+2], pkt[i+3]); + pkt+i, pkt[i], pkt[i+1], pkt[i+2], pkt[i+3]);

/* We sent one query. We want to have a single answer: */ - header = (struct header *) pkt; + header = (struct header *)pkt; if (ntohs(header->nqueries) != 1) return;

@@ -151,7 +149,6 @@ static void dns_handler(uchar *pkt, unsigned dest, struct in_addr sip,

/* Loop through the answers, we want A type answer */ for (found = stop = 0; !stop && &p[12] < e; ) { - /* Skip possible name in CNAME answer */ if (*p != 0xc0) { while (*p && &p[12] < e) @@ -170,7 +167,8 @@ static void dns_handler(uchar *pkt, unsigned dest, struct in_addr sip, p += 12 + dlen; } else if (type == DNS_A_RECORD) { debug("Found A-record\n"); - found = stop = 1; + found = 1; + stop = 1; } else { debug("Unknown type\n"); stop = 1; @@ -178,33 +176,32 @@ static void dns_handler(uchar *pkt, unsigned dest, struct in_addr sip, }

if (found && &p[12] < e) { - dlen = get_unaligned_be16(p+10); p += 12; memcpy(&ip_addr, p, 4);

if (p + dlen <= e) { - ip_to_string(ip_addr, IPStr); - printf("%s\n", IPStr); - if (NetDNSenvvar) - setenv(NetDNSenvvar, IPStr); - } else + ip_to_string(ip_addr, ip_str); + printf("%s\n", ip_str); + if (net_dns_env_var) + setenv(net_dns_env_var, ip_str); + } else { puts("server responded with invalid IP number\n"); + } }

net_set_state(NETLOOP_SUCCESS); }

-void -DnsStart(void) +void dns_start(void) { debug("%s\n", __func__);

- NetSetTimeout(DNS_TIMEOUT, DnsTimeout); + NetSetTimeout(DNS_TIMEOUT, dns_timeout_handler); net_set_udp_handler(dns_handler);

/* Clear a previous MAC address, the server IP might have changed. */ memset(net_server_ethaddr, 0, sizeof(net_server_ethaddr));

- DnsSend(); + dns_send(); } diff --git a/net/dns.h b/net/dns.h index dbc3890..c4e96af 100644 --- a/net/dns.h +++ b/net/dns.h @@ -31,6 +31,6 @@ struct header { unsigned char data[1]; /* Data, variable length */ };

-extern void DnsStart(void); /* Begin DNS */ +void dns_start(void); /* Begin DNS */

#endif diff --git a/net/net.c b/net/net.c index 3c8b608..1133f79 100644 --- a/net/net.c +++ b/net/net.c @@ -427,7 +427,7 @@ restart: #endif #if defined(CONFIG_CMD_DNS) case DNS: - DnsStart(); + dns_start(); break; #endif #if defined(CONFIG_CMD_LINK_LOCAL)

Make a thorough pass through all variables and function names contained within common/cmd_net.c and remove CamelCase and improve naming.

Signed-off-by: Joe Hershberger joe.hershberger@ni.com ---

Changes in v2: None

common/cmd_net.c | 29 ++++++++++++++--------------- include/net.h | 10 +++++----- net/net.c | 26 +++++++++++++------------- 3 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/common/cmd_net.c b/common/cmd_net.c index 0270ac3..a672d77 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -157,15 +157,13 @@ static void netboot_update_env(void) if (net_nis_domain[0]) setenv("domain", net_nis_domain);

-#if defined(CONFIG_CMD_SNTP) \ - && defined(CONFIG_BOOTP_TIMEOFFSET) +#if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_TIMEOFFSET) if (NetTimeOffset) { sprintf(tmp, "%d", NetTimeOffset); setenv("timeoffset", tmp); } #endif -#if defined(CONFIG_CMD_SNTP) \ - && defined(CONFIG_BOOTP_NTPSERVER) +#if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_NTPSERVER) if (net_ntp_server.s_addr) { ip_to_string(net_ntp_server, tmp); setenv("ntpserverip", tmp); @@ -183,9 +181,9 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc, ulong addr;

/* pre-set load_addr */ - if ((s = getenv("loadaddr")) != NULL) { + s = getenv("loadaddr"); + if (s != NULL) load_addr = simple_strtoul(s, NULL, 16); - }

switch (argc) { case 1: @@ -205,7 +203,8 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc, sizeof(net_boot_file_name)); break;

- case 3: load_addr = simple_strtoul(argv[1], NULL, 16); + case 3: + load_addr = simple_strtoul(argv[1], NULL, 16); copy_filename(net_boot_file_name, argv[2], sizeof(net_boot_file_name));

@@ -214,7 +213,7 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc, #ifdef CONFIG_CMD_TFTPPUT case 4: if (strict_strtoul(argv[1], 16, &save_addr) < 0 || - strict_strtoul(argv[2], 16, &save_size) < 0) { + strict_strtoul(argv[2], 16, &save_size) < 0) { printf("Invalid address/size\n"); return CMD_RET_USAGE; } @@ -228,7 +227,8 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc, } bootstage_mark(BOOTSTAGE_ID_NET_START);

- if ((size = NetLoop(proto)) < 0) { + size = NetLoop(proto); + if (size < 0) { bootstage_error(BOOTSTAGE_ID_NET_NETLOOP_OK); return CMD_RET_FAILURE; } @@ -293,18 +293,17 @@ static void cdp_update_env(void) if (cdp_appliance_vlan != htons(-1)) { printf("CDP offered appliance VLAN %d\n", ntohs(cdp_appliance_vlan)); - VLAN_to_string(cdp_appliance_vlan, tmp); + vlan_to_string(cdp_appliance_vlan, tmp); setenv("vlan", tmp); - NetOurVLAN = cdp_appliance_vlan; + net_our_vlan = cdp_appliance_vlan; }

if (cdp_native_vlan != htons(-1)) { printf("CDP offered native VLAN %d\n", ntohs(cdp_native_vlan)); - VLAN_to_string(cdp_native_vlan, tmp); + vlan_to_string(cdp_native_vlan, tmp); setenv("nvlan", tmp); - NetOurNativeVLAN = cdp_native_vlan; + net_native_vlan = cdp_native_vlan; } - }

int do_cdp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) @@ -356,7 +355,7 @@ int do_sntp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])

if (NetLoop(SNTP) < 0) { printf("SNTP failed: host %pI4 not responding\n", - &net_ntp_server); + &net_ntp_server); return CMD_RET_FAILURE; }

diff --git a/include/net.h b/include/net.h index a7aefbc..c4a534c 100644 --- a/include/net.h +++ b/include/net.h @@ -485,8 +485,8 @@ extern const u8 net_null_ethaddr[6];

#define VLAN_NONE 4095 /* untagged */ #define VLAN_IDMASK 0x0fff /* mask of valid vlan id */ -extern ushort NetOurVLAN; /* Our VLAN */ -extern ushort NetOurNativeVLAN; /* Our Native VLAN */ +extern ushort net_our_vlan; /* Our VLAN */ +extern ushort net_native_vlan; /* Our Native VLAN */

extern int NetRestartWrap; /* Tried all network devices */

@@ -785,13 +785,13 @@ void ip_to_string(struct in_addr x, char *s); struct in_addr string_to_ip(const char *s);

/* Convert a VLAN id to a string */ -void VLAN_to_string(ushort x, char *s); +void vlan_to_string(ushort x, char *s);

/* Convert a string to a vlan id */ -ushort string_to_VLAN(const char *s); +ushort string_to_vlan(const char *s);

/* read a VLAN id from an environment variable */ -ushort getenv_VLAN(char *); +ushort getenv_vlan(char *);

/* copy a filename (allow for "..." notation, limit length) */ void copy_filename(char *dst, const char *src, int size); diff --git a/net/net.c b/net/net.c index 1395276..8c09529 100644 --- a/net/net.c +++ b/net/net.c @@ -159,9 +159,9 @@ static int NetDevExists;

/* XXX in both little & big endian machines 0xFFFF == ntohs(-1) */ /* default is without VLAN */ -ushort NetOurVLAN = 0xFFFF; +ushort net_our_vlan = 0xFFFF; /* ditto */ -ushort NetOurNativeVLAN = 0xFFFF; +ushort net_native_vlan = 0xFFFF;

/* Boot File name */ char net_boot_file_name[128]; @@ -261,8 +261,8 @@ static void NetInitLoop(void) net_gateway = getenv_ip("gatewayip"); net_netmask = getenv_ip("netmask"); net_server_ip = getenv_ip("serverip"); - NetOurNativeVLAN = getenv_VLAN("nvlan"); - NetOurVLAN = getenv_VLAN("vlan"); + net_native_vlan = getenv_vlan("nvlan"); + net_our_vlan = getenv_vlan("vlan"); #if defined(CONFIG_CMD_DNS) net_dns_server = getenv_ip("dnsip"); #endif @@ -989,10 +989,10 @@ void net_process_received_packet(uchar *in_packet, int len) iscdp = is_cdp_packet(et->et_dest); #endif

- myvlanid = ntohs(NetOurVLAN); + myvlanid = ntohs(net_our_vlan); if (myvlanid == (ushort)-1) myvlanid = VLAN_NONE; - mynvlanid = ntohs(NetOurNativeVLAN); + mynvlanid = ntohs(net_native_vlan); if (mynvlanid == (ushort)-1) mynvlanid = VLAN_NONE;

@@ -1024,7 +1024,7 @@ void net_process_received_packet(uchar *in_packet, int len) return;

/* if no VLAN active */ - if ((ntohs(NetOurVLAN) & VLAN_IDMASK) == VLAN_NONE + if ((ntohs(net_our_vlan) & VLAN_IDMASK) == VLAN_NONE #if defined(CONFIG_CMD_CDP) && iscdp == 0 #endif @@ -1301,7 +1301,7 @@ net_eth_hdr_size(void) { ushort myvlanid;

- myvlanid = ntohs(NetOurVLAN); + myvlanid = ntohs(net_our_vlan); if (myvlanid == (ushort)-1) myvlanid = VLAN_NONE;

@@ -1314,7 +1314,7 @@ int net_set_ether(uchar *xet, const uchar *dest_ethaddr, uint prot) struct ethernet_hdr *et = (struct ethernet_hdr *)xet; ushort myvlanid;

- myvlanid = ntohs(NetOurVLAN); + myvlanid = ntohs(net_our_vlan); if (myvlanid == (ushort)-1) myvlanid = VLAN_NONE;

@@ -1439,7 +1439,7 @@ void ip_to_string(struct in_addr x, char *s) ); }

-void VLAN_to_string(ushort x, char *s) +void vlan_to_string(ushort x, char *s) { x = ntohs(x);

@@ -1452,7 +1452,7 @@ void VLAN_to_string(ushort x, char *s) sprintf(s, "%d", x & VLAN_IDMASK); }

-ushort string_to_VLAN(const char *s) +ushort string_to_vlan(const char *s) { ushort id;

@@ -1467,7 +1467,7 @@ ushort string_to_VLAN(const char *s) return htons(id); }

-ushort getenv_VLAN(char *var) +ushort getenv_vlan(char *var) { - return string_to_VLAN(getenv(var)); + return string_to_vlan(getenv(var)); }

There were still a few failures in net/eth.c, especially in the legacy part of the code.

Signed-off-by: Joe Hershberger joe.hershberger@ni.com ---

Changes in v2: None

net/eth.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/net/eth.c b/net/eth.c index e936ca0..953b6a6 100644 --- a/net/eth.c +++ b/net/eth.c @@ -74,8 +74,10 @@ static int eth_mac_skip(int index) { char enetvar[15]; char *skip_state; + sprintf(enetvar, index ? "eth%dmacskip" : "ethmacskip", index); - return ((skip_state = getenv(enetvar)) != NULL); + skip_state = getenv(enetvar); + return skip_state != NULL; }

static void eth_current_changed(void); @@ -275,8 +277,9 @@ int eth_init(void) priv->state = ETH_STATE_ACTIVE; return 0; } - } else + } else { ret = eth_errno; + }

debug("FAIL\n");

@@ -610,11 +613,11 @@ int eth_write_hwaddr(struct eth_device *dev, const char *base_name, if (!is_zero_ethaddr(dev->enetaddr) && memcmp(dev->enetaddr, env_enetaddr, 6)) { printf("\nWarning: %s MAC addresses don't match:\n", - dev->name); + dev->name); printf("Address in SROM is %pM\n", - dev->enetaddr); + dev->enetaddr); printf("Address in environment is %pM\n", - env_enetaddr); + env_enetaddr); }

memcpy(dev->enetaddr, env_enetaddr, 6); @@ -622,7 +625,7 @@ int eth_write_hwaddr(struct eth_device *dev, const char *base_name, eth_setenv_enetaddr_by_index(base_name, eth_number, dev->enetaddr); printf("\nWarning: %s using MAC address from net device\n", - dev->name); + dev->name); } else if (is_zero_ethaddr(dev->enetaddr)) { printf("\nError: %s address not set.\n", dev->name); @@ -632,13 +635,14 @@ int eth_write_hwaddr(struct eth_device *dev, const char *base_name, if (dev->write_hwaddr && !eth_mac_skip(eth_number)) { if (!is_valid_ethaddr(dev->enetaddr)) { printf("\nError: %s address %pM illegal value\n", - dev->name, dev->enetaddr); + dev->name, dev->enetaddr); return -EINVAL; }

ret = dev->write_hwaddr(dev); if (ret) - printf("\nWarning: %s failed to set MAC address\n", dev->name); + printf("\nWarning: %s failed to set MAC address\n", + dev->name); }

return ret; @@ -652,7 +656,8 @@ int eth_register(struct eth_device *dev) assert(strlen(dev->name) < sizeof(dev->name));

if (!eth_devices) { - eth_current = eth_devices = dev; + eth_devices = dev; + eth_current = dev; eth_current_changed(); } else { for (d = eth_devices; d->next != eth_devices; d = d->next) @@ -723,8 +728,9 @@ int eth_initialize(void) } else if (cpu_eth_init != __def_eth_init) { if (cpu_eth_init(gd->bd) < 0) printf("CPU Net Initialization Failed\n"); - } else + } else { printf("Net Initialization Skipped\n"); + }

if (!eth_devices) { puts("No ethernet found.\n");

Finish eliminating CamelCase from net.c and other failures

Signed-off-by: Joe Hershberger joe.hershberger@ni.com ---

Changes in v2: None

README | 6 +- common/cmd_elf.c | 2 +- common/cmd_net.c | 22 +++--- common/spl/spl_net.c | 2 +- common/update.c | 2 +- doc/README.link-local | 4 +- drivers/net/netconsole.c | 12 ++-- include/net.h | 18 ++--- net/arp.c | 2 +- net/bootp.c | 33 ++++----- net/cdp.c | 6 +- net/dns.c | 2 +- net/eth.c | 2 +- net/link_local.c | 4 +- net/net.c | 179 +++++++++++++++++++++++------------------------ net/nfs.c | 11 +-- net/ping.c | 2 +- net/rarp.c | 6 +- net/sntp.c | 4 +- net/tftp.c | 18 ++--- test/dm/eth.c | 28 ++++---- 21 files changed, 181 insertions(+), 184 deletions(-)

diff --git a/README b/README index 5d57eb9..25aebbc 100644 --- a/README +++ b/README @@ -3340,9 +3340,9 @@ Legacy uImage format: 65 net/eth.c Ethernet found.

-80 common/cmd_net.c usage wrong - 80 common/cmd_net.c before calling NetLoop() - -81 common/cmd_net.c some error in NetLoop() occurred - 81 common/cmd_net.c NetLoop() back without error + 80 common/cmd_net.c before calling net_loop() + -81 common/cmd_net.c some error in net_loop() occurred + 81 common/cmd_net.c net_loop() back without error -82 common/cmd_net.c size == 0 (File with size 0 loaded) 82 common/cmd_net.c trying automatic boot 83 common/cmd_net.c running "source" command diff --git a/common/cmd_elf.c b/common/cmd_elf.c index c745371..22475dc 100644 --- a/common/cmd_elf.c +++ b/common/cmd_elf.c @@ -170,7 +170,7 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * Check to see if we need to tftp the image ourselves before starting */ if ((argc == 2) && (strcmp(argv[1], "tftp") == 0)) { - if (NetLoop(TFTPGET) <= 0) + if (net_loop(TFTPGET) <= 0) return 1; printf("Automatic boot of VxWorks image at address 0x%08lx ...\n", addr); diff --git a/common/cmd_net.c b/common/cmd_net.c index a672d77..b2f3c7b 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -158,8 +158,8 @@ static void netboot_update_env(void) setenv("domain", net_nis_domain);

#if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_TIMEOFFSET) - if (NetTimeOffset) { - sprintf(tmp, "%d", NetTimeOffset); + if (net_ntp_time_offset) { + sprintf(tmp, "%d", net_ntp_time_offset); setenv("timeoffset", tmp); } #endif @@ -227,14 +227,14 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc, } bootstage_mark(BOOTSTAGE_ID_NET_START);

- size = NetLoop(proto); + size = net_loop(proto); if (size < 0) { bootstage_error(BOOTSTAGE_ID_NET_NETLOOP_OK); return CMD_RET_FAILURE; } bootstage_mark(BOOTSTAGE_ID_NET_NETLOOP_OK);

- /* NetLoop ok, update environment */ + /* net_loop ok, update environment */ netboot_update_env();

/* done if no file was loaded (no errors though) */ @@ -267,7 +267,7 @@ static int do_ping(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (net_ping_ip.s_addr == 0) return CMD_RET_USAGE;

- if (NetLoop(PING) < 0) { + if (net_loop(PING) < 0) { printf("ping failed; host %s is not alive\n", argv[1]); return CMD_RET_FAILURE; } @@ -310,7 +310,7 @@ int do_cdp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { int r;

- r = NetLoop(CDP); + r = net_loop(CDP); if (r < 0) { printf("cdp failed; perhaps not a CISCO switch?\n"); return CMD_RET_FAILURE; @@ -349,11 +349,11 @@ int do_sntp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])

toff = getenv("timeoffset"); if (toff == NULL) - NetTimeOffset = 0; + net_ntp_time_offset = 0; else - NetTimeOffset = simple_strtol(toff, NULL, 10); + net_ntp_time_offset = simple_strtol(toff, NULL, 10);

- if (NetLoop(SNTP) < 0) { + if (net_loop(SNTP) < 0) { printf("SNTP failed: host %pI4 not responding\n", &net_ntp_server); return CMD_RET_FAILURE; @@ -399,7 +399,7 @@ int do_dns(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) else net_dns_env_var = NULL;

- if (NetLoop(DNS) < 0) { + if (net_loop(DNS) < 0) { printf("dns lookup of %s failed, check setup\n", argv[1]); return CMD_RET_FAILURE; } @@ -421,7 +421,7 @@ static int do_link_local(cmd_tbl_t *cmdtp, int flag, int argc, { char tmp[22];

- if (NetLoop(LINKLOCAL) < 0) + if (net_loop(LINKLOCAL) < 0) return CMD_RET_FAILURE;

net_gateway.s_addr = 0; diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c index af4952f..217a435 100644 --- a/common/spl/spl_net.c +++ b/common/spl/spl_net.c @@ -28,7 +28,7 @@ void spl_net_load_image(const char *device) } if (device) setenv("ethact", device); - rv = NetLoop(BOOTP); + rv = net_loop(BOOTP); if (rv < 0) { printf("Problem booting with BOOTP\n"); hang(); diff --git a/common/update.c b/common/update.c index 1bf2f82..1c6aa18 100644 --- a/common/update.c +++ b/common/update.c @@ -70,7 +70,7 @@ static int update_load(char *filename, ulong msec_max, int cnt_max, ulong addr) /* download the update file */ load_addr = addr; copy_filename(net_boot_file_name, filename, sizeof(net_boot_file_name)); - size = NetLoop(TFTPGET); + size = net_loop(TFTPGET);

if (size < 0) rv = 1; diff --git a/doc/README.link-local b/doc/README.link-local index 9586eca..148b498 100644 --- a/doc/README.link-local +++ b/doc/README.link-local @@ -32,11 +32,11 @@ after successful negotiation to enable network access. -------------

RFC3927 requires that addresses are continuously checked to -avoid conflicts, however this can only happen when the NetLoop +avoid conflicts, however this can only happen when the net_loop is getting called. It is possible for a conflict to go undetected until a command that accesses the network is executed.

-Using NetConsole is one way to ensure that NetLoop is always +Using NetConsole is one way to ensure that net_loop is always processing packets and monitoring for conflicts.

This is also not a concern if the feature is use to connect diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index c2e0184..31042a6 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -113,7 +113,7 @@ static int refresh_settings_from_env(void) }

/** - * Called from NetLoop in net/net.c before each packet + * Called from net_loop in net/net.c before each packet */ void nc_start(void) { @@ -121,7 +121,7 @@ void nc_start(void) if (!output_packet_len || memcmp(nc_ether, net_null_ethaddr, 6)) { /* going to check for input packet */ net_set_udp_handler(nc_handler); - NetSetTimeout(net_timeout, nc_timeout_handler); + net_set_timeout_handler(net_timeout, nc_timeout_handler); } else { /* send arp request */ uchar *pkt; @@ -188,7 +188,7 @@ static void nc_send_packet(const char *buf, int len) output_packet = buf; output_packet_len = len; input_recursion = 1; - NetLoop(NETCONS); /* wait for arp reply and send packet */ + net_loop(NETCONS); /* wait for arp reply and send packet */ input_recursion = 0; output_packet_len = 0; return; @@ -232,7 +232,7 @@ static int nc_stdio_start(struct stdio_dev *dev)

/* * Initialize the static IP settings and buffer pointers - * incase we call net_send_udp_packet before NetLoop + * incase we call net_send_udp_packet before net_loop */ net_init();

@@ -277,7 +277,7 @@ static int nc_stdio_getc(struct stdio_dev *dev)

net_timeout = 0; /* no timeout */ while (!input_size) - NetLoop(NETCONS); + net_loop(NETCONS);

input_recursion = 0;

@@ -307,7 +307,7 @@ static int nc_stdio_tstc(struct stdio_dev *dev) input_recursion = 1;

net_timeout = 1; - NetLoop(NETCONS); /* kind of poll */ + net_loop(NETCONS); /* kind of poll */

input_recursion = 0;

diff --git a/include/net.h b/include/net.h index 069b688..e9131f7 100644 --- a/include/net.h +++ b/include/net.h @@ -479,7 +479,6 @@ extern uchar *net_tx_packet; /* THE transmit packet */ extern uchar *net_rx_packets[PKTBUFSRX]; /* Receive packets */ extern uchar *net_rx_packet; /* Current receive packet */ extern int net_rx_packet_len; /* Current rx packet length */ -extern unsigned NetIPID; /* IP ID (counting) */ extern const u8 net_bcast_ethaddr[6]; /* Ethernet broadcast address */ extern const u8 net_null_ethaddr[6];

@@ -488,7 +487,7 @@ extern const u8 net_null_ethaddr[6]; extern ushort net_our_vlan; /* Our VLAN */ extern ushort net_native_vlan; /* Our Native VLAN */

-extern int NetRestartWrap; /* Tried all network devices */ +extern int net_restart_wrap; /* Tried all network devices */

enum proto_t { BOOTP, RARP, ARP, TFTPGET, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP, @@ -528,7 +527,7 @@ static inline int is_cdp_packet(const uchar *ethaddr)

#if defined(CONFIG_CMD_SNTP) extern struct in_addr net_ntp_server; /* the ip address to NTP */ -extern int NetTimeOffset; /* offset time from UTC */ +extern int net_ntp_time_offset; /* offset time from UTC */ #endif

#if defined(CONFIG_MCAST_TFTP) @@ -537,13 +536,10 @@ extern struct in_addr net_mcast_addr;

/* Initialize the network adapter */ void net_init(void); -int NetLoop(enum proto_t); - -/* Shutdown adapters and cleanup */ -void NetStop(void); +int net_loop(enum proto_t);

/* Load failed. Start again. */ -int NetStartAgain(void); +int net_start_again(void);

/* Get size of the ethernet header when we send */ int net_eth_hdr_size(void); @@ -593,7 +589,7 @@ void net_set_udp_handler(rxhand_f *); /* Set UDP RX packet handler */ rxhand_f *net_get_arp_handler(void); /* Get ARP RX packet handler */ void net_set_arp_handler(rxhand_f *); /* Set ARP RX packet handler */ void net_set_icmp_handler(rxhand_icmp_f *f); /* Set ICMP RX handler */ -void NetSetTimeout(ulong, thand_f *);/* Set timeout handler */ +void net_set_timeout_handler(ulong, thand_f *);/* Set timeout handler */

/* Network loop state */ enum net_loop_state { @@ -682,7 +678,7 @@ static inline struct in_addr net_read_ip(void *from) }

/* return ulong *in network byteorder* */ -static inline ulong NetReadLong(ulong *from) +static inline ulong net_read_long(ulong *from) { ulong l;

@@ -703,7 +699,7 @@ static inline void net_copy_ip(void *to, void *from) }

/* copy ulong */ -static inline void NetCopyLong(ulong *to, ulong *from) +static inline void net_copy_long(ulong *to, ulong *from) { memcpy((void *)to, (void *)from, sizeof(ulong)); } diff --git a/net/arp.c b/net/arp.c index 953f312..b865570 100644 --- a/net/arp.c +++ b/net/arp.c @@ -112,7 +112,7 @@ void arp_timeout_check(void) if (arp_wait_try >= ARP_TIMEOUT_COUNT) { puts("\nARP Retry count exceeded; starting again\n"); arp_wait_try = 0; - NetStartAgain(); + net_start_again(); } else { arp_wait_timer_start = t; arp_request(); diff --git a/net/bootp.c b/net/bootp.c index fa75125..500850c 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -128,7 +128,7 @@ static int check_packet(uchar *pkt, unsigned dest, unsigned src, unsigned len) retval = -4; else if (bp->bp_hlen != HWL_ETHER) retval = -5; - else if (!bootp_match_id(NetReadLong((ulong *)&bp->bp_id))) + else if (!bootp_match_id(net_read_long((ulong *)&bp->bp_id))) retval = -6;

debug("Filtering pkt = %d\n", retval); @@ -356,10 +356,11 @@ static void bootp_handler(uchar *pkt, unsigned dest, struct in_addr sip, store_net_params(bp); /* Store net parameters from reply */

/* Retrieve extended information (we must parse the vendor area) */ - if (NetReadLong((ulong *)&bp->bp_vend[0]) == htonl(BOOTP_VENDOR_MAGIC)) + if (net_read_long((ulong *)&bp->bp_vend[0]) == + htonl(BOOTP_VENDOR_MAGIC)) bootp_process_vendor((uchar *)&bp->bp_vend[4], len);

- NetSetTimeout(0, (thand_f *)0); + net_set_timeout_handler(0, (thand_f *)0); bootstage_mark_name(BOOTSTAGE_ID_BOOTP_STOP, "bootp_stop");

debug("Got good BOOTP\n"); @@ -381,13 +382,13 @@ static void bootp_timeout_handler(void) net_set_state(NETLOOP_FAIL); #else puts("\nRetry time exceeded; starting again\n"); - NetStartAgain(); + net_start_again(); #endif } else { bootp_timeout *= 2; if (bootp_timeout > 2000) bootp_timeout = 2000; - NetSetTimeout(bootp_timeout, bootp_timeout_handler); + net_set_timeout_handler(bootp_timeout, bootp_timeout_handler); bootp_request(); } } @@ -740,7 +741,7 @@ void bootp_request(void) bootp_id += get_timer(0); bootp_id = htonl(bootp_id); bootp_add_id(bootp_id); - NetCopyLong(&bp->bp_id, &bootp_id); + net_copy_long(&bp->bp_id, &bootp_id);

/* * Calculate proper packet lengths taking into account the @@ -750,7 +751,7 @@ void bootp_request(void) pktlen = eth_hdr_size + IP_UDP_HDR_SIZE + iplen; bcast_ip.s_addr = 0xFFFFFFFFL; net_set_udp_header(iphdr, bcast_ip, PORT_BOOTPS, PORT_BOOTPC, iplen); - NetSetTimeout(bootp_timeout, bootp_timeout_handler); + net_set_timeout_handler(bootp_timeout, bootp_timeout_handler);

#if defined(CONFIG_CMD_DHCP) dhcp_state = SELECTING; @@ -778,9 +779,9 @@ static void dhcp_process_options(uchar *popt, struct bootp_hdr *bp) break; #if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_TIMEOFFSET) case 2: /* Time offset */ - to_ptr = &NetTimeOffset; - NetCopyLong((ulong *)to_ptr, (ulong *)(popt + 2)); - NetTimeOffset = ntohl(NetTimeOffset); + to_ptr = &net_ntp_time_offset; + net_copy_long((ulong *)to_ptr, (ulong *)(popt + 2)); + net_ntp_time_offset = ntohl(net_ntp_time_offset); break; #endif case 3: @@ -815,7 +816,7 @@ static void dhcp_process_options(uchar *popt, struct bootp_hdr *bp) break; #endif case 51: - NetCopyLong(&dhcp_leasetime, (ulong *) (popt + 2)); + net_copy_long(&dhcp_leasetime, (ulong *)(popt + 2)); break; case 53: /* Ignore Message Type Option */ break; @@ -869,7 +870,7 @@ static void dhcp_process_options(uchar *popt, struct bootp_hdr *bp)

static int dhcp_message_type(unsigned char *popt) { - if (NetReadLong((ulong *)popt) != htonl(BOOTP_VENDOR_MAGIC)) + if (net_read_long((ulong *)popt) != htonl(BOOTP_VENDOR_MAGIC)) return -1;

popt += 4; @@ -923,7 +924,7 @@ static void dhcp_send_request_packet(struct bootp_hdr *bp_offer) * ID is the id of the OFFER packet */

- NetCopyLong(&bp->bp_id, &bp_offer->bp_id); + net_copy_long(&bp->bp_id, &bp_offer->bp_id);

/* * Copy options from OFFER packet if present @@ -982,11 +983,11 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip, debug("TRANSITIONING TO REQUESTING STATE\n"); dhcp_state = REQUESTING;

- if (NetReadLong((ulong *)&bp->bp_vend[0]) == + if (net_read_long((ulong *)&bp->bp_vend[0]) == htonl(BOOTP_VENDOR_MAGIC)) dhcp_process_options((u8 *)&bp->bp_vend[4], bp);

- NetSetTimeout(5000, bootp_timeout_handler); + net_set_timeout_handler(5000, bootp_timeout_handler); dhcp_send_request_packet(bp); #ifdef CONFIG_SYS_BOOTFILE_PREFIX } @@ -998,7 +999,7 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip, debug("DHCP State: REQUESTING\n");

if (dhcp_message_type((u8 *)bp->bp_vend) == DHCP_ACK) { - if (NetReadLong((ulong *)&bp->bp_vend[0]) == + if (net_read_long((ulong *)&bp->bp_vend[0]) == htonl(BOOTP_VENDOR_MAGIC)) dhcp_process_options((u8 *)&bp->bp_vend[4], bp); /* Store net params from reply */ diff --git a/net/cdp.c b/net/cdp.c index d8df3ea..f9ccf53 100644 --- a/net/cdp.c +++ b/net/cdp.c @@ -224,14 +224,14 @@ static void cdp_timeout_handler(void) cdp_seq++;

if (cdp_seq < 3) { - NetSetTimeout(CDP_TIMEOUT, cdp_timeout_handler); + net_set_timeout_handler(CDP_TIMEOUT, cdp_timeout_handler); cdp_send_trigger(); return; }

/* if not OK try again */ if (!cdp_ok) - NetStartAgain(); + net_start_again(); else net_set_state(NETLOOP_SUCCESS); } @@ -357,7 +357,7 @@ void cdp_start(void) cdp_native_vlan = htons(-1); cdp_appliance_vlan = htons(-1);

- NetSetTimeout(CDP_TIMEOUT, cdp_timeout_handler); + net_set_timeout_handler(CDP_TIMEOUT, cdp_timeout_handler);

cdp_send_trigger(); } diff --git a/net/dns.c b/net/dns.c index cf4ed86..7017bac 100644 --- a/net/dns.c +++ b/net/dns.c @@ -197,7 +197,7 @@ void dns_start(void) { debug("%s\n", __func__);

- NetSetTimeout(DNS_TIMEOUT, dns_timeout_handler); + net_set_timeout_handler(DNS_TIMEOUT, dns_timeout_handler); net_set_udp_handler(dns_handler);

/* Clear a previous MAC address, the server IP might have changed. */ diff --git a/net/eth.c b/net/eth.c index 953b6a6..6ea1b13 100644 --- a/net/eth.c +++ b/net/eth.c @@ -963,7 +963,7 @@ void eth_try_another(int first_restart) eth_current_changed();

if (first_failed == eth_get_dev()) - NetRestartWrap = 1; + net_restart_wrap = 1; }

void eth_set_current(void) diff --git a/net/link_local.c b/net/link_local.c index ea5b4f4..27851b6 100644 --- a/net/link_local.c +++ b/net/link_local.c @@ -99,7 +99,7 @@ static void configure_wait(void) debug_cond(DEBUG_DEV_PKT, "...wait %d %s nprobes=%u, nclaims=%u\n", timeout_ms, eth_get_name(), nprobes, nclaims);

- NetSetTimeout(timeout_ms, link_local_timeout); + net_set_timeout_handler(timeout_ms, link_local_timeout); }

void link_local_start(void) @@ -182,7 +182,7 @@ static void link_local_timeout(void) conflicts = 0; timeout_ms = -1; /* Never timeout in the monitor state */ - NetSetTimeout(0, NULL); + net_set_timeout_handler(0, NULL);

/* NOTE: all other exit paths should deconfig ... */ net_set_state(NETLOOP_SUCCESS); diff --git a/net/net.c b/net/net.c index 8c09529..a365df0 100644 --- a/net/net.c +++ b/net/net.c @@ -141,21 +141,21 @@ uchar *net_rx_packet; /* Current rx packet length */ int net_rx_packet_len; /* IP packet ID */ -unsigned NetIPID; +static unsigned net_ip_id; /* Ethernet bcast address */ const u8 net_bcast_ethaddr[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; const u8 net_null_ethaddr[6]; #ifdef CONFIG_API -void (*push_packet)(void *, int len) = 0; +void (*push_packet)(void *, int len) = 0; #endif /* Network loop state */ enum net_loop_state net_state; /* Tried all network devices */ -int NetRestartWrap; +int net_restart_wrap; /* Network loop restarted */ -static int NetRestarted; +static int net_restarted; /* At least one device configured */ -static int NetDevExists; +static int net_dev_exists;

/* XXX in both little & big endian machines 0xFFFF == ntohs(-1) */ /* default is without VLAN */ @@ -174,7 +174,7 @@ u32 net_boot_file_expected_size_in_blocks; /* NTP server IP address */ struct in_addr net_ntp_server; /* offset time from UTC */ -int NetTimeOffset; +int net_ntp_time_offset; #endif

static uchar net_pkt_buf[(PKTBUFSRX+1) * PKTSIZE_ALIGN + PKTALIGN]; @@ -189,17 +189,17 @@ static rxhand_f *arp_packet_handler; static rxhand_icmp_f *packet_icmp_handler; #endif /* Current timeout handler */ -static thand_f *timeHandler; +static thand_f *time_handler; /* Time base value */ -static ulong timeStart; +static ulong time_start; /* Current timeout value */ -static ulong timeDelta; +static ulong time_delta; /* THE transmit packet */ uchar *net_tx_packet;

static int net_check_prereq(enum proto_t protocol);

-static int NetTryCount; +static int net_try_count;

int __maybe_unused net_busy_flag;

@@ -250,7 +250,7 @@ void net_auto_load(void) tftp_start(TFTPGET); }

-static void NetInitLoop(void) +static void net_init_loop(void) { static int env_changed_id; int env_id = get_env_id(); @@ -278,7 +278,7 @@ static void net_clear_handlers(void) { net_set_udp_handler(NULL); net_set_arp_handler(NULL); - NetSetTimeout(0, NULL); + net_set_timeout_handler(0, NULL); }

static void net_cleanup_loop(void) @@ -309,7 +309,7 @@ void net_init(void) first_call = 0; }

- NetInitLoop(); + net_init_loop(); }

/**********************************************************************/ @@ -317,14 +317,14 @@ void net_init(void) * Main network processing loop. */

-int NetLoop(enum proto_t protocol) +int net_loop(enum proto_t protocol) { int ret = -EINVAL;

- NetRestarted = 0; - NetDevExists = 0; - NetTryCount = 1; - debug_cond(DEBUG_INT_STATE, "--- NetLoop Entry\n"); + net_restarted = 0; + net_dev_exists = 0; + net_try_count = 1; + debug_cond(DEBUG_INT_STATE, "--- net_loop Entry\n");

bootstage_mark_name(BOOTSTAGE_ID_ETH_START, "eth_start"); net_init(); @@ -336,9 +336,9 @@ int NetLoop(enum proto_t protocol) eth_halt(); return ret; } - } else + } else { eth_init_state_only(); - + } restart: #ifdef CONFIG_USB_KEYBOARD net_busy_flag = 0; @@ -350,8 +350,8 @@ restart: * here on, this code is a state machine driven by received * packets and timer events. */ - debug_cond(DEBUG_INT_STATE, "--- NetLoop Init\n"); - NetInitLoop(); + debug_cond(DEBUG_INT_STATE, "--- net_loop Init\n"); + net_init_loop();

switch (net_check_prereq(protocol)) { case 1: @@ -364,7 +364,7 @@ restart: break;

case 0: - NetDevExists = 1; + net_dev_exists = 1; net_boot_file_size = 0; switch (protocol) { case TFTPGET: @@ -415,7 +415,7 @@ restart: cdp_start(); break; #endif -#if defined (CONFIG_NETCONSOLE) && !(CONFIG_SPL_BUILD) +#if defined(CONFIG_NETCONSOLE) && !(CONFIG_SPL_BUILD) case NETCONS: nc_start(); break; @@ -491,7 +491,7 @@ restart: puts("\nAbort\n"); /* include a debug print as well incase the debug messages are directed to stderr */ - debug_cond(DEBUG_INT_STATE, "--- NetLoop Abort!\n"); + debug_cond(DEBUG_INT_STATE, "--- net_loop Abort!\n"); goto done; }

@@ -501,7 +501,8 @@ restart: * Check for a timeout, and run the timeout handler * if we have one. */ - if (timeHandler && ((get_timer(0) - timeStart) > timeDelta)) { + if (time_handler && + ((get_timer(0) - time_start) > time_delta)) { thand_f *x;

#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) @@ -512,26 +513,24 @@ restart: * Echo the inverted link state to the fault LED. */ if (miiphy_link(eth_get_dev()->name, - CONFIG_SYS_FAULT_MII_ADDR)) { + CONFIG_SYS_FAULT_MII_ADDR)) status_led_set(STATUS_LED_RED, STATUS_LED_OFF); - } else { + else status_led_set(STATUS_LED_RED, STATUS_LED_ON); - } #endif /* CONFIG_SYS_FAULT_ECHO_LINK_DOWN, ... */ #endif /* CONFIG_MII, ... */ - debug_cond(DEBUG_INT_STATE, "--- NetLoop timeout\n"); - x = timeHandler; - timeHandler = (thand_f *)0; + debug_cond(DEBUG_INT_STATE, "--- net_loop timeout\n"); + x = time_handler; + time_handler = (thand_f *)0; (*x)(); }

if (net_state == NETLOOP_FAIL) - ret = NetStartAgain(); + ret = net_start_again();

switch (net_state) { - case NETLOOP_RESTART: - NetRestarted = 1; + net_restarted = 1; goto restart;

case NETLOOP_SUCCESS: @@ -550,14 +549,14 @@ restart: eth_set_last_protocol(protocol);

ret = net_boot_file_size; - debug_cond(DEBUG_INT_STATE, "--- NetLoop Success!\n"); + debug_cond(DEBUG_INT_STATE, "--- net_loop Success!\n"); goto done;

case NETLOOP_FAIL: net_cleanup_loop(); /* Invalidate the last protocol */ eth_set_last_protocol(BOOTP); - debug_cond(DEBUG_INT_STATE, "--- NetLoop Fail!\n"); + debug_cond(DEBUG_INT_STATE, "--- net_loop Fail!\n"); goto done;

case NETLOOP_CONTINUE: @@ -579,13 +578,12 @@ done:

/**********************************************************************/

-static void -startAgainTimeout(void) +static void start_again_timeout_handler(void) { net_set_state(NETLOOP_RESTART); }

-int NetStartAgain(void) +int net_start_again(void) { char *nretry; int retry_forever = 0; @@ -607,7 +605,7 @@ int NetStartAgain(void) retry_forever = 0; }

- if ((!retry_forever) && (NetTryCount >= retrycnt)) { + if ((!retry_forever) && (net_try_count >= retrycnt)) { eth_halt(); net_set_state(NETLOOP_FAIL); /* @@ -617,17 +615,18 @@ int NetStartAgain(void) return -ETIMEDOUT; }

- NetTryCount++; + net_try_count++;

eth_halt(); #if !defined(CONFIG_NET_DO_NOT_TRY_ANOTHER) - eth_try_another(!NetRestarted); + eth_try_another(!net_restarted); #endif ret = eth_init(); - if (NetRestartWrap) { - NetRestartWrap = 0; - if (NetDevExists) { - NetSetTimeout(10000UL, startAgainTimeout); + if (net_restart_wrap) { + net_restart_wrap = 0; + if (net_dev_exists) { + net_set_timeout_handler(10000UL, + start_again_timeout_handler); net_set_udp_handler(NULL); } else { net_set_state(NETLOOP_FAIL); @@ -656,7 +655,7 @@ rxhand_f *net_get_udp_handler(void)

void net_set_udp_handler(rxhand_f *f) { - debug_cond(DEBUG_INT_STATE, "--- NetLoop UDP handler set (%p)\n", f); + debug_cond(DEBUG_INT_STATE, "--- net_loop UDP handler set (%p)\n", f); if (f == NULL) udp_packet_handler = dummy_handler; else @@ -670,7 +669,7 @@ rxhand_f *net_get_arp_handler(void)

void net_set_arp_handler(rxhand_f *f) { - debug_cond(DEBUG_INT_STATE, "--- NetLoop ARP handler set (%p)\n", f); + debug_cond(DEBUG_INT_STATE, "--- net_loop ARP handler set (%p)\n", f); if (f == NULL) arp_packet_handler = dummy_handler; else @@ -684,19 +683,18 @@ void net_set_icmp_handler(rxhand_icmp_f *f) } #endif

-void -NetSetTimeout(ulong iv, thand_f *f) +void net_set_timeout_handler(ulong iv, thand_f *f) { if (iv == 0) { debug_cond(DEBUG_INT_STATE, - "--- NetLoop timeout handler cancelled\n"); - timeHandler = (thand_f *)0; + "--- net_loop timeout handler cancelled\n"); + time_handler = (thand_f *)0; } else { debug_cond(DEBUG_INT_STATE, - "--- NetLoop timeout handler set (%p)\n", f); - timeHandler = f; - timeStart = get_timer(0); - timeDelta = iv * CONFIG_SYS_HZ / 1000; + "--- net_loop timeout handler set (%p)\n", f); + time_handler = f; + time_start = get_timer(0); + time_delta = iv * CONFIG_SYS_HZ / 1000; } }

@@ -707,7 +705,7 @@ int net_send_udp_packet(uchar *ether, struct in_addr dest, int dport, int sport, int eth_hdr_size; int pkt_hdr_size;

- /* make sure the net_tx_packet is initialized (NetInit() was called) */ + /* make sure the net_tx_packet is initialized (net_init() was called) */ assert(net_tx_packet != NULL); if (net_tx_packet == NULL) return -1; @@ -745,7 +743,7 @@ int net_send_udp_packet(uchar *ether, struct in_addr dest, int dport, int sport, return 1; /* waiting */ } else { debug_cond(DEBUG_DEV_PKT, "sending UDP to %pI4/%pM\n", - &dest, ether); + &dest, ether); net_send_packet(net_tx_packet, pkt_hdr_size + payload_len); return 0; /* transmitted */ } @@ -784,7 +782,7 @@ struct hole { u16 unused; };

-static struct ip_udp_hdr *__NetDefragment(struct ip_udp_hdr *ip, int *lenp) +static struct ip_udp_hdr *__net_defragment(struct ip_udp_hdr *ip, int *lenp) { static uchar pkt_buff[IP_PKTSIZE] __aligned(PKTALIGN); static u16 first_hole, total_len; @@ -904,17 +902,19 @@ static struct ip_udp_hdr *__NetDefragment(struct ip_udp_hdr *ip, int *lenp) return localip; }

-static inline struct ip_udp_hdr *NetDefragment(struct ip_udp_hdr *ip, int *lenp) +static inline struct ip_udp_hdr *net_defragment(struct ip_udp_hdr *ip, + int *lenp) { u16 ip_off = ntohs(ip->ip_off); if (!(ip_off & (IP_OFFS | IP_FLAGS_MFRAG))) return ip; /* not a fragment */ - return __NetDefragment(ip, lenp); + return __net_defragment(ip, lenp); }

#else /* !CONFIG_IP_DEFRAG */

-static inline struct ip_udp_hdr *NetDefragment(struct ip_udp_hdr *ip, int *lenp) +static inline struct ip_udp_hdr *net_defragment(struct ip_udp_hdr *ip, + int *lenp) { u16 ip_off = ntohs(ip->ip_off); if (!(ip_off & (IP_OFFS | IP_FLAGS_MFRAG))) @@ -939,7 +939,7 @@ static void receive_icmp(struct ip_udp_hdr *ip, int len, if (icmph->code != ICMP_REDIR_HOST) return; printf(" ICMP Host Redirect to %pI4 ", - &icmph->un.gateway); + &icmph->un.gateway); break; default: #if defined(CONFIG_CMD_PING) @@ -948,8 +948,9 @@ static void receive_icmp(struct ip_udp_hdr *ip, int len, #ifdef CONFIG_CMD_TFTPPUT if (packet_icmp_handler) packet_icmp_handler(icmph->type, icmph->code, - ntohs(ip->udp_dst), src_ip, ntohs(ip->udp_src), - icmph->un.data, ntohs(ip->udp_len)); + ntohs(ip->udp_dst), src_ip, + ntohs(ip->udp_src), icmph->un.data, + ntohs(ip->udp_len)); #endif break; } @@ -1057,7 +1058,6 @@ void net_process_received_packet(uchar *in_packet, int len) }

switch (eth_proto) { - case PROT_ARP: arp_receive(et, ip, len); break; @@ -1072,7 +1072,7 @@ void net_process_received_packet(uchar *in_packet, int len) /* Before we start poking the header, make sure it is there */ if (len < IP_UDP_HDR_SIZE) { debug("len bad %d < %lu\n", len, - (ulong)IP_UDP_HDR_SIZE); + (ulong)IP_UDP_HDR_SIZE); return; } /* Check the packet length */ @@ -1082,7 +1082,7 @@ void net_process_received_packet(uchar *in_packet, int len) } len = ntohs(ip->ip_len); debug_cond(DEBUG_NET_PKT, "len=%d, v=%02x\n", - len, ip->ip_hl_v & 0xff); + len, ip->ip_hl_v & 0xff);

/* Can't deal with anything except IPv4 */ if ((ip->ip_hl_v & 0xf0) != 0x40) @@ -1111,7 +1111,7 @@ void net_process_received_packet(uchar *in_packet, int len) * a fragment, and either the complete packet or NULL if * it is a fragment (if !CONFIG_IP_DEFRAG, it returns NULL) */ - ip = NetDefragment(ip, &len); + ip = net_defragment(ip, &len); if (!ip) return; /* @@ -1143,8 +1143,8 @@ void net_process_received_packet(uchar *in_packet, int len) }

debug_cond(DEBUG_DEV_PKT, - "received UDP (to=%pI4, from=%pI4, len=%d)\n", - &dst_ip, &src_ip, len); + "received UDP (to=%pI4, from=%pI4, len=%d)\n", + &dst_ip, &src_ip, len);

#ifdef CONFIG_UDP_CHECKSUM if (ip->udp_xsum != 0) { @@ -1160,7 +1160,7 @@ void net_process_received_packet(uchar *in_packet, int len) xsum += (ntohl(ip->ip_dst.s_addr) >> 0) & 0x0000ffff;

sumlen = ntohs(ip->udp_len); - sumptr = (ushort *) &(ip->udp_src); + sumptr = (ushort *)&(ip->udp_src);

while (sumlen > 1) { ushort sumdata; @@ -1172,7 +1172,7 @@ void net_process_received_packet(uchar *in_packet, int len) if (sumlen > 0) { ushort sumdata;

- sumdata = *(unsigned char *) sumptr; + sumdata = *(unsigned char *)sumptr; sumdata = (sumdata << 8) & 0xff00; xsum += sumdata; } @@ -1182,33 +1182,31 @@ void net_process_received_packet(uchar *in_packet, int len) } if ((xsum != 0x00000000) && (xsum != 0x0000ffff)) { printf(" UDP wrong checksum %08lx %08x\n", - xsum, ntohs(ip->udp_xsum)); + xsum, ntohs(ip->udp_xsum)); return; } } #endif

- -#if defined (CONFIG_NETCONSOLE) && !(CONFIG_SPL_BUILD) +#if defined(CONFIG_NETCONSOLE) && !(CONFIG_SPL_BUILD) nc_input_packet((uchar *)ip + IP_UDP_HDR_SIZE, - src_ip, - ntohs(ip->udp_dst), - ntohs(ip->udp_src), - ntohs(ip->udp_len) - UDP_HDR_SIZE); + src_ip, + ntohs(ip->udp_dst), + ntohs(ip->udp_src), + ntohs(ip->udp_len) - UDP_HDR_SIZE); #endif /* - * IP header OK. Pass the packet to the current handler. + * IP header OK. Pass the packet to the current handler. */ (*udp_packet_handler)((uchar *)ip + IP_UDP_HDR_SIZE, - ntohs(ip->udp_dst), - src_ip, - ntohs(ip->udp_src), - ntohs(ip->udp_len) - UDP_HDR_SIZE); + ntohs(ip->udp_dst), + src_ip, + ntohs(ip->udp_src), + ntohs(ip->udp_len) - UDP_HDR_SIZE); break; } }

- /**********************************************************************/

static int net_check_prereq(enum proto_t protocol) @@ -1242,6 +1240,7 @@ static int net_check_prereq(enum proto_t protocol) #if defined(CONFIG_CMD_NFS) case NFS: #endif + /* Fall through */ case TFTPGET: case TFTPPUT: if (net_server_ip.s_addr == 0) { @@ -1281,11 +1280,11 @@ common: break; default: printf("*** ERROR: `eth%daddr' not set\n", - num); + num); break; }

- NetStartAgain(); + net_start_again(); return 2; } /* Fall through */ @@ -1368,7 +1367,7 @@ void net_set_ip_header(uchar *pkt, struct in_addr dest, struct in_addr source) ip->ip_hl_v = 0x45; ip->ip_tos = 0; ip->ip_len = htons(IP_HDR_SIZE); - ip->ip_id = htons(NetIPID++); + ip->ip_id = htons(net_ip_id++); ip->ip_off = htons(IP_FLAGS_DFRAG); /* Don't fragment */ ip->ip_ttl = 255; ip->ip_sum = 0; diff --git a/net/nfs.c b/net/nfs.c index 4357cc3..78968d8 100644 --- a/net/nfs.c +++ b/net/nfs.c @@ -571,11 +571,12 @@ static void nfs_timeout_handler(void) { if (++nfs_timeout_count > NFS_RETRY_COUNT) { puts("\nRetry count exceeded; starting again\n"); - NetStartAgain(); + net_start_again(); } else { puts("T "); - NetSetTimeout(nfs_timeout + NFS_TIMEOUT * nfs_timeout_count, - nfs_timeout_handler); + net_set_timeout_handler(nfs_timeout + + NFS_TIMEOUT * nfs_timeout_count, + nfs_timeout_handler); nfs_send(); } } @@ -670,7 +671,7 @@ static void nfs_handler(uchar *pkt, unsigned dest, struct in_addr sip,

case STATE_READ_REQ: rlen = nfs_read_reply(pkt, len); - NetSetTimeout(nfs_timeout, nfs_timeout_handler); + net_set_timeout_handler(nfs_timeout, nfs_timeout_handler); if (rlen > 0) { nfs_offset += rlen; nfs_send(); @@ -756,7 +757,7 @@ void nfs_start(void) printf("\nLoad address: 0x%lx\n" "Loading: *\b", load_addr);

- NetSetTimeout(nfs_timeout, nfs_timeout_handler); + net_set_timeout_handler(nfs_timeout, nfs_timeout_handler); net_set_udp_handler(nfs_handler);

nfs_timeout_count = 0; diff --git a/net/ping.c b/net/ping.c index 87da555..9508cf1 100644 --- a/net/ping.c +++ b/net/ping.c @@ -74,7 +74,7 @@ static void ping_timeout_handler(void) void ping_start(void) { printf("Using %s device\n", eth_get_name()); - NetSetTimeout(10000UL, ping_timeout_handler); + net_set_timeout_handler(10000UL, ping_timeout_handler);

ping_send(); } diff --git a/net/rarp.c b/net/rarp.c index 204e03c..4ce2f37 100644 --- a/net/rarp.c +++ b/net/rarp.c @@ -59,9 +59,9 @@ static void rarp_timeout_handler(void) { if (rarp_try >= TIMEOUT_COUNT) { puts("\nRetry count exceeded; starting again\n"); - NetStartAgain(); + net_start_again(); } else { - NetSetTimeout(TIMEOUT, rarp_timeout_handler); + net_set_timeout_handler(TIMEOUT, rarp_timeout_handler); rarp_request(); } } @@ -95,5 +95,5 @@ void rarp_request(void)

net_send_packet(net_tx_packet, eth_hdr_size + ARP_HDR_SIZE);

- NetSetTimeout(TIMEOUT, rarp_timeout_handler); + net_set_timeout_handler(TIMEOUT, rarp_timeout_handler); } diff --git a/net/sntp.c b/net/sntp.c index 8073ca6..d3427d8 100644 --- a/net/sntp.c +++ b/net/sntp.c @@ -65,7 +65,7 @@ static void sntp_handler(uchar *pkt, unsigned dest, struct in_addr sip, */ memcpy(&seconds, &rpktp->transmit_timestamp, sizeof(ulong));

- to_tm(ntohl(seconds) - 2208988800UL + NetTimeOffset, &tm); + to_tm(ntohl(seconds) - 2208988800UL + net_ntp_time_offset, &tm); #if defined(CONFIG_CMD_DATE) rtc_set(&tm); #endif @@ -80,7 +80,7 @@ void sntp_start(void) { debug("%s\n", __func__);

- NetSetTimeout(SNTP_TIMEOUT, sntp_timeout_handler); + net_set_timeout_handler(SNTP_TIMEOUT, sntp_timeout_handler); net_set_udp_handler(sntp_handler); memset(net_server_ethaddr, 0, sizeof(net_server_ethaddr));

diff --git a/net/tftp.c b/net/tftp.c index 14acf04..3e99e73 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -275,7 +275,7 @@ static void restart(const char *msg) #ifdef CONFIG_MCAST_TFTP mcast_cleanup(); #endif - NetStartAgain(); + net_start_again(); }

/* @@ -589,7 +589,7 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, printf("First block is not block 1 (%ld)\n", tftp_cur_block); puts("Starting again\n\n"); - NetStartAgain(); + net_start_again(); break; } } @@ -601,7 +601,7 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip,

tftp_prev_block = tftp_cur_block; timeout_count_max = TIMEOUT_COUNT; - NetSetTimeout(timeout_ms, tftp_timeout_handler); + net_set_timeout_handler(timeout_ms, tftp_timeout_handler);

store_block(tftp_cur_block - 1, pkt + 2, len);

@@ -628,7 +628,7 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, /* try to double it and retry */ tftp_mcast_bitmap_size <<= 1; mcast_cleanup(); - NetStartAgain(); + net_start_again(); return; } tftp_prev_block = tftp_cur_block; @@ -672,7 +672,7 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, #ifdef CONFIG_MCAST_TFTP mcast_cleanup(); #endif - NetStartAgain(); + net_start_again(); break; } break; @@ -686,7 +686,7 @@ static void tftp_timeout_handler(void) restart("Retry count exceeded"); } else { puts("T "); - NetSetTimeout(timeout_ms, tftp_timeout_handler); + net_set_timeout_handler(timeout_ms, tftp_timeout_handler); if (tftp_state != STATE_RECV_WRQ) tftp_send(); } @@ -794,7 +794,7 @@ void tftp_start(enum proto_t protocol) time_start = get_timer(0); timeout_count_max = tftp_timeout_count_max;

- NetSetTimeout(timeout_ms, tftp_timeout_handler); + net_set_timeout_handler(timeout_ms, tftp_timeout_handler); net_set_udp_handler(tftp_handler); #ifdef CONFIG_CMD_TFTPPUT net_set_icmp_handler(icmp_handler); @@ -843,7 +843,7 @@ void tftp_start_server(void) timeout_count_max = TIMEOUT_COUNT; timeout_count = 0; timeout_ms = TIMEOUT; - NetSetTimeout(timeout_ms, tftp_timeout_handler); + net_set_timeout_handler(timeout_ms, tftp_timeout_handler);

/* Revert tftp_block_size to dflt */ tftp_block_size = TFTP_BLOCK_SIZE; @@ -951,7 +951,7 @@ static void parse_multicast_oack(char *pkt, int len) printf("Fail to set mcast, revert to TFTP\n"); tftp_mcast_disabled = 1; mcast_cleanup(); - NetStartAgain(); + net_start_again(); } } tftp_mcast_master_client = simple_strtoul((char *)mc, NULL, 10); diff --git a/test/dm/eth.c b/test/dm/eth.c index 22fd26e..4891f3a 100644 --- a/test/dm/eth.c +++ b/test/dm/eth.c @@ -23,15 +23,15 @@ static int dm_test_eth(struct dm_test_state *dms) net_ping_ip = string_to_ip("1.1.2.2");

setenv("ethact", "eth@10002000"); - ut_assertok(NetLoop(PING)); + ut_assertok(net_loop(PING)); ut_asserteq_str("eth@10002000", getenv("ethact"));

setenv("ethact", "eth@10003000"); - ut_assertok(NetLoop(PING)); + ut_assertok(net_loop(PING)); ut_asserteq_str("eth@10003000", getenv("ethact"));

setenv("ethact", "eth@10004000"); - ut_assertok(NetLoop(PING)); + ut_assertok(net_loop(PING)); ut_asserteq_str("eth@10004000", getenv("ethact"));

return 0; @@ -42,20 +42,20 @@ static int dm_test_eth_alias(struct dm_test_state *dms) { net_ping_ip = string_to_ip("1.1.2.2"); setenv("ethact", "eth0"); - ut_assertok(NetLoop(PING)); + ut_assertok(net_loop(PING)); ut_asserteq_str("eth@10002000", getenv("ethact"));

setenv("ethact", "eth1"); - ut_assertok(NetLoop(PING)); + ut_assertok(net_loop(PING)); ut_asserteq_str("eth@10004000", getenv("ethact"));

/* Expected to fail since eth2 is not defined in the device tree */ setenv("ethact", "eth2"); - ut_assertok(NetLoop(PING)); + ut_assertok(net_loop(PING)); ut_asserteq_str("eth@10002000", getenv("ethact"));

setenv("ethact", "eth5"); - ut_assertok(NetLoop(PING)); + ut_assertok(net_loop(PING)); ut_asserteq_str("eth@10003000", getenv("ethact"));

return 0; @@ -69,13 +69,13 @@ static int dm_test_eth_prime(struct dm_test_state *dms) /* Expected to be "eth@10003000" because of ethprime variable */ setenv("ethact", NULL); setenv("ethprime", "eth5"); - ut_assertok(NetLoop(PING)); + ut_assertok(net_loop(PING)); ut_asserteq_str("eth@10003000", getenv("ethact"));

/* Expected to be "eth@10002000" because it is first */ setenv("ethact", NULL); setenv("ethprime", NULL); - ut_assertok(NetLoop(PING)); + ut_assertok(net_loop(PING)); ut_asserteq_str("eth@10002000", getenv("ethact"));

return 0; @@ -93,13 +93,13 @@ static int dm_test_eth_rotate(struct dm_test_state *dms)

/* Make sure that the default is to rotate to the next interface */ setenv("ethact", "eth@10004000"); - ut_assertok(NetLoop(PING)); + ut_assertok(net_loop(PING)); ut_asserteq_str("eth@10002000", getenv("ethact"));

/* If ethrotate is no, then we should fail on a bad MAC */ setenv("ethact", "eth@10004000"); setenv("ethrotate", "no"); - ut_asserteq(-EINVAL, NetLoop(PING)); + ut_asserteq(-EINVAL, net_loop(PING)); ut_asserteq_str("eth@10004000", getenv("ethact"));

/* Restore the env */ @@ -113,7 +113,7 @@ static int dm_test_eth_rotate(struct dm_test_state *dms)

/* Make sure we can skip invalid devices */ setenv("ethact", "eth@10004000"); - ut_assertok(NetLoop(PING)); + ut_assertok(net_loop(PING)); ut_asserteq_str("eth@10004000", getenv("ethact"));

/* Restore the env */ @@ -135,7 +135,7 @@ static int dm_test_net_retry(struct dm_test_state *dms) sandbox_eth_disable_response(1, true); setenv("ethact", "eth@10004000"); setenv("netretry", "yes"); - ut_assertok(NetLoop(PING)); + ut_assertok(net_loop(PING)); ut_asserteq_str("eth@10002000", getenv("ethact"));

/* @@ -144,7 +144,7 @@ static int dm_test_net_retry(struct dm_test_state *dms) */ setenv("ethact", "eth@10004000"); setenv("netretry", "no"); - ut_asserteq(-ETIMEDOUT, NetLoop(PING)); + ut_asserteq(-ETIMEDOUT, net_loop(PING)); ut_asserteq_str("eth@10004000", getenv("ethact"));

/* Restore the env */

From: Sergey Temerkhanov s.temerkhanov@gmail.com

Convert uchar/ushort to u8/u16 respectively.

Signed-off-by: Radha Mohan Chintakuntla rchintakuntla@cavium.com Signed-off-by: Sergey Temerkhanov s.temerkhanov@gmail.com Signed-off-by: Joe Hershberger joe.hershberger@ni.com ---

Changes in v2: None

include/net.h | 112 +++++++++++++++++++++++++++++----------------------------- net/bootp.h | 14 ++++---- 2 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/include/net.h b/include/net.h index def1fd9..62e213d 100644 --- a/include/net.h +++ b/include/net.h @@ -253,9 +253,9 @@ u32 ether_crc(size_t len, unsigned char const *p); */

struct ethernet_hdr { - uchar et_dest[6]; /* Destination node */ - uchar et_src[6]; /* Source node */ - ushort et_protlen; /* Protocol or length */ + u8 et_dest[6]; /* Destination node */ + u8 et_src[6]; /* Source node */ + u16 et_protlen; /* Protocol or length */ };

/* Ethernet header size */ @@ -264,16 +264,16 @@ struct ethernet_hdr { #define ETH_FCS_LEN 4 /* Octets in the FCS */

struct e802_hdr { - uchar et_dest[6]; /* Destination node */ - uchar et_src[6]; /* Source node */ - ushort et_protlen; /* Protocol or length */ - uchar et_dsap; /* 802 DSAP */ - uchar et_ssap; /* 802 SSAP */ - uchar et_ctl; /* 802 control */ - uchar et_snap1; /* SNAP */ - uchar et_snap2; - uchar et_snap3; - ushort et_prot; /* 802 protocol */ + u8 et_dest[6]; /* Destination node */ + u8 et_src[6]; /* Source node */ + u16 et_protlen; /* Protocol or length */ + u8 et_dsap; /* 802 DSAP */ + u8 et_ssap; /* 802 SSAP */ + u8 et_ctl; /* 802 control */ + u8 et_snap1; /* SNAP */ + u8 et_snap2; + u8 et_snap3; + u16 et_prot; /* 802 protocol */ };

/* 802 + SNAP + ethernet header size */ @@ -283,11 +283,11 @@ struct e802_hdr { * Virtual LAN Ethernet header */ struct vlan_ethernet_hdr { - uchar vet_dest[6]; /* Destination node */ - uchar vet_src[6]; /* Source node */ - ushort vet_vlan_type; /* PROT_VLAN */ - ushort vet_tag; /* TAG of VLAN */ - ushort vet_type; /* protocol type */ + u8 vet_dest[6]; /* Destination node */ + u8 vet_src[6]; /* Source node */ + u16 vet_vlan_type; /* PROT_VLAN */ + u16 vet_tag; /* TAG of VLAN */ + u16 vet_type; /* protocol type */ };

/* VLAN Ethernet header size */ @@ -305,14 +305,14 @@ struct vlan_ethernet_hdr { * Internet Protocol (IP) header. */ struct ip_hdr { - uchar ip_hl_v; /* header length and version */ - uchar ip_tos; /* type of service */ - ushort ip_len; /* total length */ - ushort ip_id; /* identification */ - ushort ip_off; /* fragment offset field */ - uchar ip_ttl; /* time to live */ - uchar ip_p; /* protocol */ - ushort ip_sum; /* checksum */ + u8 ip_hl_v; /* header length and version */ + u8 ip_tos; /* type of service */ + u16 ip_len; /* total length */ + u16 ip_id; /* identification */ + u16 ip_off; /* fragment offset field */ + u8 ip_ttl; /* time to live */ + u8 ip_p; /* protocol */ + u16 ip_sum; /* checksum */ struct in_addr ip_src; /* Source IP address */ struct in_addr ip_dst; /* Destination IP address */ }; @@ -329,20 +329,20 @@ struct ip_hdr { * Internet Protocol (IP) + UDP header. */ struct ip_udp_hdr { - uchar ip_hl_v; /* header length and version */ - uchar ip_tos; /* type of service */ - ushort ip_len; /* total length */ - ushort ip_id; /* identification */ - ushort ip_off; /* fragment offset field */ - uchar ip_ttl; /* time to live */ - uchar ip_p; /* protocol */ - ushort ip_sum; /* checksum */ + u8 ip_hl_v; /* header length and version */ + u8 ip_tos; /* type of service */ + u16 ip_len; /* total length */ + u16 ip_id; /* identification */ + u16 ip_off; /* fragment offset field */ + u8 ip_ttl; /* time to live */ + u8 ip_p; /* protocol */ + u16 ip_sum; /* checksum */ struct in_addr ip_src; /* Source IP address */ struct in_addr ip_dst; /* Destination IP address */ - ushort udp_src; /* UDP source port */ - ushort udp_dst; /* UDP destination port */ - ushort udp_len; /* Length of UDP packet */ - ushort udp_xsum; /* Checksum */ + u16 udp_src; /* UDP source port */ + u16 udp_dst; /* UDP destination port */ + u16 udp_len; /* Length of UDP packet */ + u16 udp_xsum; /* Checksum */ };

#define IP_UDP_HDR_SIZE (sizeof(struct ip_udp_hdr)) @@ -352,14 +352,14 @@ struct ip_udp_hdr { * Address Resolution Protocol (ARP) header. */ struct arp_hdr { - ushort ar_hrd; /* Format of hardware address */ + u16 ar_hrd; /* Format of hardware address */ # define ARP_ETHER 1 /* Ethernet hardware address */ - ushort ar_pro; /* Format of protocol address */ - uchar ar_hln; /* Length of hardware address */ + u16 ar_pro; /* Format of protocol address */ + u8 ar_hln; /* Length of hardware address */ # define ARP_HLEN 6 - uchar ar_pln; /* Length of protocol address */ + u8 ar_pln; /* Length of protocol address */ # define ARP_PLEN 4 - ushort ar_op; /* Operation */ + u16 ar_op; /* Operation */ # define ARPOP_REQUEST 1 /* Request to resolve address */ # define ARPOP_REPLY 2 /* Response to previous request */

@@ -371,16 +371,16 @@ struct arp_hdr { * the sizes above, and are defined as appropriate for * specific hardware/protocol combinations. */ - uchar ar_data[0]; + u8 ar_data[0]; #define ar_sha ar_data[0] #define ar_spa ar_data[ARP_HLEN] #define ar_tha ar_data[ARP_HLEN + ARP_PLEN] #define ar_tpa ar_data[ARP_HLEN + ARP_PLEN + ARP_HLEN] #if 0 - uchar ar_sha[]; /* Sender hardware address */ - uchar ar_spa[]; /* Sender protocol address */ - uchar ar_tha[]; /* Target hardware address */ - uchar ar_tpa[]; /* Target protocol address */ + u8 ar_sha[]; /* Sender hardware address */ + u8 ar_spa[]; /* Sender protocol address */ + u8 ar_tha[]; /* Target hardware address */ + u8 ar_tpa[]; /* Target protocol address */ #endif /* 0 */ };

@@ -402,20 +402,20 @@ struct arp_hdr { #define ICMP_NOT_REACH_PORT 3 /* Port unreachable */

struct icmp_hdr { - uchar type; - uchar code; - ushort checksum; + u8 type; + u8 code; + u16 checksum; union { struct { - ushort id; - ushort sequence; + u16 id; + u16 sequence; } echo; u32 gateway; struct { - ushort unused; - ushort mtu; + u16 unused; + u16 mtu; } frag; - uchar data[0]; + u8 data[0]; } un; };

diff --git a/net/bootp.h b/net/bootp.h index 1a59286..fcb0a64 100644 --- a/net/bootp.h +++ b/net/bootp.h @@ -30,22 +30,22 @@ extern u8 *dhcp_vendorex_proc(u8 *e); /*rtn next e if mine,else NULL */ #endif

struct bootp_hdr { - uchar bp_op; /* Operation */ + u8 bp_op; /* Operation */ # define OP_BOOTREQUEST 1 # define OP_BOOTREPLY 2 - uchar bp_htype; /* Hardware type */ + u8 bp_htype; /* Hardware type */ # define HWT_ETHER 1 - uchar bp_hlen; /* Hardware address length */ + u8 bp_hlen; /* Hardware address length */ # define HWL_ETHER 6 - uchar bp_hops; /* Hop count (gateway thing) */ + u8 bp_hops; /* Hop count (gateway thing) */ u32 bp_id; /* Transaction ID */ - ushort bp_secs; /* Seconds since boot */ - ushort bp_spare1; /* Alignment */ + u16 bp_secs; /* Seconds since boot */ + u16 bp_spare1; /* Alignment */ struct in_addr bp_ciaddr; /* Client IP address */ struct in_addr bp_yiaddr; /* Your (client) IP address */ struct in_addr bp_siaddr; /* Server IP address */ struct in_addr bp_giaddr; /* Gateway IP address */ - uchar bp_chaddr[16]; /* Client hardware address */ + u8 bp_chaddr[16]; /* Client hardware address */ char bp_sname[64]; /* Server host name */ char bp_file[128]; /* Boot file name */ char bp_vend[OPT_FIELD_SIZE]; /* Vendor information */

More net features enabled and supported on sandbox to allow more testing

Signed-off-by: Joe Hershberger joe.hershberger@ni.com ---

Changes in v2: -New to series

include/configs/sandbox.h | 9 +++++++++ 1 file changed, 9 insertions(+)

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index c49a847..a9ac106 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -130,6 +130,15 @@ /* include default commands */ #include <config_cmd_default.h>

+#define CONFIG_KEEP_SERVERADDR +#define CONFIG_UDP_CHECKSUM +#define CONFIG_CMD_LINK_LOCAL +#define CONFIG_CMD_CDP +#define CONFIG_CMD_DNS +#define CONFIG_CMD_NFS +#define CONFIG_CMD_SNTP +#define CONFIG_TIMESTAMP +#define CONFIG_CMD_RARP #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_BOOTP_DNS