diff options
| author | stroese <stroese> | 2003-08-28 14:17:32 +0000 |
|---|---|---|
| committer | stroese <stroese> | 2003-08-28 14:17:32 +0000 |
| commit | fe389a82c9f9f29c54768e3b3ac947487ff85d59 (patch) | |
| tree | fcc90efe718cf41f033b77417c87aa79cabf6464 /net | |
| parent | d94f92cbd7f4a4d3bf0d5d963b709c686e8f6633 (diff) | |
| download | u-boot-midas-fe389a82c9f9f29c54768e3b3ac947487ff85d59.tar.gz u-boot-midas-fe389a82c9f9f29c54768e3b3ac947487ff85d59.tar.bz2 u-boot-midas-fe389a82c9f9f29c54768e3b3ac947487ff85d59.zip | |
- Added CONFIG_BOOTP_DNS2 and CONFIG_BOOTP_SEND_HOSTNAME to CONFIG_BOOTP_MASK.
Diffstat (limited to 'net')
| -rw-r--r-- | net/bootp.c | 23 | ||||
| -rw-r--r-- | net/net.c | 3 |
2 files changed, 26 insertions, 0 deletions
diff --git a/net/bootp.c b/net/bootp.c index 31b224327e..854ca16d6a 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -174,6 +174,11 @@ static void BootpVendorFieldProcess(u8 *ext) if (NetOurDNSIP == 0) { NetCopyIP(&NetOurDNSIP, (IPaddr_t*)(ext+2)); } +#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_DNS2) + if ((NetOurDNS2IP == 0) && (size > 4)) { + NetCopyIP(&NetOurDNS2IP, (IPaddr_t*)(ext+2+4)); + } +#endif break; case 7: /* Log server - Not yet supported */ break; @@ -365,6 +370,9 @@ static int DhcpExtended(u8 *e, int message_type, IPaddr_t ServerID, IPaddr_t Req #if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_VENDOREX) u8 *x; #endif +#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_SEND_HOSTNAME) + uchar *hostname; +#endif *e++ = 99; /* RFC1048 Magic Cookie */ *e++ = 130; @@ -402,6 +410,16 @@ static int DhcpExtended(u8 *e, int message_type, IPaddr_t ServerID, IPaddr_t Req *e++ = tmp & 0xff; } +#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_SEND_HOSTNAME) + if ( (hostname = getenv("hostname")) ) { + int hostnamelen = strlen(hostname); + *e++ = 12; /* Hostname */ + *e++ = hostnamelen; + memcpy(e,hostname,hostnamelen); + e += hostnamelen; + } +#endif + #if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_VENDOREX) if ((x = dhcp_vendorex_prep (e))) return x - start ; @@ -690,6 +708,11 @@ static void DhcpOptionsProcess(uchar *popt) break; case 6: NetCopyIP(&NetOurDNSIP, (popt+2)); +#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_DNS2) + if ( *(popt+1) > 4 ) { + NetCopyIP(&NetOurDNS2IP, (popt+2+4)); + } +#endif break; case 12: size = truncate_sz ("Host Name", @@ -84,6 +84,9 @@ IPaddr_t NetOurSubnetMask=0; /* Our subnet mask (0=unknown) */ IPaddr_t NetOurGatewayIP=0; /* Our gateways IP address */ IPaddr_t NetOurDNSIP=0; /* Our DNS IP address */ +#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_DNS2) +IPaddr_t NetOurDNS2IP=0; /* Our 2nd DNS IP address */ +#endif char NetOurNISDomain[32]={0,}; /* Our NIS domain */ char NetOurHostName[32]={0,}; /* Our hostname */ char NetOurRootPath[64]={0,}; /* Our bootpath */ |