arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-15 00:02:49 +03:00
Code Activity

Fixing DHCP hostname (peter).

Browse Source 
http://code.google.com/p/arduino/issues/detail?id=742
This commit is contained in:
David A. Mellis
2011-12-14 00:55:10 -05:00
parent 7c90d9d8b5
commit b8fbffeac4
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libraries/Ethernet/Dhcp.cpp
View File

@ -163,15 +163,15 @@ void DhcpClass::send_DHCP_MESSAGE(uint8_t messageType, uint16_t secondsElapsed)
// OPT - host name // OPT - host name
buffer[16] = hostName; buffer[16] = hostName;
buffer[17] = strlen(HOST_NAME) + 3; // length of hostname + last 3 bytes of mac address buffer[17] = strlen(HOST_NAME) + 6; // length of hostname + last 3 bytes of mac address
strcpy((char*)&(buffer[18]), HOST_NAME); strcpy((char*)&(buffer[18]), HOST_NAME);
buffer[24] = _dhcpMacAddr[3]; printByte((char*)&(buffer[24]), _dhcpMacAddr[3]);
buffer[25] = _dhcpMacAddr[4]; printByte((char*)&(buffer[26]), _dhcpMacAddr[4]);
buffer[26] = _dhcpMacAddr[5]; printByte((char*)&(buffer[28]), _dhcpMacAddr[5]);
//put data in W5100 transmit buffer //put data in W5100 transmit buffer
_dhcpUdpSocket.write(buffer, 27); _dhcpUdpSocket.write(buffer, 30);
if(messageType == DHCP_REQUEST) if(messageType == DHCP_REQUEST)
{ {
@ -347,3 +347,13 @@ IPAddress DhcpClass::getDnsServerIp()
return IPAddress(_dhcpDnsServerIp); return IPAddress(_dhcpDnsServerIp);
} }
void DhcpClass::printByte(char * buf, uint8_t n ) {
char *str = &buf[1];
buf[0]='0';
do {
unsigned long m = n;
n /= 16;
char c = m - 16 * n;
*str-- = c < 10 ? c + '0' : c + 'A' - 10;
} while(n);
}

1
libraries/Ethernet/Dhcp.h
View File

@ -143,6 +143,7 @@ private:
void presend_DHCP(); void presend_DHCP();
void send_DHCP_MESSAGE(uint8_t, uint16_t); void send_DHCP_MESSAGE(uint8_t, uint16_t);
void printByte(char *, uint8_t);
uint8_t parseDHCPResponse(unsigned long responseTimeout, uint32_t& transactionId); uint8_t parseDHCPResponse(unsigned long responseTimeout, uint32_t& transactionId);
public: public: