gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-16 12:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add DHCP Lease Time to RNDIS Demo

Browse Source 
The RNDIS ClassDriver and LowLevel Demo won't work on some Linux
hosts as their DHCP client requires the DHCP Option Lease Time.
Add it to both Demos. Tested on Fedora Linux 22.
This commit is contained in:
Stefan Hellermann 2015-09-30 09:59:19 +02:00
parent 7638128d47
commit 55adec1f4f
4 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Demos/Device/ClassDriver/RNDISEthernet/Lib/DHCP.c
View File

@ -95,12 +95,20 @@ int16_t DHCP_ProcessDHCPPacket(void* IPHeaderInStart,
: DHCP_MESSAGETYPE_ACK;
*(DHCPOptionsOUTStart++) = DHCP_OPTION_SUBNETMASK;
*(DHCPOptionsOUTStart++) = 4;
*(DHCPOptionsOUTStart++) = sizeof(IP_Address_t);
*(DHCPOptionsOUTStart++) = 0xFF;
*(DHCPOptionsOUTStart++) = 0xFF;
*(DHCPOptionsOUTStart++) = 0xFF;
*(DHCPOptionsOUTStart++) = 0x00;
*(DHCPOptionsOUTStart++) = DHCP_OPTION_LEASETIME;
*(DHCPOptionsOUTStart++) = sizeof(uint32_t);
/* Lease Time 86400s (ONE_DAY) */
*(DHCPOptionsOUTStart++) = 0x00;
*(DHCPOptionsOUTStart++) = 0x01;
*(DHCPOptionsOUTStart++) = 0x51;
*(DHCPOptionsOUTStart++) = 0x80;
*(DHCPOptionsOUTStart++) = DHCP_OPTION_DHCPSERVER;
*(DHCPOptionsOUTStart++) = sizeof(IP_Address_t);
memcpy(DHCPOptionsOUTStart, &ServerIPAddress, sizeof(IP_Address_t));
@ -108,7 +116,7 @@ int16_t DHCP_ProcessDHCPPacket(void* IPHeaderInStart,
*(DHCPOptionsOUTStart++) = DHCP_OPTION_END;
return (sizeof(DHCP_Header_t) + 12 + sizeof(IP_Address_t));
return (sizeof(DHCP_Header_t) + 18 + sizeof(IP_Address_t));
}
}

3
Demos/Device/ClassDriver/RNDISEthernet/Lib/DHCP.h
View File

@ -60,6 +60,9 @@
/** DHCP option list entry header, indicating that a subnet mask will follow. */
#define DHCP_OPTION_SUBNETMASK 1
/** DHCP option list entry header, indicating that the Lease Time will follow. */
#define DHCP_OPTION_LEASETIME 51
/** DHCP option list entry header, indicating that the DHCP message type constant will follow. */
#define DHCP_OPTION_MESSAGETYPE 53

12
Demos/Device/LowLevel/RNDISEthernet/Lib/DHCP.c
View File

@ -95,12 +95,20 @@ int16_t DHCP_ProcessDHCPPacket(void* IPHeaderInStart,
: DHCP_MESSAGETYPE_ACK;
*(DHCPOptionsOUTStart++) = DHCP_OPTION_SUBNETMASK;
*(DHCPOptionsOUTStart++) = 4;
*(DHCPOptionsOUTStart++) = sizeof(IP_Address_t);
*(DHCPOptionsOUTStart++) = 0xFF;
*(DHCPOptionsOUTStart++) = 0xFF;
*(DHCPOptionsOUTStart++) = 0xFF;
*(DHCPOptionsOUTStart++) = 0x00;
*(DHCPOptionsOUTStart++) = DHCP_OPTION_LEASETIME;
*(DHCPOptionsOUTStart++) = sizeof(uint32_t);
/* Lease Time 86400s (ONE_DAY) */
*(DHCPOptionsOUTStart++) = 0x00;
*(DHCPOptionsOUTStart++) = 0x01;
*(DHCPOptionsOUTStart++) = 0x51;
*(DHCPOptionsOUTStart++) = 0x80;
*(DHCPOptionsOUTStart++) = DHCP_OPTION_DHCPSERVER;
*(DHCPOptionsOUTStart++) = sizeof(IP_Address_t);
memcpy(DHCPOptionsOUTStart, &ServerIPAddress, sizeof(IP_Address_t));
@ -108,7 +116,7 @@ int16_t DHCP_ProcessDHCPPacket(void* IPHeaderInStart,
*(DHCPOptionsOUTStart++) = DHCP_OPTION_END;
return (sizeof(DHCP_Header_t) + 12 + sizeof(IP_Address_t));
return (sizeof(DHCP_Header_t) + 18 + sizeof(IP_Address_t));
}
}

3
Demos/Device/LowLevel/RNDISEthernet/Lib/DHCP.h
View File

@ -60,6 +60,9 @@
/** DHCP option list entry header, indicating that a subnet mask will follow. */
#define DHCP_OPTION_SUBNETMASK 1
/** DHCP option list entry header, indicating that the Lease Time will follow. */
#define DHCP_OPTION_LEASETIME 51
/** DHCP option list entry header, indicating that the DHCP message type constant will follow. */
#define DHCP_OPTION_MESSAGETYPE 53