/** BOOTP EXTENTIONS **/
/* Our subnet mask (0=unknown) */
-IPaddr_t NetOurSubnetMask=0;
+IPaddr_t NetOurSubnetMask;
/* Our gateways IP address */
-IPaddr_t NetOurGatewayIP=0;
+IPaddr_t NetOurGatewayIP;
/* Our DNS IP address */
-IPaddr_t NetOurDNSIP=0;
+IPaddr_t NetOurDNSIP;
#if defined(CONFIG_BOOTP_DNS2)
/* Our 2nd DNS IP address */
-IPaddr_t NetOurDNS2IP=0;
+IPaddr_t NetOurDNS2IP;
#endif
/* Our NIS domain */
-char NetOurNISDomain[32]={0,};
+char NetOurNISDomain[32] = {0,};
/* Our hostname */
-char NetOurHostName[32]={0,};
+char NetOurHostName[32] = {0,};
/* Our bootpath */
-char NetOurRootPath[64]={0,};
+char NetOurRootPath[64] = {0,};
/* Our bootfile size in blocks */
-ushort NetBootFileSize=0;
+ushort NetBootFileSize;
#ifdef CONFIG_MCAST_TFTP /* Multicast TFTP */
IPaddr_t Mcast_addr;
/* Our ethernet address */
uchar NetOurEther[6];
/* Boot server enet address */
-uchar NetServerEther[6] =
- { 0, 0, 0, 0, 0, 0 };
+uchar NetServerEther[6];
/* Our IP addr (0 = unknown) */
IPaddr_t NetOurIP;
/* Server IP addr (0 = unknown) */
/* IP packet ID */
unsigned NetIPID;
/* Ethernet bcast address */
-uchar NetBcastAddr[6] =
- { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-uchar NetEtherNullAddr[6] =
- { 0, 0, 0, 0, 0, 0 };
+uchar NetBcastAddr[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+uchar NetEtherNullAddr[6];
#ifdef CONFIG_API
void (*push_packet)(volatile void *, int len) = 0;
#endif
#if defined(CONFIG_CMD_CDP)
/* Ethernet bcast address */
-uchar NetCDPAddr[6] =
- { 0x01, 0x00, 0x0c, 0xcc, 0xcc, 0xcc };
+uchar NetCDPAddr[6] = { 0x01, 0x00, 0x0c, 0xcc, 0xcc, 0xcc };
#endif
/* Network loop state */
int NetState;
#ifdef CONFIG_NET_MULTI
/* Tried all network devices */
-int NetRestartWrap = 0;
+int NetRestartWrap;
/* Network loop restarted */
-static int NetRestarted = 0;
+static int NetRestarted;
/* At least one device configured */
-static int NetDevExists = 0;
+static int NetDevExists;
#endif
/* XXX in both little & big endian machines 0xFFFF == ntohs(-1) */
/* NTP server IP address */
IPaddr_t NetNtpServerIP;
/* offset time from UTC */
-int NetTimeOffset=0;
+int NetTimeOffset;
#endif
#ifdef CONFIG_NETCONSOLE
/* Current timeout value */
static ulong timeDelta;
/* THE transmit packet */
-volatile uchar *NetTxPacket = 0;
+volatile uchar *NetTxPacket;
-static int net_check_prereq (proto_t protocol);
+static int net_check_prereq(proto_t protocol);
static int NetTryCount;
ulong NetArpWaitTimerStart;
int NetArpWaitTry;
-void ArpRequest (void)
+void ArpRequest(void)
{
int i;
volatile uchar *pkt;
pkt = NetTxPacket;
- pkt += NetSetEther (pkt, NetBcastAddr, PROT_ARP);
+ pkt += NetSetEther(pkt, NetBcastAddr, PROT_ARP);
arp = (ARP_t *) pkt;
- arp->ar_hrd = htons (ARP_ETHER);
- arp->ar_pro = htons (PROT_IP);
+ arp->ar_hrd = htons(ARP_ETHER);
+ arp->ar_pro = htons(PROT_IP);
arp->ar_hln = 6;
arp->ar_pln = 4;
- arp->ar_op = htons (ARPOP_REQUEST);
+ arp->ar_op = htons(ARPOP_REQUEST);
/* source ET addr */
- memcpy (&arp->ar_data[0], NetOurEther, 6);
+ memcpy(&arp->ar_data[0], NetOurEther, 6);
/* source IP addr */
- NetWriteIP ((uchar *) & arp->ar_data[6], NetOurIP);
+ NetWriteIP((uchar *) &arp->ar_data[6], NetOurIP);
for (i = 10; i < 16; ++i) {
/* dest ET addr = 0 */
arp->ar_data[i] = 0;
if ((NetArpWaitPacketIP & NetOurSubnetMask) !=
(NetOurIP & NetOurSubnetMask)) {
if (NetOurGatewayIP == 0) {
- puts ("## Warning: gatewayip needed but not set\n");
+ puts("## Warning: gatewayip needed but not set\n");
NetArpWaitReplyIP = NetArpWaitPacketIP;
} else {
NetArpWaitReplyIP = NetOurGatewayIP;
NetArpWaitReplyIP = NetArpWaitPacketIP;
}
- NetWriteIP ((uchar *) & arp->ar_data[16], NetArpWaitReplyIP);
- (void) eth_send (NetTxPacket, (pkt - NetTxPacket) + ARP_HDR_SIZE);
+ NetWriteIP((uchar *) &arp->ar_data[16], NetArpWaitReplyIP);
+ (void) eth_send(NetTxPacket, (pkt - NetTxPacket) + ARP_HDR_SIZE);
}
void ArpTimeoutCheck(void)
NetArpWaitTry++;
if (NetArpWaitTry >= ARP_TIMEOUT_COUNT) {
- puts ("\nARP Retry count exceeded; starting again\n");
+ puts("\nARP Retry count exceeded; starting again\n");
NetArpWaitTry = 0;
NetStartAgain();
} else {
static void
NetInitLoop(proto_t protocol)
{
- static int env_changed_id = 0;
+ static int env_changed_id;
bd_t *bd = gd->bd;
- int env_id = get_env_id ();
+ int env_id = get_env_id();
/* update only when the environment has changed */
if (env_changed_id != env_id) {
- NetCopyIP(&NetOurIP, &bd->bi_ip_addr);
- NetOurGatewayIP = getenv_IPaddr ("gatewayip");
- NetOurSubnetMask= getenv_IPaddr ("netmask");
- NetServerIP = getenv_IPaddr ("serverip");
+ NetOurIP = getenv_IPaddr("ipaddr");
+ NetCopyIP(&bd->bi_ip_addr, &NetOurIP);
+ NetOurGatewayIP = getenv_IPaddr("gatewayip");
+ NetOurSubnetMask = getenv_IPaddr("netmask");
+ NetServerIP = getenv_IPaddr("serverip");
NetOurNativeVLAN = getenv_VLAN("nvlan");
NetOurVLAN = getenv_VLAN("vlan");
#if defined(CONFIG_CMD_DNS)
*/
NetTxPacket = &PktBuf[0] + (PKTALIGN - 1);
NetTxPacket -= (ulong)NetTxPacket % PKTALIGN;
- for (i = 0; i < PKTBUFSRX; i++) {
+ for (i = 0; i < PKTBUFSRX; i++)
NetRxPackets[i] = NetTxPacket + (i+1)*PKTSIZE_ALIGN;
- }
}
if (!NetArpWaitTxPacket) {
#endif
if (eth_init(bd) < 0) {
eth_halt();
- return(-1);
+ return -1;
}
restart:
#ifdef CONFIG_NET_MULTI
- memcpy (NetOurEther, eth_get_dev()->enetaddr, 6);
+ memcpy(NetOurEther, eth_get_dev()->enetaddr, 6);
#else
eth_getenv_enetaddr("ethaddr", NetOurEther);
#endif
*/
NetInitLoop(protocol);
- switch (net_check_prereq (protocol)) {
+ switch (net_check_prereq(protocol)) {
case 1:
/* network not configured */
eth_halt();
- return (-1);
+ return -1;
#ifdef CONFIG_NET_MULTI
case 2:
/* always use ARP to get server ethernet address */
TftpStart();
break;
-
+#ifdef CONFIG_CMD_TFTPSRV
+ case TFTPSRV:
+ TftpStartServer();
+ break;
+#endif
#if defined(CONFIG_CMD_DHCP)
case DHCP:
BootpTry = 0;
case BOOTP:
BootpTry = 0;
NetOurIP = 0;
- BootpRequest ();
+ BootpRequest();
break;
#if defined(CONFIG_CMD_RARP)
case RARP:
RarpTry = 0;
NetOurIP = 0;
- RarpRequest ();
+ RarpRequest();
break;
#endif
#if defined(CONFIG_CMD_PING)
/*
* Echo the inverted link state to the fault LED.
*/
- if(miiphy_link(eth_get_dev()->name, CONFIG_SYS_FAULT_MII_ADDR)) {
- status_led_set (STATUS_LED_RED, STATUS_LED_OFF);
- } else {
- status_led_set (STATUS_LED_RED, STATUS_LED_ON);
- }
+ if (miiphy_link(eth_get_dev()->name, CONFIG_SYS_FAULT_MII_ADDR))
+ status_led_set(STATUS_LED_RED, STATUS_LED_OFF);
+ else
+ status_led_set(STATUS_LED_RED, STATUS_LED_ON);
#endif /* CONFIG_SYS_FAULT_ECHO_LINK_DOWN, ... */
#endif /* CONFIG_MII, ... */
*/
if (ctrlc()) {
eth_halt();
- puts ("\nAbort\n");
- return (-1);
+ puts("\nAbort\n");
+ return -1;
}
ArpTimeoutCheck();
thand_f *x;
#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
-# if defined(CONFIG_SYS_FAULT_ECHO_LINK_DOWN) && \
- defined(CONFIG_STATUS_LED) && \
- defined(STATUS_LED_RED)
+#if defined(CONFIG_SYS_FAULT_ECHO_LINK_DOWN) && \
+ defined(CONFIG_STATUS_LED) && \
+ defined(STATUS_LED_RED)
/*
* Echo the inverted link state to the fault LED.
*/
- if(miiphy_link(eth_get_dev()->name,
+ if (miiphy_link(eth_get_dev()->name,
CONFIG_SYS_FAULT_MII_ADDR)) {
- status_led_set (STATUS_LED_RED, STATUS_LED_OFF);
+ status_led_set(STATUS_LED_RED, STATUS_LED_OFF);
} else {
- status_led_set (STATUS_LED_RED, STATUS_LED_ON);
+ status_led_set(STATUS_LED_RED, STATUS_LED_ON);
}
-# endif /* CONFIG_SYS_FAULT_ECHO_LINK_DOWN, ... */
+#endif /* CONFIG_SYS_FAULT_ECHO_LINK_DOWN, ... */
#endif /* CONFIG_MII, ... */
x = timeHandler;
timeHandler = (thand_f *)0;
return NetBootFileXferSize;
case NETLOOP_FAIL:
- return (-1);
+ return -1;
}
}
}
/* Totally ignore the packet */
}
-void NetStartAgain (void)
+void NetStartAgain(void)
{
char *nretry;
int retry_forever = 0;
NetTryCount++;
#ifndef CONFIG_NET_MULTI
- NetSetTimeout (10000UL, startAgainTimeout);
- NetSetHandler (startAgainHandler);
+ NetSetTimeout(10000UL, startAgainTimeout);
+ NetSetHandler(startAgainHandler);
#else /* !CONFIG_NET_MULTI*/
- eth_halt ();
+ eth_halt();
#if !defined(CONFIG_NET_DO_NOT_TRY_ANOTHER)
- eth_try_another (!NetRestarted);
+ eth_try_another(!NetRestarted);
#endif
- eth_init (gd->bd);
+ eth_init(gd->bd);
if (NetRestartWrap) {
NetRestartWrap = 0;
if (NetDevExists) {
- NetSetTimeout (10000UL, startAgainTimeout);
- NetSetHandler (startAgainHandler);
+ NetSetTimeout(10000UL, startAgainTimeout);
+ NetSetHandler(startAgainHandler);
} else {
NetState = NETLOOP_FAIL;
}
*/
void
-NetSetHandler(rxhand_f * f)
+NetSetHandler(rxhand_f *f)
{
packetHandler = f;
}
void
-NetSetTimeout(ulong iv, thand_f * f)
+NetSetTimeout(ulong iv, thand_f *f)
{
if (iv == 0) {
timeHandler = (thand_f *)0;
void
-NetSendPacket(volatile uchar * pkt, int len)
+NetSendPacket(volatile uchar *pkt, int len)
{
(void) eth_send(pkt, len);
}
NetArpWaitPacketMAC = ether;
pkt = NetArpWaitTxPacket;
- pkt += NetSetEther (pkt, NetArpWaitPacketMAC, PROT_IP);
+ pkt += NetSetEther(pkt, NetArpWaitPacketMAC, PROT_IP);
- NetSetIP (pkt, dest, dport, sport, len);
+ NetSetIP(pkt, dest, dport, sport, len);
memcpy(pkt + IP_HDR_SIZE, (uchar *)NetTxPacket +
(pkt - (uchar *)NetArpWaitTxPacket) + IP_HDR_SIZE, len);
debug("sending UDP to %08lx/%pM\n", dest, ether);
pkt = (uchar *)NetTxPacket;
- pkt += NetSetEther (pkt, ether, PROT_IP);
- NetSetIP (pkt, dest, dport, sport, len);
+ pkt += NetSetEther(pkt, ether, PROT_IP);
+ NetSetIP(pkt, dest, dport, sport, len);
(void) eth_send(NetTxPacket, (pkt - NetTxPacket) + IP_HDR_SIZE + len);
return 0; /* transmitted */
ip->ip_p = 0x01; /* ICMP */
ip->ip_sum = 0;
/* already in network byte order */
- NetCopyIP((void*)&ip->ip_src, &NetOurIP);
+ NetCopyIP((void *)&ip->ip_src, &NetOurIP);
/* - "" - */
- NetCopyIP((void*)&ip->ip_dst, &NetPingIP);
+ NetCopyIP((void *)&ip->ip_dst, &NetPingIP);
ip->ip_sum = ~NetCksum((uchar *)ip, IP_HDR_SIZE_NO_UDP / 2);
s = &ip->udp_src; /* XXX ICMP starts here */
}
static void
-PingTimeout (void)
+PingTimeout(void)
{
eth_halt();
NetState = NETLOOP_FAIL; /* we did not get the reply */
static void PingStart(void)
{
#if defined(CONFIG_NET_MULTI)
- printf ("Using %s device\n", eth_get_name());
+ printf("Using %s device\n", eth_get_name());
#endif /* CONFIG_NET_MULTI */
- NetSetTimeout (10000UL, PingTimeout);
- NetSetHandler (PingHandler);
+ NetSetTimeout(10000UL, PingTimeout);
+ NetSetHandler(PingHandler);
PingSend();
}
Ethernet_t *et;
int len;
ushort chksum;
-#if defined(CONFIG_CDP_DEVICE_ID) || defined(CONFIG_CDP_PORT_ID) || \
- defined(CONFIG_CDP_VERSION) || defined(CONFIG_CDP_PLATFORM)
+#if defined(CONFIG_CDP_DEVICE_ID) || defined(CONFIG_CDP_PORT_ID) || \
+ defined(CONFIG_CDP_VERSION) || defined(CONFIG_CDP_PLATFORM)
char buf[32];
#endif
}
static void
-CDPTimeout (void)
+CDPTimeout(void)
{
CDPSeq++;
if (CDPSeq < 3) {
- NetSetTimeout (CDP_TIMEOUT, CDPTimeout);
+ NetSetTimeout(CDP_TIMEOUT, CDPTimeout);
CDPSendTrigger();
return;
}
}
static void
-CDPHandler(const uchar * pkt, unsigned len)
+CDPHandler(const uchar *pkt, unsigned len)
{
const uchar *t;
const ushort *ss;
ss = (const ushort *)pkt;
type = ntohs(ss[0]);
tlen = ntohs(ss[1]);
- if (tlen > len) {
+ if (tlen > len)
goto pkt_short;
- }
pkt += tlen;
len -= tlen;
tlen -= 4;
switch (type) {
- case CDP_DEVICE_ID_TLV:
- break;
- case CDP_ADDRESS_TLV:
- break;
- case CDP_PORT_ID_TLV:
- break;
- case CDP_CAPABILITIES_TLV:
- break;
- case CDP_VERSION_TLV:
- break;
- case CDP_PLATFORM_TLV:
- break;
- case CDP_NATIVE_VLAN_TLV:
- nvlan = *ss;
- break;
- case CDP_APPLIANCE_VLAN_TLV:
- t = (const uchar *)ss;
- while (tlen > 0) {
- if (tlen < 3)
- goto pkt_short;
+ case CDP_DEVICE_ID_TLV:
+ break;
+ case CDP_ADDRESS_TLV:
+ break;
+ case CDP_PORT_ID_TLV:
+ break;
+ case CDP_CAPABILITIES_TLV:
+ break;
+ case CDP_VERSION_TLV:
+ break;
+ case CDP_PLATFORM_TLV:
+ break;
+ case CDP_NATIVE_VLAN_TLV:
+ nvlan = *ss;
+ break;
+ case CDP_APPLIANCE_VLAN_TLV:
+ t = (const uchar *)ss;
+ while (tlen > 0) {
+ if (tlen < 3)
+ goto pkt_short;
- applid = t[0];
- ss = (const ushort *)(t + 1);
+ applid = t[0];
+ ss = (const ushort *)(t + 1);
#ifdef CONFIG_CDP_APPLIANCE_VLAN_TYPE
- if (applid ==
- CONFIG_CDP_APPLIANCE_VLAN_TYPE)
- vlan = *ss;
+ if (applid == CONFIG_CDP_APPLIANCE_VLAN_TYPE)
+ vlan = *ss;
#else
- /* XXX will this work; dunno */
- vlan = ntohs(*ss);
+ /* XXX will this work; dunno */
+ vlan = ntohs(*ss);
#endif
- t += 3; tlen -= 3;
- }
- break;
- case CDP_TRIGGER_TLV:
- break;
- case CDP_POWER_CONSUMPTION_TLV:
- break;
- case CDP_SYSNAME_TLV:
- break;
- case CDP_SYSOBJECT_TLV:
- break;
- case CDP_MANAGEMENT_ADDRESS_TLV:
- break;
+ t += 3; tlen -= 3;
+ }
+ break;
+ case CDP_TRIGGER_TLV:
+ break;
+ case CDP_POWER_CONSUMPTION_TLV:
+ break;
+ case CDP_SYSNAME_TLV:
+ break;
+ case CDP_SYSOBJECT_TLV:
+ break;
+ case CDP_MANAGEMENT_ADDRESS_TLV:
+ break;
}
}
static void CDPStart(void)
{
#if defined(CONFIG_NET_MULTI)
- printf ("Using %s device\n", eth_get_name());
+ printf("Using %s device\n", eth_get_name());
#endif
CDPSeq = 0;
CDPOK = 0;
CDPNativeVLAN = htons(-1);
CDPApplianceVLAN = htons(-1);
- NetSetTimeout (CDP_TIMEOUT, CDPTimeout);
- NetSetHandler (CDPDummyHandler);
+ NetSetTimeout(CDP_TIMEOUT, CDPTimeout);
+ NetSetHandler(CDPDummyHandler);
CDPSendTrigger();
}
* (thus being a superset of a previously-received fragment).
*/
- if ( (h >= thisfrag) && (h->last_byte <= start + len) ) {
+ if ((h >= thisfrag) && (h->last_byte <= start + len)) {
/* complete overlap with hole: remove hole */
if (!h->prev_hole && !h->next_hole) {
/* last remaining hole */
#endif
void
-NetReceive(volatile uchar * inpkt, int len)
+NetReceive(volatile uchar *inpkt, int len)
{
Ethernet_t *et;
IP_t *ip;
printf("bad length %d < %d\n", len, ARP_HDR_SIZE);
return;
}
- if (ntohs(arp->ar_hrd) != ARP_ETHER) {
+ if (ntohs(arp->ar_hrd) != ARP_ETHER)
return;
- }
- if (ntohs(arp->ar_pro) != PROT_IP) {
+ if (ntohs(arp->ar_pro) != PROT_IP)
return;
- }
- if (arp->ar_hln != 6) {
+ if (arp->ar_hln != 6)
return;
- }
- if (arp->ar_pln != 4) {
+ if (arp->ar_pln != 4)
return;
- }
- if (NetOurIP == 0) {
+ if (NetOurIP == 0)
return;
- }
- if (NetReadIP(&arp->ar_data[16]) != NetOurIP) {
+ if (NetReadIP(&arp->ar_data[16]) != NetOurIP)
return;
- }
switch (ntohs(arp->ar_op)) {
case ARPOP_REQUEST:
pkt = (uchar *)et;
pkt += NetSetEther(pkt, et->et_src, PROT_ARP);
arp->ar_op = htons(ARPOP_REPLY);
- memcpy (&arp->ar_data[10], &arp->ar_data[0], 6);
+ memcpy(&arp->ar_data[10], &arp->ar_data[0], 6);
NetCopyIP(&arp->ar_data[16], &arp->ar_data[6]);
- memcpy (&arp->ar_data[ 0], NetOurEther, 6);
- NetCopyIP(&arp->ar_data[ 6], &NetOurIP);
+ memcpy(&arp->ar_data[0], NetOurEther, 6);
+ NetCopyIP(&arp->ar_data[6], &NetOurIP);
(void) eth_send((uchar *)et,
(pkt - (uchar *)et) + ARP_HDR_SIZE);
return;
(ntohs(arp->ar_pro) != PROT_IP) ||
(arp->ar_hln != 6) || (arp->ar_pln != 4)) {
- puts ("invalid RARP header\n");
+ puts("invalid RARP header\n");
} else {
- NetCopyIP(&NetOurIP, &arp->ar_data[16]);
+ NetCopyIP(&NetOurIP, &arp->ar_data[16]);
if (NetServerIP == 0)
- NetCopyIP(&NetServerIP, &arp->ar_data[ 6]);
- memcpy (NetServerEther, &arp->ar_data[ 0], 6);
+ NetCopyIP(&NetServerIP, &arp->ar_data[6]);
+ memcpy(NetServerEther, &arp->ar_data[0], 6);
(*packetHandler)(0, 0, 0, 0, 0);
}
debug("len=%d, v=%02x\n", len, ip->ip_hl_v & 0xff);
/* Can't deal with anything except IPv4 */
- if ((ip->ip_hl_v & 0xf0) != 0x40) {
+ if ((ip->ip_hl_v & 0xf0) != 0x40)
return;
- }
/* Can't deal with IP options (headers != 20 bytes) */
- if ((ip->ip_hl_v & 0x0f) > 0x05) {
+ if ((ip->ip_hl_v & 0x0f) > 0x05)
return;
- }
/* Check the Checksum of the header */
if (!NetCksumOk((uchar *)ip, IP_HDR_SIZE_NO_UDP / 2)) {
- puts ("checksum bad\n");
+ puts("checksum bad\n");
return;
}
/* If it is not for us, ignore it */
#ifdef CONFIG_MCAST_TFTP
if (Mcast_addr != tmp)
#endif
- return;
+ return;
}
/* Read source IP address for later use */
src_ip = NetReadIP(&ip->ip_src);
* a fragment, and either the complete packet or NULL if
* it is a fragment (if !CONFIG_IP_DEFRAG, it returns NULL)
*/
- if (!(ip = NetDefragment(ip, &len)))
+ ip = NetDefragment(ip, &len);
+ if (!ip)
return;
/*
* watch for ICMP host redirects
case ICMP_REDIRECT:
if (icmph->code != ICMP_REDIR_HOST)
return;
- printf (" ICMP Host Redirect to %pI4 ",
+ printf(" ICMP Host Redirect to %pI4 ",
&icmph->un.gateway);
return;
#if defined(CONFIG_CMD_PING)
debug("Got ICMP ECHO REQUEST, return %d bytes\n",
ETHER_HDR_SIZE + len);
- memcpy (&et->et_dest[0], &et->et_src[0], 6);
- memcpy (&et->et_src[ 0], NetOurEther, 6);
+ memcpy(&et->et_dest[0], &et->et_src[0], 6);
+ memcpy(&et->et_src[0], NetOurEther, 6);
ip->ip_sum = 0;
ip->ip_off = 0;
- NetCopyIP((void*)&ip->ip_dst, &ip->ip_src);
- NetCopyIP((void*)&ip->ip_src, &NetOurIP);
+ NetCopyIP((void *)&ip->ip_dst, &ip->ip_src);
+ NetCopyIP((void *)&ip->ip_src, &NetOurIP);
ip->ip_sum = ~NetCksum((uchar *)ip,
IP_HDR_SIZE_NO_UDP >> 1);
#ifdef CONFIG_NETCONSOLE
- nc_input_packet((uchar *)ip +IP_HDR_SIZE,
+ nc_input_packet((uchar *)ip + IP_HDR_SIZE,
ntohs(ip->udp_dst),
ntohs(ip->udp_src),
ntohs(ip->udp_len) - 8);
/*
* IP header OK. Pass the packet to the current handler.
*/
- (*packetHandler)((uchar *)ip +IP_HDR_SIZE,
+ (*packetHandler)((uchar *)ip + IP_HDR_SIZE,
ntohs(ip->udp_dst),
src_ip,
ntohs(ip->udp_src),
/**********************************************************************/
-static int net_check_prereq (proto_t protocol)
+static int net_check_prereq(proto_t protocol)
{
switch (protocol) {
/* Fall through */
#if defined(CONFIG_CMD_PING)
case PING:
if (NetPingIP == 0) {
- puts ("*** ERROR: ping address not given\n");
- return (1);
+ puts("*** ERROR: ping address not given\n");
+ return 1;
}
goto common;
#endif
#if defined(CONFIG_CMD_SNTP)
case SNTP:
if (NetNtpServerIP == 0) {
- puts ("*** ERROR: NTP server address not given\n");
- return (1);
+ puts("*** ERROR: NTP server address not given\n");
+ return 1;
}
goto common;
#endif
#endif
case TFTP:
if (NetServerIP == 0) {
- puts ("*** ERROR: `serverip' not set\n");
- return (1);
+ puts("*** ERROR: `serverip' not set\n");
+ return 1;
}
-#if defined(CONFIG_CMD_PING) || defined(CONFIG_CMD_SNTP) || \
- defined(CONFIG_CMD_DNS)
- common:
+#if defined(CONFIG_CMD_PING) || defined(CONFIG_CMD_SNTP) || \
+ defined(CONFIG_CMD_DNS)
+common:
#endif
/* Fall through */
case NETCONS:
+ case TFTPSRV:
if (NetOurIP == 0) {
- puts ("*** ERROR: `ipaddr' not set\n");
- return (1);
+ puts("*** ERROR: `ipaddr' not set\n");
+ return 1;
}
/* Fall through */
case BOOTP:
case CDP:
case DHCP:
- if (memcmp (NetOurEther, "\0\0\0\0\0\0", 6) == 0) {
+ if (memcmp(NetOurEther, "\0\0\0\0\0\0", 6) == 0) {
#ifdef CONFIG_NET_MULTI
- extern int eth_get_dev_index (void);
- int num = eth_get_dev_index ();
+ extern int eth_get_dev_index(void);
+ int num = eth_get_dev_index();
switch (num) {
case -1:
- puts ("*** ERROR: No ethernet found.\n");
- return (1);
+ puts("*** ERROR: No ethernet found.\n");
+ return 1;
case 0:
- puts ("*** ERROR: `ethaddr' not set\n");
+ puts("*** ERROR: `ethaddr' not set\n");
break;
default:
- printf ("*** ERROR: `eth%daddr' not set\n",
+ printf("*** ERROR: `eth%daddr' not set\n",
num);
break;
}
- NetStartAgain ();
- return (2);
+ NetStartAgain();
+ return 2;
#else
- puts ("*** ERROR: `ethaddr' not set\n");
- return (1);
+ puts("*** ERROR: `ethaddr' not set\n");
+ return 1;
#endif
}
/* Fall through */
default:
- return (0);
+ return 0;
}
- return (0); /* OK */
+ return 0; /* OK */
}
/**********************************************************************/
int
-NetCksumOk(uchar * ptr, int len)
+NetCksumOk(uchar *ptr, int len)
{
return !((NetCksum(ptr, len) + 1) & 0xfffe);
}
unsigned
-NetCksum(uchar * ptr, int len)
+NetCksum(uchar *ptr, int len)
{
ulong xsum;
ushort *p = (ushort *)ptr;
xsum += *p++;
xsum = (xsum & 0xffff) + (xsum >> 16);
xsum = (xsum & 0xffff) + (xsum >> 16);
- return (xsum & 0xffff);
+ return xsum & 0xffff;
}
int
}
int
-NetSetEther(volatile uchar * xet, uchar * addr, uint prot)
+NetSetEther(volatile uchar *xet, uchar * addr, uint prot)
{
Ethernet_t *et = (Ethernet_t *)xet;
ushort myvlanid;
if (myvlanid == (ushort)-1)
myvlanid = VLAN_NONE;
- memcpy (et->et_dest, addr, 6);
- memcpy (et->et_src, NetOurEther, 6);
+ memcpy(et->et_dest, addr, 6);
+ memcpy(et->et_src, NetOurEther, 6);
if ((myvlanid & VLAN_IDMASK) == VLAN_NONE) {
- et->et_protlen = htons(prot);
+ et->et_protlen = htons(prot);
return ETHER_HDR_SIZE;
} else {
VLAN_Ethernet_t *vet = (VLAN_Ethernet_t *)xet;
}
void
-NetSetIP(volatile uchar * xip, IPaddr_t dest, int dport, int sport, int len)
+NetSetIP(volatile uchar *xip, IPaddr_t dest, int dport, int sport, int len)
{
IP_t *ip = (IP_t *)xip;
ip->ip_p = 17; /* UDP */
ip->ip_sum = 0;
/* already in network byte order */
- NetCopyIP((void*)&ip->ip_src, &NetOurIP);
+ NetCopyIP((void *)&ip->ip_src, &NetOurIP);
/* - "" - */
- NetCopyIP((void*)&ip->ip_dst, &dest);
+ NetCopyIP((void *)&ip->ip_dst, &dest);
ip->udp_src = htons(sport);
ip->udp_dst = htons(dport);
ip->udp_len = htons(8 + len);
ip->ip_sum = ~NetCksum((uchar *)ip, IP_HDR_SIZE_NO_UDP / 2);
}
-void copy_filename (char *dst, const char *src, int size)
+void copy_filename(char *dst, const char *src, int size)
{
if (*src && (*src == '"')) {
++src;
--size;
}
- while ((--size > 0) && *src && (*src != '"')) {
+ while ((--size > 0) && *src && (*src != '"'))
*dst++ = *src++;
- }
*dst = '\0';
}
}
#endif
-void ip_to_string (IPaddr_t x, char *s)
+void ip_to_string(IPaddr_t x, char *s)
{
- x = ntohl (x);
- sprintf (s, "%d.%d.%d.%d",
- (int) ((x >> 24) & 0xff),
- (int) ((x >> 16) & 0xff),
- (int) ((x >> 8) & 0xff), (int) ((x >> 0) & 0xff)
+ x = ntohl(x);
+ sprintf(s, "%d.%d.%d.%d",
+ (int) ((x >> 24) & 0xff),
+ (int) ((x >> 16) & 0xff),
+ (int) ((x >> 8) & 0xff), (int) ((x >> 0) & 0xff)
);
}
ushort getenv_VLAN(char *var)
{
- return (string_to_VLAN(getenv(var)));
+ return string_to_VLAN(getenv(var));
}