2002-09-27 23:19:37 +00:00
|
|
|
/*
|
|
|
|
* Based on LiMon - BOOTP.
|
|
|
|
*
|
|
|
|
* Copyright 1994, 1995, 2000 Neil Russell.
|
|
|
|
* (See License)
|
|
|
|
* Copyright 2000 Roland Borde
|
|
|
|
* Copyright 2000 Paolo Scaffardi
|
2004-03-12 00:14:09 +00:00
|
|
|
* Copyright 2000-2004 Wolfgang Denk, wd@denx.de
|
2002-09-27 23:19:37 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <common.h>
|
|
|
|
#include <command.h>
|
|
|
|
#include <net.h>
|
|
|
|
#include "bootp.h"
|
|
|
|
#include "tftp.h"
|
2004-03-12 00:14:09 +00:00
|
|
|
#include "nfs.h"
|
2002-09-27 23:19:37 +00:00
|
|
|
#ifdef CONFIG_STATUS_LED
|
|
|
|
#include <status_led.h>
|
|
|
|
#endif
|
2012-07-05 13:19:32 +00:00
|
|
|
#ifdef CONFIG_BOOTP_RANDOM_DELAY
|
|
|
|
#include "net_rand.h"
|
|
|
|
#endif
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2012-05-15 08:59:06 +00:00
|
|
|
#define BOOTP_VENDOR_MAGIC 0x63825363 /* RFC1048 Magic Cookie */
|
2002-09-27 23:19:37 +00:00
|
|
|
|
net: BOOTP retry timeout improvements
Currently, the BOOTP code sends out its initial request as soon as the
Ethernet driver indicates "link up". If this packet is lost or not
replied to for some reason, the code waits for a 1s timeout before
retrying. For some reason, such early packets are often lost on my
system, so this causes an annoying delay.
To optimize this, modify the BOOTP code to have very short timeouts for
the first packet transmitted, but gradually increase the timeout each
time a timeout occurs. This way, if the first packet is lost, the second
packet is transmitted quite quickly and hence the overall delay is low.
However, if there's still no response, we don't keep spewing out packets
at an insane speed.
It's arguably more correct to try and find out why the first packet is
lost. However, it seems to disappear inside my Ethenet chip; the TX chip
indicates no error during TX (not that it has much in the way of
reporting...), yet wireshark on the RX side doesn't see any packet.
FWIW, I'm using an ASIX USB Ethernet adapter. Perhaps "link up" is
reported too early or based on the wrong condition in HW, and we should
add some fixed extra delay into the driver. However, this would slow down
every link up event even if it ends up not being needed in some cases.
Having BOOTP retry quickly applies the fix/WAR to every possible
Ethernet device, and is quite simple to implement, so seems a better
solution.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
2014-07-25 23:30:48 +00:00
|
|
|
/*
|
|
|
|
* The timeout for the initial BOOTP/DHCP request used to be described by a
|
|
|
|
* counter of fixed-length timeout periods. TIMEOUT_COUNT represents
|
|
|
|
* that counter
|
|
|
|
*
|
|
|
|
* Now that the timeout periods are variable (exponential backoff and retry)
|
|
|
|
* we convert the timeout count to the absolute time it would have take to
|
|
|
|
* execute that many retries, and keep sending retry packets until that time
|
|
|
|
* is reached.
|
|
|
|
*/
|
2004-03-12 00:14:09 +00:00
|
|
|
#ifndef CONFIG_NET_RETRY_COUNT
|
2012-05-15 08:59:06 +00:00
|
|
|
# define TIMEOUT_COUNT 5 /* # of timeouts before giving up */
|
2002-09-27 23:19:37 +00:00
|
|
|
#else
|
2004-03-12 00:14:09 +00:00
|
|
|
# define TIMEOUT_COUNT (CONFIG_NET_RETRY_COUNT)
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
net: BOOTP retry timeout improvements
Currently, the BOOTP code sends out its initial request as soon as the
Ethernet driver indicates "link up". If this packet is lost or not
replied to for some reason, the code waits for a 1s timeout before
retrying. For some reason, such early packets are often lost on my
system, so this causes an annoying delay.
To optimize this, modify the BOOTP code to have very short timeouts for
the first packet transmitted, but gradually increase the timeout each
time a timeout occurs. This way, if the first packet is lost, the second
packet is transmitted quite quickly and hence the overall delay is low.
However, if there's still no response, we don't keep spewing out packets
at an insane speed.
It's arguably more correct to try and find out why the first packet is
lost. However, it seems to disappear inside my Ethenet chip; the TX chip
indicates no error during TX (not that it has much in the way of
reporting...), yet wireshark on the RX side doesn't see any packet.
FWIW, I'm using an ASIX USB Ethernet adapter. Perhaps "link up" is
reported too early or based on the wrong condition in HW, and we should
add some fixed extra delay into the driver. However, this would slow down
every link up event even if it ends up not being needed in some cases.
Having BOOTP retry quickly applies the fix/WAR to every possible
Ethernet device, and is quite simple to implement, so seems a better
solution.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
2014-07-25 23:30:48 +00:00
|
|
|
#define TIMEOUT_MS ((3 + (TIMEOUT_COUNT * 5)) * 1000)
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2012-05-15 08:59:06 +00:00
|
|
|
#define PORT_BOOTPS 67 /* BOOTP server UDP port */
|
|
|
|
#define PORT_BOOTPC 68 /* BOOTP client UDP port */
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2012-05-15 08:59:06 +00:00
|
|
|
#ifndef CONFIG_DHCP_MIN_EXT_LEN /* minimal length of extension list */
|
2004-03-12 00:14:09 +00:00
|
|
|
#define CONFIG_DHCP_MIN_EXT_LEN 64
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
|
|
|
|
2014-08-19 08:21:24 +00:00
|
|
|
#ifndef CONFIG_BOOTP_ID_CACHE_SIZE
|
|
|
|
#define CONFIG_BOOTP_ID_CACHE_SIZE 4
|
|
|
|
#endif
|
|
|
|
|
|
|
|
ulong bootp_ids[CONFIG_BOOTP_ID_CACHE_SIZE];
|
|
|
|
unsigned int bootp_num_ids;
|
2002-09-27 23:19:37 +00:00
|
|
|
int BootpTry;
|
net: BOOTP retry timeout improvements
Currently, the BOOTP code sends out its initial request as soon as the
Ethernet driver indicates "link up". If this packet is lost or not
replied to for some reason, the code waits for a 1s timeout before
retrying. For some reason, such early packets are often lost on my
system, so this causes an annoying delay.
To optimize this, modify the BOOTP code to have very short timeouts for
the first packet transmitted, but gradually increase the timeout each
time a timeout occurs. This way, if the first packet is lost, the second
packet is transmitted quite quickly and hence the overall delay is low.
However, if there's still no response, we don't keep spewing out packets
at an insane speed.
It's arguably more correct to try and find out why the first packet is
lost. However, it seems to disappear inside my Ethenet chip; the TX chip
indicates no error during TX (not that it has much in the way of
reporting...), yet wireshark on the RX side doesn't see any packet.
FWIW, I'm using an ASIX USB Ethernet adapter. Perhaps "link up" is
reported too early or based on the wrong condition in HW, and we should
add some fixed extra delay into the driver. However, this would slow down
every link up event even if it ends up not being needed in some cases.
Having BOOTP retry quickly applies the fix/WAR to every possible
Ethernet device, and is quite simple to implement, so seems a better
solution.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
2014-07-25 23:30:48 +00:00
|
|
|
ulong bootp_start;
|
|
|
|
ulong bootp_timeout;
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2007-07-09 22:45:14 +00:00
|
|
|
#if defined(CONFIG_CMD_DHCP)
|
2012-10-29 13:34:33 +00:00
|
|
|
static dhcp_state_t dhcp_state = INIT;
|
|
|
|
static unsigned long dhcp_leasetime;
|
|
|
|
static IPaddr_t NetDHCPServerIP;
|
2011-04-18 06:19:50 +00:00
|
|
|
static void DhcpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
|
|
|
|
unsigned len);
|
2002-09-27 23:19:37 +00:00
|
|
|
|
|
|
|
/* For Debug */
|
2003-04-05 00:53:31 +00:00
|
|
|
#if 0
|
|
|
|
static char *dhcpmsg2str(int type)
|
2002-09-27 23:19:37 +00:00
|
|
|
{
|
|
|
|
switch (type) {
|
2004-03-12 00:14:09 +00:00
|
|
|
case 1: return "DHCPDISCOVER"; break;
|
|
|
|
case 2: return "DHCPOFFER"; break;
|
|
|
|
case 3: return "DHCPREQUEST"; break;
|
|
|
|
case 4: return "DHCPDECLINE"; break;
|
|
|
|
case 5: return "DHCPACK"; break;
|
|
|
|
case 6: return "DHCPNACK"; break;
|
|
|
|
case 7: return "DHCPRELEASE"; break;
|
2002-09-27 23:19:37 +00:00
|
|
|
default: return "UNKNOWN/INVALID MSG TYPE"; break;
|
|
|
|
}
|
|
|
|
}
|
2003-04-05 00:53:31 +00:00
|
|
|
#endif
|
2007-07-10 16:05:02 +00:00
|
|
|
#endif
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2014-08-19 08:21:24 +00:00
|
|
|
static void bootp_add_id(ulong id)
|
|
|
|
{
|
|
|
|
if (bootp_num_ids >= ARRAY_SIZE(bootp_ids)) {
|
|
|
|
size_t size = sizeof(bootp_ids) - sizeof(id);
|
|
|
|
|
|
|
|
memmove(bootp_ids, &bootp_ids[1], size);
|
|
|
|
bootp_ids[bootp_num_ids - 1] = id;
|
|
|
|
} else {
|
|
|
|
bootp_ids[bootp_num_ids] = id;
|
|
|
|
bootp_num_ids++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool bootp_match_id(ulong id)
|
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
for (i = 0; i < bootp_num_ids; i++)
|
|
|
|
if (bootp_ids[i] == id)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2002-09-27 23:19:37 +00:00
|
|
|
static int BootpCheckPkt(uchar *pkt, unsigned dest, unsigned src, unsigned len)
|
|
|
|
{
|
2012-05-15 08:59:06 +00:00
|
|
|
struct Bootp_t *bp = (struct Bootp_t *) pkt;
|
2002-09-27 23:19:37 +00:00
|
|
|
int retval = 0;
|
|
|
|
|
|
|
|
if (dest != PORT_BOOTPC || src != PORT_BOOTPS)
|
|
|
|
retval = -1;
|
2012-05-23 07:58:14 +00:00
|
|
|
else if (len < sizeof(struct Bootp_t) - OPT_FIELD_SIZE)
|
2002-09-27 23:19:37 +00:00
|
|
|
retval = -2;
|
|
|
|
else if (bp->bp_op != OP_BOOTREQUEST &&
|
2012-05-15 08:59:06 +00:00
|
|
|
bp->bp_op != OP_BOOTREPLY &&
|
|
|
|
bp->bp_op != DHCP_OFFER &&
|
|
|
|
bp->bp_op != DHCP_ACK &&
|
|
|
|
bp->bp_op != DHCP_NAK)
|
2002-09-27 23:19:37 +00:00
|
|
|
retval = -3;
|
|
|
|
else if (bp->bp_htype != HWT_ETHER)
|
|
|
|
retval = -4;
|
|
|
|
else if (bp->bp_hlen != HWL_ETHER)
|
|
|
|
retval = -5;
|
2014-08-19 08:21:24 +00:00
|
|
|
else if (!bootp_match_id(NetReadLong((ulong *)&bp->bp_id)))
|
2002-09-27 23:19:37 +00:00
|
|
|
retval = -6;
|
|
|
|
|
2009-07-23 07:01:03 +00:00
|
|
|
debug("Filtering pkt = %d\n", retval);
|
2002-09-27 23:19:37 +00:00
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Copy parameters of interest from BOOTP_REPLY/DHCP_OFFER packet
|
|
|
|
*/
|
2012-05-15 08:59:06 +00:00
|
|
|
static void BootpCopyNetParams(struct Bootp_t *bp)
|
2002-09-27 23:19:37 +00:00
|
|
|
{
|
2007-07-28 14:56:13 +00:00
|
|
|
#if !defined(CONFIG_BOOTP_SERVERIP)
|
2012-05-23 07:59:18 +00:00
|
|
|
IPaddr_t tmp_ip;
|
|
|
|
|
2004-03-14 15:06:13 +00:00
|
|
|
NetCopyIP(&tmp_ip, &bp->bp_siaddr);
|
|
|
|
if (tmp_ip != 0)
|
|
|
|
NetCopyIP(&NetServerIP, &bp->bp_siaddr);
|
2012-05-23 07:58:06 +00:00
|
|
|
memcpy(NetServerEther, ((struct ethernet_hdr *)NetRxPacket)->et_src, 6);
|
2004-03-14 15:06:13 +00:00
|
|
|
if (strlen(bp->bp_file) > 0)
|
2012-05-15 08:59:06 +00:00
|
|
|
copy_filename(BootFile, bp->bp_file, sizeof(BootFile));
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2009-07-23 07:01:03 +00:00
|
|
|
debug("Bootfile: %s\n", BootFile);
|
2002-09-27 23:19:37 +00:00
|
|
|
|
|
|
|
/* Propagate to environment:
|
2003-06-27 21:31:46 +00:00
|
|
|
* don't delete exising entry when BOOTP / DHCP reply does
|
2002-09-27 23:19:37 +00:00
|
|
|
* not contain a new value
|
|
|
|
*/
|
2012-05-15 08:59:06 +00:00
|
|
|
if (*BootFile)
|
|
|
|
setenv("bootfile", BootFile);
|
2014-11-18 05:07:08 +00:00
|
|
|
#endif
|
|
|
|
NetCopyIP(&NetOurIP, &bp->bp_yiaddr);
|
2002-09-27 23:19:37 +00:00
|
|
|
}
|
|
|
|
|
2012-05-15 08:59:06 +00:00
|
|
|
static int truncate_sz(const char *name, int maxlen, int curlen)
|
2002-09-27 23:19:37 +00:00
|
|
|
{
|
|
|
|
if (curlen >= maxlen) {
|
2012-05-15 08:59:06 +00:00
|
|
|
printf("*** WARNING: %s is too long (%d - max: %d)"
|
|
|
|
" - truncated\n", name, curlen, maxlen);
|
2002-09-27 23:19:37 +00:00
|
|
|
curlen = maxlen - 1;
|
|
|
|
}
|
2012-05-15 08:59:06 +00:00
|
|
|
return curlen;
|
2002-09-27 23:19:37 +00:00
|
|
|
}
|
|
|
|
|
2007-07-09 22:45:14 +00:00
|
|
|
#if !defined(CONFIG_CMD_DHCP)
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2012-05-15 08:59:06 +00:00
|
|
|
static void BootpVendorFieldProcess(u8 *ext)
|
2002-09-27 23:19:37 +00:00
|
|
|
{
|
2004-03-12 00:14:09 +00:00
|
|
|
int size = *(ext + 1);
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2009-07-23 07:01:03 +00:00
|
|
|
debug("[BOOTP] Processing extension %d... (%d bytes)\n", *ext,
|
2012-05-15 08:59:06 +00:00
|
|
|
*(ext + 1));
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2004-03-12 00:14:09 +00:00
|
|
|
NetBootFileSize = 0;
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2004-03-12 00:14:09 +00:00
|
|
|
switch (*ext) {
|
|
|
|
/* Fixed length fields */
|
2012-05-15 08:59:06 +00:00
|
|
|
case 1: /* Subnet mask */
|
2002-09-27 23:19:37 +00:00
|
|
|
if (NetOurSubnetMask == 0)
|
2012-05-15 08:59:06 +00:00
|
|
|
NetCopyIP(&NetOurSubnetMask, (IPaddr_t *) (ext + 2));
|
2002-09-27 23:19:37 +00:00
|
|
|
break;
|
2012-05-15 08:59:06 +00:00
|
|
|
case 2: /* Time offset - Not yet supported */
|
2002-09-27 23:19:37 +00:00
|
|
|
break;
|
2004-03-12 00:14:09 +00:00
|
|
|
/* Variable length fields */
|
2012-05-15 08:59:06 +00:00
|
|
|
case 3: /* Gateways list */
|
|
|
|
if (NetOurGatewayIP == 0)
|
|
|
|
NetCopyIP(&NetOurGatewayIP, (IPaddr_t *) (ext + 2));
|
2002-09-27 23:19:37 +00:00
|
|
|
break;
|
2012-05-15 08:59:06 +00:00
|
|
|
case 4: /* Time server - Not yet supported */
|
2002-09-27 23:19:37 +00:00
|
|
|
break;
|
2012-05-15 08:59:06 +00:00
|
|
|
case 5: /* IEN-116 name server - Not yet supported */
|
2002-09-27 23:19:37 +00:00
|
|
|
break;
|
|
|
|
case 6:
|
2012-05-15 08:59:06 +00:00
|
|
|
if (NetOurDNSIP == 0)
|
|
|
|
NetCopyIP(&NetOurDNSIP, (IPaddr_t *) (ext + 2));
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_DNS2)
|
2012-05-15 08:59:06 +00:00
|
|
|
if ((NetOurDNS2IP == 0) && (size > 4))
|
|
|
|
NetCopyIP(&NetOurDNS2IP, (IPaddr_t *) (ext + 2 + 4));
|
2003-08-28 14:17:32 +00:00
|
|
|
#endif
|
2002-09-27 23:19:37 +00:00
|
|
|
break;
|
2012-05-15 08:59:06 +00:00
|
|
|
case 7: /* Log server - Not yet supported */
|
2002-09-27 23:19:37 +00:00
|
|
|
break;
|
2012-05-15 08:59:06 +00:00
|
|
|
case 8: /* Cookie/Quote server - Not yet supported */
|
2002-09-27 23:19:37 +00:00
|
|
|
break;
|
2012-05-15 08:59:06 +00:00
|
|
|
case 9: /* LPR server - Not yet supported */
|
2002-09-27 23:19:37 +00:00
|
|
|
break;
|
2012-05-15 08:59:06 +00:00
|
|
|
case 10: /* Impress server - Not yet supported */
|
2002-09-27 23:19:37 +00:00
|
|
|
break;
|
2012-05-15 08:59:06 +00:00
|
|
|
case 11: /* RPL server - Not yet supported */
|
2002-09-27 23:19:37 +00:00
|
|
|
break;
|
2012-05-15 08:59:06 +00:00
|
|
|
case 12: /* Host name */
|
2002-09-27 23:19:37 +00:00
|
|
|
if (NetOurHostName[0] == 0) {
|
2012-05-15 08:59:06 +00:00
|
|
|
size = truncate_sz("Host Name",
|
|
|
|
sizeof(NetOurHostName), size);
|
|
|
|
memcpy(&NetOurHostName, ext + 2, size);
|
2004-03-12 00:14:09 +00:00
|
|
|
NetOurHostName[size] = 0;
|
2002-09-27 23:19:37 +00:00
|
|
|
}
|
|
|
|
break;
|
2012-05-15 08:59:06 +00:00
|
|
|
case 13: /* Boot file size */
|
2002-09-27 23:19:37 +00:00
|
|
|
if (size == 2)
|
2012-05-15 08:59:06 +00:00
|
|
|
NetBootFileSize = ntohs(*(ushort *) (ext + 2));
|
2002-09-27 23:19:37 +00:00
|
|
|
else if (size == 4)
|
2012-05-15 08:59:06 +00:00
|
|
|
NetBootFileSize = ntohl(*(ulong *) (ext + 2));
|
2002-09-27 23:19:37 +00:00
|
|
|
break;
|
2012-05-15 08:59:06 +00:00
|
|
|
case 14: /* Merit dump file - Not yet supported */
|
2002-09-27 23:19:37 +00:00
|
|
|
break;
|
2012-05-15 08:59:06 +00:00
|
|
|
case 15: /* Domain name - Not yet supported */
|
2002-09-27 23:19:37 +00:00
|
|
|
break;
|
2012-05-15 08:59:06 +00:00
|
|
|
case 16: /* Swap server - Not yet supported */
|
2002-09-27 23:19:37 +00:00
|
|
|
break;
|
2012-05-15 08:59:06 +00:00
|
|
|
case 17: /* Root path */
|
2002-09-27 23:19:37 +00:00
|
|
|
if (NetOurRootPath[0] == 0) {
|
2012-05-15 08:59:06 +00:00
|
|
|
size = truncate_sz("Root Path",
|
|
|
|
sizeof(NetOurRootPath), size);
|
|
|
|
memcpy(&NetOurRootPath, ext + 2, size);
|
2004-03-12 00:14:09 +00:00
|
|
|
NetOurRootPath[size] = 0;
|
2002-09-27 23:19:37 +00:00
|
|
|
}
|
|
|
|
break;
|
2012-05-15 08:59:06 +00:00
|
|
|
case 18: /* Extension path - Not yet supported */
|
2002-09-27 23:19:37 +00:00
|
|
|
/*
|
2003-06-27 21:31:46 +00:00
|
|
|
* This can be used to send the information of the
|
|
|
|
* vendor area in another file that the client can
|
|
|
|
* access via TFTP.
|
2002-09-27 23:19:37 +00:00
|
|
|
*/
|
|
|
|
break;
|
2004-03-12 00:14:09 +00:00
|
|
|
/* IP host layer fields */
|
2012-05-15 08:59:06 +00:00
|
|
|
case 40: /* NIS Domain name */
|
2002-09-27 23:19:37 +00:00
|
|
|
if (NetOurNISDomain[0] == 0) {
|
2012-05-15 08:59:06 +00:00
|
|
|
size = truncate_sz("NIS Domain Name",
|
|
|
|
sizeof(NetOurNISDomain), size);
|
|
|
|
memcpy(&NetOurNISDomain, ext + 2, size);
|
2004-03-12 00:14:09 +00:00
|
|
|
NetOurNISDomain[size] = 0;
|
2002-09-27 23:19:37 +00:00
|
|
|
}
|
|
|
|
break;
|
2011-05-16 18:29:19 +00:00
|
|
|
#if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_NTPSERVER)
|
|
|
|
case 42: /* NTP server IP */
|
|
|
|
NetCopyIP(&NetNtpServerIP, (IPaddr_t *) (ext + 2));
|
|
|
|
break;
|
|
|
|
#endif
|
2004-03-12 00:14:09 +00:00
|
|
|
/* Application layer fields */
|
2012-05-15 08:59:06 +00:00
|
|
|
case 43: /* Vendor specific info - Not yet supported */
|
2002-09-27 23:19:37 +00:00
|
|
|
/*
|
2003-06-27 21:31:46 +00:00
|
|
|
* Binary information to exchange specific
|
|
|
|
* product information.
|
2002-09-27 23:19:37 +00:00
|
|
|
*/
|
|
|
|
break;
|
2004-03-12 00:14:09 +00:00
|
|
|
/* Reserved (custom) fields (128..254) */
|
|
|
|
}
|
2002-09-27 23:19:37 +00:00
|
|
|
}
|
|
|
|
|
2012-05-15 08:59:06 +00:00
|
|
|
static void BootpVendorProcess(u8 *ext, int size)
|
2002-09-27 23:19:37 +00:00
|
|
|
{
|
2004-03-12 00:14:09 +00:00
|
|
|
u8 *end = ext + size;
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2009-07-23 07:01:03 +00:00
|
|
|
debug("[BOOTP] Checking extension (%d bytes)...\n", size);
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2004-03-12 00:14:09 +00:00
|
|
|
while ((ext < end) && (*ext != 0xff)) {
|
|
|
|
if (*ext == 0) {
|
|
|
|
ext++;
|
|
|
|
} else {
|
|
|
|
u8 *opt = ext;
|
|
|
|
|
|
|
|
ext += ext[1] + 2;
|
|
|
|
if (ext <= end)
|
2012-05-15 08:59:06 +00:00
|
|
|
BootpVendorFieldProcess(opt);
|
2004-03-12 00:14:09 +00:00
|
|
|
}
|
2002-09-27 23:19:37 +00:00
|
|
|
}
|
|
|
|
|
2012-05-15 08:59:06 +00:00
|
|
|
debug("[BOOTP] Received fields:\n");
|
2009-02-17 05:00:53 +00:00
|
|
|
if (NetOurSubnetMask)
|
2009-07-23 07:01:03 +00:00
|
|
|
debug("NetOurSubnetMask : %pI4\n", &NetOurSubnetMask);
|
2004-03-12 00:14:09 +00:00
|
|
|
|
2009-02-17 05:00:53 +00:00
|
|
|
if (NetOurGatewayIP)
|
2009-07-23 07:01:03 +00:00
|
|
|
debug("NetOurGatewayIP : %pI4", &NetOurGatewayIP);
|
2004-03-12 00:14:09 +00:00
|
|
|
|
2009-07-23 07:01:03 +00:00
|
|
|
if (NetBootFileSize)
|
|
|
|
debug("NetBootFileSize : %d\n", NetBootFileSize);
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2009-07-23 07:01:03 +00:00
|
|
|
if (NetOurHostName[0])
|
|
|
|
debug("NetOurHostName : %s\n", NetOurHostName);
|
2004-03-12 00:14:09 +00:00
|
|
|
|
2009-07-23 07:01:03 +00:00
|
|
|
if (NetOurRootPath[0])
|
|
|
|
debug("NetOurRootPath : %s\n", NetOurRootPath);
|
2004-03-12 00:14:09 +00:00
|
|
|
|
2009-07-23 07:01:03 +00:00
|
|
|
if (NetOurNISDomain[0])
|
|
|
|
debug("NetOurNISDomain : %s\n", NetOurNISDomain);
|
2004-03-12 00:14:09 +00:00
|
|
|
|
2009-07-23 07:01:03 +00:00
|
|
|
if (NetBootFileSize)
|
|
|
|
debug("NetBootFileSize: %d\n", NetBootFileSize);
|
2011-05-16 18:29:19 +00:00
|
|
|
|
|
|
|
#if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_NTPSERVER)
|
|
|
|
if (NetNtpServerIP)
|
|
|
|
debug("NetNtpServerIP : %pI4\n", &NetNtpServerIP);
|
|
|
|
#endif
|
2004-03-12 00:14:09 +00:00
|
|
|
}
|
2011-06-13 23:13:12 +00:00
|
|
|
|
2002-09-27 23:19:37 +00:00
|
|
|
/*
|
|
|
|
* Handle a BOOTP received packet.
|
|
|
|
*/
|
|
|
|
static void
|
2011-04-18 06:19:50 +00:00
|
|
|
BootpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
|
|
|
|
unsigned len)
|
2002-09-27 23:19:37 +00:00
|
|
|
{
|
2012-05-15 08:59:06 +00:00
|
|
|
struct Bootp_t *bp;
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2009-07-23 07:01:03 +00:00
|
|
|
debug("got BOOTP packet (src=%d, dst=%d, len=%d want_len=%zu)\n",
|
2012-05-15 08:59:06 +00:00
|
|
|
src, dest, len, sizeof(struct Bootp_t));
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2012-05-15 08:59:06 +00:00
|
|
|
bp = (struct Bootp_t *)pkt;
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2012-05-15 08:59:06 +00:00
|
|
|
/* Filter out pkts we don't want */
|
|
|
|
if (BootpCheckPkt(pkt, dest, src, len))
|
2002-09-27 23:19:37 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
2004-03-12 00:14:09 +00:00
|
|
|
* Got a good BOOTP reply. Copy the data into our variables.
|
2002-09-27 23:19:37 +00:00
|
|
|
*/
|
|
|
|
#ifdef CONFIG_STATUS_LED
|
2012-05-15 08:59:06 +00:00
|
|
|
status_led_set(STATUS_LED_BOOT, STATUS_LED_OFF);
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
BootpCopyNetParams(bp); /* Store net parameters from reply */
|
|
|
|
|
|
|
|
/* Retrieve extended information (we must parse the vendor area) */
|
2012-05-15 08:59:06 +00:00
|
|
|
if (NetReadLong((ulong *)&bp->bp_vend[0]) == htonl(BOOTP_VENDOR_MAGIC))
|
2005-10-13 14:45:02 +00:00
|
|
|
BootpVendorProcess((uchar *)&bp->bp_vend[4], len);
|
2002-09-27 23:19:37 +00:00
|
|
|
|
|
|
|
NetSetTimeout(0, (thand_f *)0);
|
2011-12-10 11:08:06 +00:00
|
|
|
bootstage_mark_name(BOOTSTAGE_ID_BOOTP_STOP, "bootp_stop");
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2009-07-23 07:01:03 +00:00
|
|
|
debug("Got good BOOTP\n");
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2011-10-27 06:24:32 +00:00
|
|
|
net_auto_load();
|
2002-09-27 23:19:37 +00:00
|
|
|
}
|
2007-07-10 16:05:02 +00:00
|
|
|
#endif
|
2002-09-27 23:19:37 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Timeout on BOOTP/DHCP request.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
BootpTimeout(void)
|
|
|
|
{
|
net: BOOTP retry timeout improvements
Currently, the BOOTP code sends out its initial request as soon as the
Ethernet driver indicates "link up". If this packet is lost or not
replied to for some reason, the code waits for a 1s timeout before
retrying. For some reason, such early packets are often lost on my
system, so this causes an annoying delay.
To optimize this, modify the BOOTP code to have very short timeouts for
the first packet transmitted, but gradually increase the timeout each
time a timeout occurs. This way, if the first packet is lost, the second
packet is transmitted quite quickly and hence the overall delay is low.
However, if there's still no response, we don't keep spewing out packets
at an insane speed.
It's arguably more correct to try and find out why the first packet is
lost. However, it seems to disappear inside my Ethenet chip; the TX chip
indicates no error during TX (not that it has much in the way of
reporting...), yet wireshark on the RX side doesn't see any packet.
FWIW, I'm using an ASIX USB Ethernet adapter. Perhaps "link up" is
reported too early or based on the wrong condition in HW, and we should
add some fixed extra delay into the driver. However, this would slow down
every link up event even if it ends up not being needed in some cases.
Having BOOTP retry quickly applies the fix/WAR to every possible
Ethernet device, and is quite simple to implement, so seems a better
solution.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
2014-07-25 23:30:48 +00:00
|
|
|
ulong time_taken = get_timer(bootp_start);
|
|
|
|
|
|
|
|
if (time_taken >= TIMEOUT_MS) {
|
2012-05-23 07:59:19 +00:00
|
|
|
#ifdef CONFIG_BOOTP_MAY_FAIL
|
net: BOOTP retry timeout improvements
Currently, the BOOTP code sends out its initial request as soon as the
Ethernet driver indicates "link up". If this packet is lost or not
replied to for some reason, the code waits for a 1s timeout before
retrying. For some reason, such early packets are often lost on my
system, so this causes an annoying delay.
To optimize this, modify the BOOTP code to have very short timeouts for
the first packet transmitted, but gradually increase the timeout each
time a timeout occurs. This way, if the first packet is lost, the second
packet is transmitted quite quickly and hence the overall delay is low.
However, if there's still no response, we don't keep spewing out packets
at an insane speed.
It's arguably more correct to try and find out why the first packet is
lost. However, it seems to disappear inside my Ethenet chip; the TX chip
indicates no error during TX (not that it has much in the way of
reporting...), yet wireshark on the RX side doesn't see any packet.
FWIW, I'm using an ASIX USB Ethernet adapter. Perhaps "link up" is
reported too early or based on the wrong condition in HW, and we should
add some fixed extra delay into the driver. However, this would slow down
every link up event even if it ends up not being needed in some cases.
Having BOOTP retry quickly applies the fix/WAR to every possible
Ethernet device, and is quite simple to implement, so seems a better
solution.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
2014-07-25 23:30:48 +00:00
|
|
|
puts("\nRetry time exceeded\n");
|
2012-07-19 01:23:21 +00:00
|
|
|
net_set_state(NETLOOP_FAIL);
|
2012-05-23 07:59:19 +00:00
|
|
|
#else
|
net: BOOTP retry timeout improvements
Currently, the BOOTP code sends out its initial request as soon as the
Ethernet driver indicates "link up". If this packet is lost or not
replied to for some reason, the code waits for a 1s timeout before
retrying. For some reason, such early packets are often lost on my
system, so this causes an annoying delay.
To optimize this, modify the BOOTP code to have very short timeouts for
the first packet transmitted, but gradually increase the timeout each
time a timeout occurs. This way, if the first packet is lost, the second
packet is transmitted quite quickly and hence the overall delay is low.
However, if there's still no response, we don't keep spewing out packets
at an insane speed.
It's arguably more correct to try and find out why the first packet is
lost. However, it seems to disappear inside my Ethenet chip; the TX chip
indicates no error during TX (not that it has much in the way of
reporting...), yet wireshark on the RX side doesn't see any packet.
FWIW, I'm using an ASIX USB Ethernet adapter. Perhaps "link up" is
reported too early or based on the wrong condition in HW, and we should
add some fixed extra delay into the driver. However, this would slow down
every link up event even if it ends up not being needed in some cases.
Having BOOTP retry quickly applies the fix/WAR to every possible
Ethernet device, and is quite simple to implement, so seems a better
solution.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
2014-07-25 23:30:48 +00:00
|
|
|
puts("\nRetry time exceeded; starting again\n");
|
2012-05-15 08:59:06 +00:00
|
|
|
NetStartAgain();
|
2012-05-23 07:59:19 +00:00
|
|
|
#endif
|
2002-09-27 23:19:37 +00:00
|
|
|
} else {
|
net: BOOTP retry timeout improvements
Currently, the BOOTP code sends out its initial request as soon as the
Ethernet driver indicates "link up". If this packet is lost or not
replied to for some reason, the code waits for a 1s timeout before
retrying. For some reason, such early packets are often lost on my
system, so this causes an annoying delay.
To optimize this, modify the BOOTP code to have very short timeouts for
the first packet transmitted, but gradually increase the timeout each
time a timeout occurs. This way, if the first packet is lost, the second
packet is transmitted quite quickly and hence the overall delay is low.
However, if there's still no response, we don't keep spewing out packets
at an insane speed.
It's arguably more correct to try and find out why the first packet is
lost. However, it seems to disappear inside my Ethenet chip; the TX chip
indicates no error during TX (not that it has much in the way of
reporting...), yet wireshark on the RX side doesn't see any packet.
FWIW, I'm using an ASIX USB Ethernet adapter. Perhaps "link up" is
reported too early or based on the wrong condition in HW, and we should
add some fixed extra delay into the driver. However, this would slow down
every link up event even if it ends up not being needed in some cases.
Having BOOTP retry quickly applies the fix/WAR to every possible
Ethernet device, and is quite simple to implement, so seems a better
solution.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
2014-07-25 23:30:48 +00:00
|
|
|
bootp_timeout *= 2;
|
2014-08-19 08:21:24 +00:00
|
|
|
if (bootp_timeout > 2000)
|
|
|
|
bootp_timeout = 2000;
|
net: BOOTP retry timeout improvements
Currently, the BOOTP code sends out its initial request as soon as the
Ethernet driver indicates "link up". If this packet is lost or not
replied to for some reason, the code waits for a 1s timeout before
retrying. For some reason, such early packets are often lost on my
system, so this causes an annoying delay.
To optimize this, modify the BOOTP code to have very short timeouts for
the first packet transmitted, but gradually increase the timeout each
time a timeout occurs. This way, if the first packet is lost, the second
packet is transmitted quite quickly and hence the overall delay is low.
However, if there's still no response, we don't keep spewing out packets
at an insane speed.
It's arguably more correct to try and find out why the first packet is
lost. However, it seems to disappear inside my Ethenet chip; the TX chip
indicates no error during TX (not that it has much in the way of
reporting...), yet wireshark on the RX side doesn't see any packet.
FWIW, I'm using an ASIX USB Ethernet adapter. Perhaps "link up" is
reported too early or based on the wrong condition in HW, and we should
add some fixed extra delay into the driver. However, this would slow down
every link up event even if it ends up not being needed in some cases.
Having BOOTP retry quickly applies the fix/WAR to every possible
Ethernet device, and is quite simple to implement, so seems a better
solution.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
2014-07-25 23:30:48 +00:00
|
|
|
NetSetTimeout(bootp_timeout, BootpTimeout);
|
2012-05-15 08:59:06 +00:00
|
|
|
BootpRequest();
|
2002-09-27 23:19:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-17 10:26:25 +00:00
|
|
|
#define put_vci(e, str) \
|
|
|
|
do { \
|
|
|
|
size_t vci_strlen = strlen(str); \
|
|
|
|
*e++ = 60; /* Vendor Class Identifier */ \
|
|
|
|
*e++ = vci_strlen; \
|
|
|
|
memcpy(e, str, vci_strlen); \
|
|
|
|
e += vci_strlen; \
|
|
|
|
} while (0)
|
|
|
|
|
2002-09-27 23:19:37 +00:00
|
|
|
/*
|
|
|
|
* Initialize BOOTP extension fields in the request.
|
|
|
|
*/
|
2007-07-09 22:45:14 +00:00
|
|
|
#if defined(CONFIG_CMD_DHCP)
|
2012-05-15 08:59:06 +00:00
|
|
|
static int DhcpExtended(u8 *e, int message_type, IPaddr_t ServerID,
|
|
|
|
IPaddr_t RequestedIP)
|
2002-09-27 23:19:37 +00:00
|
|
|
{
|
2004-03-12 00:14:09 +00:00
|
|
|
u8 *start = e;
|
|
|
|
u8 *cnt;
|
2011-08-31 05:37:31 +00:00
|
|
|
#if defined(CONFIG_BOOTP_PXE)
|
|
|
|
char *uuid;
|
|
|
|
u16 clientarch;
|
|
|
|
#endif
|
2004-03-12 00:14:09 +00:00
|
|
|
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_VENDOREX)
|
2004-03-12 00:14:09 +00:00
|
|
|
u8 *x;
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_SEND_HOSTNAME)
|
2005-10-13 14:45:02 +00:00
|
|
|
char *hostname;
|
2003-08-28 14:17:32 +00:00
|
|
|
#endif
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 99; /* RFC1048 Magic Cookie */
|
|
|
|
*e++ = 130;
|
|
|
|
*e++ = 83;
|
|
|
|
*e++ = 99;
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 53; /* DHCP Message Type */
|
|
|
|
*e++ = 1;
|
|
|
|
*e++ = message_type;
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 57; /* Maximum DHCP Message Size */
|
|
|
|
*e++ = 2;
|
2012-05-23 07:58:14 +00:00
|
|
|
*e++ = (576 - 312 + OPT_FIELD_SIZE) >> 8;
|
|
|
|
*e++ = (576 - 312 + OPT_FIELD_SIZE) & 0xff;
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2004-03-12 00:14:09 +00:00
|
|
|
if (ServerID) {
|
2012-05-15 08:59:06 +00:00
|
|
|
int tmp = ntohl(ServerID);
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 54; /* ServerID */
|
|
|
|
*e++ = 4;
|
|
|
|
*e++ = tmp >> 24;
|
|
|
|
*e++ = tmp >> 16;
|
|
|
|
*e++ = tmp >> 8;
|
|
|
|
*e++ = tmp & 0xff;
|
|
|
|
}
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2004-03-12 00:14:09 +00:00
|
|
|
if (RequestedIP) {
|
2012-05-15 08:59:06 +00:00
|
|
|
int tmp = ntohl(RequestedIP);
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 50; /* Requested IP */
|
|
|
|
*e++ = 4;
|
|
|
|
*e++ = tmp >> 24;
|
|
|
|
*e++ = tmp >> 16;
|
|
|
|
*e++ = tmp >> 8;
|
|
|
|
*e++ = tmp & 0xff;
|
|
|
|
}
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_SEND_HOSTNAME)
|
2012-05-15 08:59:06 +00:00
|
|
|
hostname = getenv("hostname");
|
|
|
|
if (hostname) {
|
|
|
|
int hostnamelen = strlen(hostname);
|
2004-03-12 00:14:09 +00:00
|
|
|
|
|
|
|
*e++ = 12; /* Hostname */
|
|
|
|
*e++ = hostnamelen;
|
2012-05-15 08:59:06 +00:00
|
|
|
memcpy(e, hostname, hostnamelen);
|
2004-03-12 00:14:09 +00:00
|
|
|
e += hostnamelen;
|
|
|
|
}
|
2003-08-28 14:17:32 +00:00
|
|
|
#endif
|
|
|
|
|
2011-08-31 05:37:31 +00:00
|
|
|
#if defined(CONFIG_BOOTP_PXE)
|
|
|
|
clientarch = CONFIG_BOOTP_PXE_CLIENTARCH;
|
|
|
|
*e++ = 93; /* Client System Architecture */
|
|
|
|
*e++ = 2;
|
|
|
|
*e++ = (clientarch >> 8) & 0xff;
|
|
|
|
*e++ = clientarch & 0xff;
|
|
|
|
|
|
|
|
*e++ = 94; /* Client Network Interface Identifier */
|
|
|
|
*e++ = 3;
|
|
|
|
*e++ = 1; /* type field for UNDI */
|
|
|
|
*e++ = 0; /* major revision */
|
|
|
|
*e++ = 0; /* minor revision */
|
|
|
|
|
|
|
|
uuid = getenv("pxeuuid");
|
|
|
|
|
|
|
|
if (uuid) {
|
|
|
|
if (uuid_str_valid(uuid)) {
|
|
|
|
*e++ = 97; /* Client Machine Identifier */
|
|
|
|
*e++ = 17;
|
|
|
|
*e++ = 0; /* type 0 - UUID */
|
|
|
|
|
2014-04-02 08:20:03 +00:00
|
|
|
uuid_str_to_bin(uuid, e, UUID_STR_FORMAT_STD);
|
2011-08-31 05:37:31 +00:00
|
|
|
e += 16;
|
|
|
|
} else {
|
|
|
|
printf("Invalid pxeuuid: %s\n", uuid);
|
|
|
|
}
|
|
|
|
}
|
2012-09-17 10:26:25 +00:00
|
|
|
#endif
|
2011-08-31 05:37:31 +00:00
|
|
|
|
2012-09-17 10:26:25 +00:00
|
|
|
#ifdef CONFIG_BOOTP_VCI_STRING
|
|
|
|
put_vci(e, CONFIG_BOOTP_VCI_STRING);
|
2011-08-31 05:37:31 +00:00
|
|
|
#endif
|
|
|
|
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_VENDOREX)
|
2012-05-15 08:59:06 +00:00
|
|
|
x = dhcp_vendorex_prep(e);
|
|
|
|
if (x)
|
2004-03-12 00:14:09 +00:00
|
|
|
return x - start;
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
|
|
|
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 55; /* Parameter Request List */
|
|
|
|
cnt = e++; /* Pointer to count of requested items */
|
|
|
|
*cnt = 0;
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_SUBNETMASK)
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 1; /* Subnet Mask */
|
|
|
|
*cnt += 1;
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_TIMEOFFSET)
|
2005-04-01 00:25:43 +00:00
|
|
|
*e++ = 2;
|
|
|
|
*cnt += 1;
|
|
|
|
#endif
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_GATEWAY)
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 3; /* Router Option */
|
|
|
|
*cnt += 1;
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_DNS)
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 6; /* DNS Server(s) */
|
|
|
|
*cnt += 1;
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_HOSTNAME)
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 12; /* Hostname */
|
|
|
|
*cnt += 1;
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_BOOTFILESIZE)
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 13; /* Boot File Size */
|
|
|
|
*cnt += 1;
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_BOOTPATH)
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 17; /* Boot path */
|
|
|
|
*cnt += 1;
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_NISDOMAIN)
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 40; /* NIS Domain name request */
|
|
|
|
*cnt += 1;
|
2005-04-01 00:25:43 +00:00
|
|
|
#endif
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_NTPSERVER)
|
2005-04-01 00:25:43 +00:00
|
|
|
*e++ = 42;
|
|
|
|
*cnt += 1;
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
2010-11-14 04:23:09 +00:00
|
|
|
/* no options, so back up to avoid sending an empty request list */
|
|
|
|
if (*cnt == 0)
|
|
|
|
e -= 2;
|
|
|
|
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 255; /* End of the list */
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2004-03-12 00:14:09 +00:00
|
|
|
/* Pad to minimal length */
|
2002-09-27 23:19:37 +00:00
|
|
|
#ifdef CONFIG_DHCP_MIN_EXT_LEN
|
2011-02-02 23:03:28 +00:00
|
|
|
while ((e - start) < CONFIG_DHCP_MIN_EXT_LEN)
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 0;
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
|
|
|
|
2004-03-12 00:14:09 +00:00
|
|
|
return e - start;
|
2002-09-27 23:19:37 +00:00
|
|
|
}
|
|
|
|
|
2007-07-10 16:05:02 +00:00
|
|
|
#else
|
2002-09-27 23:19:37 +00:00
|
|
|
/*
|
2012-05-15 08:59:06 +00:00
|
|
|
* Warning: no field size check - change CONFIG_BOOTP_* at your own risk!
|
2002-09-27 23:19:37 +00:00
|
|
|
*/
|
2012-05-15 08:59:06 +00:00
|
|
|
static int BootpExtended(u8 *e)
|
2002-09-27 23:19:37 +00:00
|
|
|
{
|
2004-03-12 00:14:09 +00:00
|
|
|
u8 *start = e;
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 99; /* RFC1048 Magic Cookie */
|
|
|
|
*e++ = 130;
|
|
|
|
*e++ = 83;
|
|
|
|
*e++ = 99;
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2007-07-09 22:45:14 +00:00
|
|
|
#if defined(CONFIG_CMD_DHCP)
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 53; /* DHCP Message Type */
|
|
|
|
*e++ = 1;
|
|
|
|
*e++ = DHCP_DISCOVER;
|
|
|
|
|
|
|
|
*e++ = 57; /* Maximum DHCP Message Size */
|
|
|
|
*e++ = 2;
|
2012-05-23 07:58:14 +00:00
|
|
|
*e++ = (576 - 312 + OPT_FIELD_SIZE) >> 16;
|
|
|
|
*e++ = (576 - 312 + OPT_FIELD_SIZE) & 0xff;
|
2007-07-10 16:05:02 +00:00
|
|
|
#endif
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2012-09-18 00:22:50 +00:00
|
|
|
#if defined(CONFIG_BOOTP_VCI_STRING) || \
|
|
|
|
(defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_NET_VCI_STRING))
|
|
|
|
#ifdef CONFIG_SPL_BUILD
|
|
|
|
put_vci(e, CONFIG_SPL_NET_VCI_STRING);
|
|
|
|
#else
|
2012-09-17 10:26:25 +00:00
|
|
|
put_vci(e, CONFIG_BOOTP_VCI_STRING);
|
|
|
|
#endif
|
2012-09-18 00:22:50 +00:00
|
|
|
#endif
|
2012-09-17 10:26:25 +00:00
|
|
|
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_SUBNETMASK)
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 1; /* Subnet mask request */
|
|
|
|
*e++ = 4;
|
|
|
|
e += 4;
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
|
|
|
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_GATEWAY)
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 3; /* Default gateway request */
|
|
|
|
*e++ = 4;
|
|
|
|
e += 4;
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
|
|
|
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_DNS)
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 6; /* Domain Name Server */
|
|
|
|
*e++ = 4;
|
|
|
|
e += 4;
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
|
|
|
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_HOSTNAME)
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 12; /* Host name request */
|
|
|
|
*e++ = 32;
|
|
|
|
e += 32;
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
|
|
|
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_BOOTFILESIZE)
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 13; /* Boot file size */
|
|
|
|
*e++ = 2;
|
|
|
|
e += 2;
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
|
|
|
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_BOOTPATH)
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 17; /* Boot path */
|
|
|
|
*e++ = 32;
|
|
|
|
e += 32;
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
|
|
|
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_NISDOMAIN)
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 40; /* NIS Domain name request */
|
|
|
|
*e++ = 32;
|
|
|
|
e += 32;
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
2011-05-16 18:29:19 +00:00
|
|
|
#if defined(CONFIG_BOOTP_NTPSERVER)
|
|
|
|
*e++ = 42;
|
|
|
|
*e++ = 4;
|
|
|
|
e += 4;
|
|
|
|
#endif
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2004-03-12 00:14:09 +00:00
|
|
|
*e++ = 255; /* End of the list */
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2004-03-12 00:14:09 +00:00
|
|
|
return e - start;
|
2002-09-27 23:19:37 +00:00
|
|
|
}
|
2007-07-10 16:05:02 +00:00
|
|
|
#endif
|
2002-09-27 23:19:37 +00:00
|
|
|
|
net: BOOTP retry timeout improvements
Currently, the BOOTP code sends out its initial request as soon as the
Ethernet driver indicates "link up". If this packet is lost or not
replied to for some reason, the code waits for a 1s timeout before
retrying. For some reason, such early packets are often lost on my
system, so this causes an annoying delay.
To optimize this, modify the BOOTP code to have very short timeouts for
the first packet transmitted, but gradually increase the timeout each
time a timeout occurs. This way, if the first packet is lost, the second
packet is transmitted quite quickly and hence the overall delay is low.
However, if there's still no response, we don't keep spewing out packets
at an insane speed.
It's arguably more correct to try and find out why the first packet is
lost. However, it seems to disappear inside my Ethenet chip; the TX chip
indicates no error during TX (not that it has much in the way of
reporting...), yet wireshark on the RX side doesn't see any packet.
FWIW, I'm using an ASIX USB Ethernet adapter. Perhaps "link up" is
reported too early or based on the wrong condition in HW, and we should
add some fixed extra delay into the driver. However, this would slow down
every link up event even if it ends up not being needed in some cases.
Having BOOTP retry quickly applies the fix/WAR to every possible
Ethernet device, and is quite simple to implement, so seems a better
solution.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
2014-07-25 23:30:48 +00:00
|
|
|
void BootpReset(void)
|
|
|
|
{
|
2014-08-19 08:21:24 +00:00
|
|
|
bootp_num_ids = 0;
|
net: BOOTP retry timeout improvements
Currently, the BOOTP code sends out its initial request as soon as the
Ethernet driver indicates "link up". If this packet is lost or not
replied to for some reason, the code waits for a 1s timeout before
retrying. For some reason, such early packets are often lost on my
system, so this causes an annoying delay.
To optimize this, modify the BOOTP code to have very short timeouts for
the first packet transmitted, but gradually increase the timeout each
time a timeout occurs. This way, if the first packet is lost, the second
packet is transmitted quite quickly and hence the overall delay is low.
However, if there's still no response, we don't keep spewing out packets
at an insane speed.
It's arguably more correct to try and find out why the first packet is
lost. However, it seems to disappear inside my Ethenet chip; the TX chip
indicates no error during TX (not that it has much in the way of
reporting...), yet wireshark on the RX side doesn't see any packet.
FWIW, I'm using an ASIX USB Ethernet adapter. Perhaps "link up" is
reported too early or based on the wrong condition in HW, and we should
add some fixed extra delay into the driver. However, this would slow down
every link up event even if it ends up not being needed in some cases.
Having BOOTP retry quickly applies the fix/WAR to every possible
Ethernet device, and is quite simple to implement, so seems a better
solution.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
2014-07-25 23:30:48 +00:00
|
|
|
BootpTry = 0;
|
|
|
|
bootp_start = get_timer(0);
|
2014-08-19 08:21:24 +00:00
|
|
|
bootp_timeout = 250;
|
net: BOOTP retry timeout improvements
Currently, the BOOTP code sends out its initial request as soon as the
Ethernet driver indicates "link up". If this packet is lost or not
replied to for some reason, the code waits for a 1s timeout before
retrying. For some reason, such early packets are often lost on my
system, so this causes an annoying delay.
To optimize this, modify the BOOTP code to have very short timeouts for
the first packet transmitted, but gradually increase the timeout each
time a timeout occurs. This way, if the first packet is lost, the second
packet is transmitted quite quickly and hence the overall delay is low.
However, if there's still no response, we don't keep spewing out packets
at an insane speed.
It's arguably more correct to try and find out why the first packet is
lost. However, it seems to disappear inside my Ethenet chip; the TX chip
indicates no error during TX (not that it has much in the way of
reporting...), yet wireshark on the RX side doesn't see any packet.
FWIW, I'm using an ASIX USB Ethernet adapter. Perhaps "link up" is
reported too early or based on the wrong condition in HW, and we should
add some fixed extra delay into the driver. However, this would slow down
every link up event even if it ends up not being needed in some cases.
Having BOOTP retry quickly applies the fix/WAR to every possible
Ethernet device, and is quite simple to implement, so seems a better
solution.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
2014-07-25 23:30:48 +00:00
|
|
|
}
|
|
|
|
|
2002-09-27 23:19:37 +00:00
|
|
|
void
|
2012-05-15 08:59:06 +00:00
|
|
|
BootpRequest(void)
|
2002-09-27 23:19:37 +00:00
|
|
|
{
|
2012-05-15 08:59:04 +00:00
|
|
|
uchar *pkt, *iphdr;
|
2012-05-15 08:59:06 +00:00
|
|
|
struct Bootp_t *bp;
|
2012-05-23 07:59:10 +00:00
|
|
|
int extlen, pktlen, iplen;
|
|
|
|
int eth_hdr_size;
|
2012-05-23 07:57:58 +00:00
|
|
|
#ifdef CONFIG_BOOTP_RANDOM_DELAY
|
2014-07-11 09:39:37 +00:00
|
|
|
ulong rand_ms;
|
2012-05-23 07:57:58 +00:00
|
|
|
#endif
|
2014-08-19 08:21:24 +00:00
|
|
|
ulong BootpID;
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2011-12-10 11:08:06 +00:00
|
|
|
bootstage_mark_name(BOOTSTAGE_ID_BOOTP_START, "bootp_start");
|
2007-07-09 22:45:14 +00:00
|
|
|
#if defined(CONFIG_CMD_DHCP)
|
2002-09-27 23:19:37 +00:00
|
|
|
dhcp_state = INIT;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef CONFIG_BOOTP_RANDOM_DELAY /* Random BOOTP delay */
|
2012-05-23 07:57:58 +00:00
|
|
|
if (BootpTry == 0)
|
|
|
|
srand_mac();
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2012-05-23 07:57:58 +00:00
|
|
|
if (BootpTry <= 2) /* Start with max 1024 * 1ms */
|
|
|
|
rand_ms = rand() >> (22 - BootpTry);
|
|
|
|
else /* After 3rd BOOTP request max 8192 * 1ms */
|
|
|
|
rand_ms = rand() >> 19;
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2012-05-23 07:57:58 +00:00
|
|
|
printf("Random delay: %ld ms...\n", rand_ms);
|
2014-07-11 09:39:37 +00:00
|
|
|
mdelay(rand_ms);
|
2012-05-15 08:59:06 +00:00
|
|
|
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif /* CONFIG_BOOTP_RANDOM_DELAY */
|
|
|
|
|
|
|
|
printf("BOOTP broadcast %d\n", ++BootpTry);
|
|
|
|
pkt = NetTxPacket;
|
2012-05-15 08:59:06 +00:00
|
|
|
memset((void *)pkt, 0, PKTSIZE);
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2012-05-23 07:59:10 +00:00
|
|
|
eth_hdr_size = NetSetEther(pkt, NetBcastAddr, PROT_IP);
|
|
|
|
pkt += eth_hdr_size;
|
2002-09-27 23:19:37 +00:00
|
|
|
|
|
|
|
/*
|
2012-05-15 08:59:06 +00:00
|
|
|
* Next line results in incorrect packet size being transmitted,
|
|
|
|
* resulting in errors in some DHCP servers, reporting missing bytes.
|
|
|
|
* Size must be set in packet header after extension length has been
|
|
|
|
* determined.
|
2002-09-27 23:19:37 +00:00
|
|
|
* C. Hallinan, DS4.COM, Inc.
|
|
|
|
*/
|
2012-05-23 07:59:07 +00:00
|
|
|
/* net_set_udp_header(pkt, 0xFFFFFFFFL, PORT_BOOTPS, PORT_BOOTPC,
|
2012-05-15 08:59:06 +00:00
|
|
|
sizeof (struct Bootp_t)); */
|
2012-05-23 07:59:07 +00:00
|
|
|
iphdr = pkt; /* We need this later for net_set_udp_header() */
|
2012-05-23 07:58:04 +00:00
|
|
|
pkt += IP_UDP_HDR_SIZE;
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2012-05-15 08:59:06 +00:00
|
|
|
bp = (struct Bootp_t *)pkt;
|
2002-09-27 23:19:37 +00:00
|
|
|
bp->bp_op = OP_BOOTREQUEST;
|
|
|
|
bp->bp_htype = HWT_ETHER;
|
|
|
|
bp->bp_hlen = HWL_ETHER;
|
|
|
|
bp->bp_hops = 0;
|
2008-10-01 13:26:28 +00:00
|
|
|
bp->bp_secs = htons(get_timer(0) / 1000);
|
2002-09-27 23:19:37 +00:00
|
|
|
NetWriteIP(&bp->bp_ciaddr, 0);
|
|
|
|
NetWriteIP(&bp->bp_yiaddr, 0);
|
|
|
|
NetWriteIP(&bp->bp_siaddr, 0);
|
|
|
|
NetWriteIP(&bp->bp_giaddr, 0);
|
2012-05-15 08:59:06 +00:00
|
|
|
memcpy(bp->bp_chaddr, NetOurEther, 6);
|
|
|
|
copy_filename(bp->bp_file, BootFile, sizeof(bp->bp_file));
|
2002-09-27 23:19:37 +00:00
|
|
|
|
|
|
|
/* Request additional information from the BOOTP/DHCP server */
|
2007-07-09 22:45:14 +00:00
|
|
|
#if defined(CONFIG_CMD_DHCP)
|
2012-05-23 07:59:10 +00:00
|
|
|
extlen = DhcpExtended((u8 *)bp->bp_vend, DHCP_DISCOVER, 0, 0);
|
2002-09-27 23:19:37 +00:00
|
|
|
#else
|
2012-05-23 07:59:10 +00:00
|
|
|
extlen = BootpExtended((u8 *)bp->bp_vend);
|
2007-07-10 16:05:02 +00:00
|
|
|
#endif
|
2002-09-27 23:19:37 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Bootp ID is the lower 4 bytes of our ethernet address
|
2008-10-01 13:26:28 +00:00
|
|
|
* plus the current time in ms.
|
2002-09-27 23:19:37 +00:00
|
|
|
*/
|
|
|
|
BootpID = ((ulong)NetOurEther[2] << 24)
|
|
|
|
| ((ulong)NetOurEther[3] << 16)
|
|
|
|
| ((ulong)NetOurEther[4] << 8)
|
|
|
|
| (ulong)NetOurEther[5];
|
|
|
|
BootpID += get_timer(0);
|
2014-08-19 08:21:24 +00:00
|
|
|
BootpID = htonl(BootpID);
|
|
|
|
bootp_add_id(BootpID);
|
2002-09-27 23:19:37 +00:00
|
|
|
NetCopyLong(&bp->bp_id, &BootpID);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Calculate proper packet lengths taking into account the
|
|
|
|
* variable size of the options field
|
|
|
|
*/
|
2012-05-23 07:59:10 +00:00
|
|
|
iplen = BOOTP_HDR_SIZE - OPT_FIELD_SIZE + extlen;
|
|
|
|
pktlen = eth_hdr_size + IP_UDP_HDR_SIZE + iplen;
|
2012-05-23 07:59:07 +00:00
|
|
|
net_set_udp_header(iphdr, 0xFFFFFFFFL, PORT_BOOTPS, PORT_BOOTPC, iplen);
|
net: BOOTP retry timeout improvements
Currently, the BOOTP code sends out its initial request as soon as the
Ethernet driver indicates "link up". If this packet is lost or not
replied to for some reason, the code waits for a 1s timeout before
retrying. For some reason, such early packets are often lost on my
system, so this causes an annoying delay.
To optimize this, modify the BOOTP code to have very short timeouts for
the first packet transmitted, but gradually increase the timeout each
time a timeout occurs. This way, if the first packet is lost, the second
packet is transmitted quite quickly and hence the overall delay is low.
However, if there's still no response, we don't keep spewing out packets
at an insane speed.
It's arguably more correct to try and find out why the first packet is
lost. However, it seems to disappear inside my Ethenet chip; the TX chip
indicates no error during TX (not that it has much in the way of
reporting...), yet wireshark on the RX side doesn't see any packet.
FWIW, I'm using an ASIX USB Ethernet adapter. Perhaps "link up" is
reported too early or based on the wrong condition in HW, and we should
add some fixed extra delay into the driver. However, this would slow down
every link up event even if it ends up not being needed in some cases.
Having BOOTP retry quickly applies the fix/WAR to every possible
Ethernet device, and is quite simple to implement, so seems a better
solution.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
2014-07-25 23:30:48 +00:00
|
|
|
NetSetTimeout(bootp_timeout, BootpTimeout);
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2007-07-09 22:45:14 +00:00
|
|
|
#if defined(CONFIG_CMD_DHCP)
|
2002-09-27 23:19:37 +00:00
|
|
|
dhcp_state = SELECTING;
|
2012-05-23 07:59:15 +00:00
|
|
|
net_set_udp_handler(DhcpHandler);
|
2002-09-27 23:19:37 +00:00
|
|
|
#else
|
2012-05-23 07:59:15 +00:00
|
|
|
net_set_udp_handler(BootpHandler);
|
2007-07-10 16:05:02 +00:00
|
|
|
#endif
|
2002-09-27 23:19:37 +00:00
|
|
|
NetSendPacket(NetTxPacket, pktlen);
|
|
|
|
}
|
|
|
|
|
2007-07-09 22:45:14 +00:00
|
|
|
#if defined(CONFIG_CMD_DHCP)
|
2012-05-15 08:59:06 +00:00
|
|
|
static void DhcpOptionsProcess(uchar *popt, struct Bootp_t *bp)
|
2002-09-27 23:19:37 +00:00
|
|
|
{
|
2003-04-05 00:53:31 +00:00
|
|
|
uchar *end = popt + BOOTP_HDR_SIZE;
|
2002-09-27 23:19:37 +00:00
|
|
|
int oplen, size;
|
2009-09-11 07:05:32 +00:00
|
|
|
#if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_TIMEOFFSET)
|
|
|
|
int *to_ptr;
|
|
|
|
#endif
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2004-03-12 00:14:09 +00:00
|
|
|
while (popt < end && *popt != 0xff) {
|
2002-09-27 23:19:37 +00:00
|
|
|
oplen = *(popt + 1);
|
2004-03-12 00:14:09 +00:00
|
|
|
switch (*popt) {
|
|
|
|
case 1:
|
2012-05-15 08:59:06 +00:00
|
|
|
NetCopyIP(&NetOurSubnetMask, (popt + 2));
|
2004-03-12 00:14:09 +00:00
|
|
|
break;
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_TIMEOFFSET)
|
2005-04-01 00:25:43 +00:00
|
|
|
case 2: /* Time offset */
|
2009-09-11 07:05:32 +00:00
|
|
|
to_ptr = &NetTimeOffset;
|
2012-05-15 08:59:06 +00:00
|
|
|
NetCopyLong((ulong *)to_ptr, (ulong *)(popt + 2));
|
|
|
|
NetTimeOffset = ntohl(NetTimeOffset);
|
2005-04-01 00:25:43 +00:00
|
|
|
break;
|
|
|
|
#endif
|
2004-03-12 00:14:09 +00:00
|
|
|
case 3:
|
2012-05-15 08:59:06 +00:00
|
|
|
NetCopyIP(&NetOurGatewayIP, (popt + 2));
|
2004-03-12 00:14:09 +00:00
|
|
|
break;
|
|
|
|
case 6:
|
2012-05-15 08:59:06 +00:00
|
|
|
NetCopyIP(&NetOurDNSIP, (popt + 2));
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_DNS2)
|
2012-05-15 08:59:06 +00:00
|
|
|
if (*(popt + 1) > 4)
|
|
|
|
NetCopyIP(&NetOurDNS2IP, (popt + 2 + 4));
|
2003-08-28 14:17:32 +00:00
|
|
|
#endif
|
2004-03-12 00:14:09 +00:00
|
|
|
break;
|
|
|
|
case 12:
|
2012-05-15 08:59:06 +00:00
|
|
|
size = truncate_sz("Host Name",
|
|
|
|
sizeof(NetOurHostName), oplen);
|
|
|
|
memcpy(&NetOurHostName, popt + 2, size);
|
2004-03-12 00:14:09 +00:00
|
|
|
NetOurHostName[size] = 0;
|
|
|
|
break;
|
|
|
|
case 15: /* Ignore Domain Name Option */
|
|
|
|
break;
|
|
|
|
case 17:
|
2012-05-15 08:59:06 +00:00
|
|
|
size = truncate_sz("Root Path",
|
|
|
|
sizeof(NetOurRootPath), oplen);
|
|
|
|
memcpy(&NetOurRootPath, popt + 2, size);
|
2004-03-12 00:14:09 +00:00
|
|
|
NetOurRootPath[size] = 0;
|
|
|
|
break;
|
2012-09-11 09:22:53 +00:00
|
|
|
case 28: /* Ignore Broadcast Address Option */
|
|
|
|
break;
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_NTPSERVER)
|
2005-04-01 00:25:43 +00:00
|
|
|
case 42: /* NTP server IP */
|
2012-05-15 08:59:06 +00:00
|
|
|
NetCopyIP(&NetNtpServerIP, (popt + 2));
|
2005-04-01 00:25:43 +00:00
|
|
|
break;
|
|
|
|
#endif
|
2004-03-12 00:14:09 +00:00
|
|
|
case 51:
|
2012-05-15 08:59:06 +00:00
|
|
|
NetCopyLong(&dhcp_leasetime, (ulong *) (popt + 2));
|
2004-03-12 00:14:09 +00:00
|
|
|
break;
|
|
|
|
case 53: /* Ignore Message Type Option */
|
|
|
|
break;
|
|
|
|
case 54:
|
2012-05-15 08:59:06 +00:00
|
|
|
NetCopyIP(&NetDHCPServerIP, (popt + 2));
|
2004-03-12 00:14:09 +00:00
|
|
|
break;
|
|
|
|
case 58: /* Ignore Renewal Time Option */
|
|
|
|
break;
|
|
|
|
case 59: /* Ignore Rebinding Time Option */
|
|
|
|
break;
|
2006-03-12 17:26:46 +00:00
|
|
|
case 66: /* Ignore TFTP server name */
|
|
|
|
break;
|
|
|
|
case 67: /* vendor opt bootfile */
|
|
|
|
/*
|
|
|
|
* I can't use dhcp_vendorex_proc here because I need
|
|
|
|
* to write into the bootp packet - even then I had to
|
|
|
|
* pass the bootp packet pointer into here as the
|
|
|
|
* second arg
|
|
|
|
*/
|
2012-05-15 08:59:06 +00:00
|
|
|
size = truncate_sz("Opt Boot File",
|
2006-03-12 17:26:46 +00:00
|
|
|
sizeof(bp->bp_file),
|
|
|
|
oplen);
|
|
|
|
if (bp->bp_file[0] == '\0' && size > 0) {
|
|
|
|
/*
|
|
|
|
* only use vendor boot file if we didn't
|
|
|
|
* receive a boot file in the main non-vendor
|
|
|
|
* part of the packet - god only knows why
|
|
|
|
* some vendors chose not to use this perfectly
|
|
|
|
* good spot to store the boot file (join on
|
|
|
|
* Tru64 Unix) it seems mind bogglingly crazy
|
|
|
|
* to me
|
|
|
|
*/
|
|
|
|
printf("*** WARNING: using vendor "
|
|
|
|
"optional boot file\n");
|
|
|
|
memcpy(bp->bp_file, popt + 2, size);
|
|
|
|
bp->bp_file[size] = '\0';
|
|
|
|
}
|
|
|
|
break;
|
2004-03-12 00:14:09 +00:00
|
|
|
default:
|
2007-07-10 03:08:34 +00:00
|
|
|
#if defined(CONFIG_BOOTP_VENDOREX)
|
2012-05-15 08:59:06 +00:00
|
|
|
if (dhcp_vendorex_proc(popt))
|
2003-06-27 21:31:46 +00:00
|
|
|
break;
|
2002-09-27 23:19:37 +00:00
|
|
|
#endif
|
2012-05-15 08:59:06 +00:00
|
|
|
printf("*** Unhandled DHCP Option in OFFER/ACK:"
|
|
|
|
" %d\n", *popt);
|
2004-03-12 00:14:09 +00:00
|
|
|
break;
|
2002-09-27 23:19:37 +00:00
|
|
|
}
|
|
|
|
popt += oplen + 2; /* Process next option */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int DhcpMessageType(unsigned char *popt)
|
|
|
|
{
|
2012-05-15 08:59:06 +00:00
|
|
|
if (NetReadLong((ulong *)popt) != htonl(BOOTP_VENDOR_MAGIC))
|
2002-09-27 23:19:37 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
popt += 4;
|
2012-05-15 08:59:06 +00:00
|
|
|
while (*popt != 0xff) {
|
|
|
|
if (*popt == 53) /* DHCP Message Type */
|
2002-09-27 23:19:37 +00:00
|
|
|
return *(popt + 2);
|
|
|
|
popt += *(popt + 1) + 2; /* Scan through all options */
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-05-15 08:59:06 +00:00
|
|
|
static void DhcpSendRequestPkt(struct Bootp_t *bp_offer)
|
2002-09-27 23:19:37 +00:00
|
|
|
{
|
2012-05-15 08:59:04 +00:00
|
|
|
uchar *pkt, *iphdr;
|
2012-05-15 08:59:06 +00:00
|
|
|
struct Bootp_t *bp;
|
2002-09-27 23:19:37 +00:00
|
|
|
int pktlen, iplen, extlen;
|
2012-05-23 07:59:10 +00:00
|
|
|
int eth_hdr_size;
|
2003-03-06 13:39:27 +00:00
|
|
|
IPaddr_t OfferedIP;
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2009-07-23 07:01:03 +00:00
|
|
|
debug("DhcpSendRequestPkt: Sending DHCPREQUEST\n");
|
2002-09-27 23:19:37 +00:00
|
|
|
pkt = NetTxPacket;
|
2012-05-15 08:59:06 +00:00
|
|
|
memset((void *)pkt, 0, PKTSIZE);
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2012-05-23 07:59:10 +00:00
|
|
|
eth_hdr_size = NetSetEther(pkt, NetBcastAddr, PROT_IP);
|
|
|
|
pkt += eth_hdr_size;
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2012-05-15 08:59:06 +00:00
|
|
|
iphdr = pkt; /* We'll need this later to set proper pkt size */
|
2012-05-23 07:58:04 +00:00
|
|
|
pkt += IP_UDP_HDR_SIZE;
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2012-05-15 08:59:06 +00:00
|
|
|
bp = (struct Bootp_t *)pkt;
|
2002-09-27 23:19:37 +00:00
|
|
|
bp->bp_op = OP_BOOTREQUEST;
|
|
|
|
bp->bp_htype = HWT_ETHER;
|
|
|
|
bp->bp_hlen = HWL_ETHER;
|
|
|
|
bp->bp_hops = 0;
|
2008-10-01 13:26:28 +00:00
|
|
|
bp->bp_secs = htons(get_timer(0) / 1000);
|
2012-05-15 08:59:06 +00:00
|
|
|
/* Do not set the client IP, your IP, or server IP yet, since it
|
|
|
|
* hasn't been ACK'ed by the server yet */
|
2007-10-29 21:40:35 +00:00
|
|
|
|
2006-10-11 22:01:08 +00:00
|
|
|
/*
|
2006-10-08 23:26:14 +00:00
|
|
|
* RFC3046 requires Relay Agents to discard packets with
|
|
|
|
* nonzero and offered giaddr
|
|
|
|
*/
|
|
|
|
NetWriteIP(&bp->bp_giaddr, 0);
|
|
|
|
|
2012-05-15 08:59:06 +00:00
|
|
|
memcpy(bp->bp_chaddr, NetOurEther, 6);
|
2002-09-27 23:19:37 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* ID is the id of the OFFER packet
|
|
|
|
*/
|
|
|
|
|
|
|
|
NetCopyLong(&bp->bp_id, &bp_offer->bp_id);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Copy options from OFFER packet if present
|
|
|
|
*/
|
2007-10-29 21:40:35 +00:00
|
|
|
|
|
|
|
/* Copy offered IP into the parameters request list */
|
|
|
|
NetCopyIP(&OfferedIP, &bp_offer->bp_yiaddr);
|
2012-05-15 08:59:06 +00:00
|
|
|
extlen = DhcpExtended((u8 *)bp->bp_vend, DHCP_REQUEST,
|
|
|
|
NetDHCPServerIP, OfferedIP);
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2012-05-23 07:59:10 +00:00
|
|
|
iplen = BOOTP_HDR_SIZE - OPT_FIELD_SIZE + extlen;
|
|
|
|
pktlen = eth_hdr_size + IP_UDP_HDR_SIZE + iplen;
|
2012-05-23 07:59:07 +00:00
|
|
|
net_set_udp_header(iphdr, 0xFFFFFFFFL, PORT_BOOTPS, PORT_BOOTPC, iplen);
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2008-03-25 22:43:57 +00:00
|
|
|
#ifdef CONFIG_BOOTP_DHCP_REQUEST_DELAY
|
|
|
|
udelay(CONFIG_BOOTP_DHCP_REQUEST_DELAY);
|
|
|
|
#endif /* CONFIG_BOOTP_DHCP_REQUEST_DELAY */
|
2012-05-23 07:59:11 +00:00
|
|
|
debug("Transmitting DHCPREQUEST packet: len = %d\n", pktlen);
|
2002-09-27 23:19:37 +00:00
|
|
|
NetSendPacket(NetTxPacket, pktlen);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Handle DHCP received packets.
|
|
|
|
*/
|
|
|
|
static void
|
2011-04-18 06:19:50 +00:00
|
|
|
DhcpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
|
|
|
|
unsigned len)
|
2002-09-27 23:19:37 +00:00
|
|
|
{
|
2012-05-15 08:59:06 +00:00
|
|
|
struct Bootp_t *bp = (struct Bootp_t *)pkt;
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2009-07-23 07:01:03 +00:00
|
|
|
debug("DHCPHandler: got packet: (src=%d, dst=%d, len=%d) state: %d\n",
|
2002-09-27 23:19:37 +00:00
|
|
|
src, dest, len, dhcp_state);
|
|
|
|
|
2012-05-15 08:59:06 +00:00
|
|
|
/* Filter out pkts we don't want */
|
|
|
|
if (BootpCheckPkt(pkt, dest, src, len))
|
2002-09-27 23:19:37 +00:00
|
|
|
return;
|
|
|
|
|
2012-05-15 08:59:06 +00:00
|
|
|
debug("DHCPHandler: got DHCP packet: (src=%d, dst=%d, len=%d) state:"
|
|
|
|
" %d\n", src, dest, len, dhcp_state);
|
2002-09-27 23:19:37 +00:00
|
|
|
|
|
|
|
switch (dhcp_state) {
|
|
|
|
case SELECTING:
|
|
|
|
/*
|
|
|
|
* Wait an appropriate time for any potential DHCPOFFER packets
|
2012-05-15 08:59:06 +00:00
|
|
|
* to arrive. Then select one, and generate DHCPREQUEST
|
|
|
|
* response. If filename is in format we recognize, assume it
|
|
|
|
* is a valid OFFER from a server we want.
|
2002-09-27 23:19:37 +00:00
|
|
|
*/
|
2009-07-23 07:01:03 +00:00
|
|
|
debug("DHCP: state=SELECTING bp_file: \"%s\"\n", bp->bp_file);
|
2008-10-16 13:01:15 +00:00
|
|
|
#ifdef CONFIG_SYS_BOOTFILE_PREFIX
|
2002-09-27 23:19:37 +00:00
|
|
|
if (strncmp(bp->bp_file,
|
2008-10-16 13:01:15 +00:00
|
|
|
CONFIG_SYS_BOOTFILE_PREFIX,
|
2012-05-15 08:59:06 +00:00
|
|
|
strlen(CONFIG_SYS_BOOTFILE_PREFIX)) == 0) {
|
2008-10-16 13:01:15 +00:00
|
|
|
#endif /* CONFIG_SYS_BOOTFILE_PREFIX */
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2009-07-23 07:01:03 +00:00
|
|
|
debug("TRANSITIONING TO REQUESTING STATE\n");
|
2002-09-27 23:19:37 +00:00
|
|
|
dhcp_state = REQUESTING;
|
2003-04-10 13:26:44 +00:00
|
|
|
|
2012-05-15 08:59:06 +00:00
|
|
|
if (NetReadLong((ulong *)&bp->bp_vend[0]) ==
|
|
|
|
htonl(BOOTP_VENDOR_MAGIC))
|
2006-03-12 17:26:46 +00:00
|
|
|
DhcpOptionsProcess((u8 *)&bp->bp_vend[4], bp);
|
2002-09-27 23:19:37 +00:00
|
|
|
|
net: BOOTP retry timeout improvements
Currently, the BOOTP code sends out its initial request as soon as the
Ethernet driver indicates "link up". If this packet is lost or not
replied to for some reason, the code waits for a 1s timeout before
retrying. For some reason, such early packets are often lost on my
system, so this causes an annoying delay.
To optimize this, modify the BOOTP code to have very short timeouts for
the first packet transmitted, but gradually increase the timeout each
time a timeout occurs. This way, if the first packet is lost, the second
packet is transmitted quite quickly and hence the overall delay is low.
However, if there's still no response, we don't keep spewing out packets
at an insane speed.
It's arguably more correct to try and find out why the first packet is
lost. However, it seems to disappear inside my Ethenet chip; the TX chip
indicates no error during TX (not that it has much in the way of
reporting...), yet wireshark on the RX side doesn't see any packet.
FWIW, I'm using an ASIX USB Ethernet adapter. Perhaps "link up" is
reported too early or based on the wrong condition in HW, and we should
add some fixed extra delay into the driver. However, this would slow down
every link up event even if it ends up not being needed in some cases.
Having BOOTP retry quickly applies the fix/WAR to every possible
Ethernet device, and is quite simple to implement, so seems a better
solution.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
2014-07-25 23:30:48 +00:00
|
|
|
NetSetTimeout(5000, BootpTimeout);
|
2002-09-27 23:19:37 +00:00
|
|
|
DhcpSendRequestPkt(bp);
|
2008-10-16 13:01:15 +00:00
|
|
|
#ifdef CONFIG_SYS_BOOTFILE_PREFIX
|
2002-09-27 23:19:37 +00:00
|
|
|
}
|
2008-10-16 13:01:15 +00:00
|
|
|
#endif /* CONFIG_SYS_BOOTFILE_PREFIX */
|
2002-09-27 23:19:37 +00:00
|
|
|
|
|
|
|
return;
|
|
|
|
break;
|
|
|
|
case REQUESTING:
|
2009-07-23 07:01:03 +00:00
|
|
|
debug("DHCP State: REQUESTING\n");
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2012-05-15 08:59:06 +00:00
|
|
|
if (DhcpMessageType((u8 *)bp->bp_vend) == DHCP_ACK) {
|
|
|
|
if (NetReadLong((ulong *)&bp->bp_vend[0]) ==
|
|
|
|
htonl(BOOTP_VENDOR_MAGIC))
|
2006-03-12 17:26:46 +00:00
|
|
|
DhcpOptionsProcess((u8 *)&bp->bp_vend[4], bp);
|
2012-05-15 08:59:06 +00:00
|
|
|
/* Store net params from reply */
|
|
|
|
BootpCopyNetParams(bp);
|
2002-09-27 23:19:37 +00:00
|
|
|
dhcp_state = BOUND;
|
2014-08-19 08:21:24 +00:00
|
|
|
printf("DHCP client bound to address %pI4 (%lu ms)\n",
|
|
|
|
&NetOurIP, get_timer(bootp_start));
|
2011-12-10 11:08:06 +00:00
|
|
|
bootstage_mark_name(BOOTSTAGE_ID_BOOTP_STOP,
|
2012-05-15 08:59:06 +00:00
|
|
|
"bootp_stop");
|
2002-09-27 23:19:37 +00:00
|
|
|
|
2011-10-27 06:24:32 +00:00
|
|
|
net_auto_load();
|
2002-09-27 23:19:37 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
break;
|
2008-08-20 09:30:28 +00:00
|
|
|
case BOUND:
|
|
|
|
/* DHCP client bound to address */
|
|
|
|
break;
|
2002-09-27 23:19:37 +00:00
|
|
|
default:
|
2012-05-15 08:59:06 +00:00
|
|
|
puts("DHCP: INVALID STATE\n");
|
2002-09-27 23:19:37 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
void DhcpRequest(void)
|
|
|
|
{
|
|
|
|
BootpRequest();
|
|
|
|
}
|
2007-11-03 22:09:27 +00:00
|
|
|
#endif /* CONFIG_CMD_DHCP */
|