tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg: Support classless IP for DHCPv4 TransmitReceive() 

The IP address should not be treated as classful one if DHCP options
contain a classless IP with its true subnet mask. Otherwise, DHCPv4
TransmitReceive() will failed. This real subnet mask will be parsed
and recorded in DhcpSb->Netmask. So, we need check it before get the
IP's corresponding subnet mask.

Cc: Santhapur Naveen <naveens@amiindia.co.in>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
This commit is contained in:
Jiaxin Wu 2016-08-18 13:31:07 +08:00
parent 29be616014
commit 8c5f78a2cc
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
This file implement the EFI_DHCP4_PROTOCOL interface. This file implement the EFI_DHCP4_PROTOCOL interface.
Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -1188,6 +1188,7 @@ Dhcp4InstanceConfigUdpIo (
) )
{ {
DHCP_PROTOCOL *Instance; DHCP_PROTOCOL *Instance;
DHCP_SERVICE *DhcpSb;
EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN *Token; EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN *Token;
EFI_UDP4_CONFIG_DATA UdpConfigData; EFI_UDP4_CONFIG_DATA UdpConfigData;
IP4_ADDR ClientAddr; IP4_ADDR ClientAddr;
@ -1196,6 +1197,7 @@ Dhcp4InstanceConfigUdpIo (
IP4_ADDR SubnetMask; IP4_ADDR SubnetMask;
Instance = (DHCP_PROTOCOL *) Context; Instance = (DHCP_PROTOCOL *) Context;
DhcpSb = Instance->Service;
Token = Instance->Token; Token = Instance->Token;
ZeroMem (&UdpConfigData, sizeof (EFI_UDP4_CONFIG_DATA)); ZeroMem (&UdpConfigData, sizeof (EFI_UDP4_CONFIG_DATA));
@ -1209,9 +1211,14 @@ Dhcp4InstanceConfigUdpIo (
Ip = HTONL (ClientAddr); Ip = HTONL (ClientAddr);
CopyMem (&UdpConfigData.StationAddress, &Ip, sizeof (EFI_IPv4_ADDRESS)); CopyMem (&UdpConfigData.StationAddress, &Ip, sizeof (EFI_IPv4_ADDRESS));
Class = NetGetIpClass (ClientAddr); if (DhcpSb->Netmask == 0) {
ASSERT (Class < IP4_ADDR_CLASSE); Class = NetGetIpClass (ClientAddr);
SubnetMask = gIp4AllMasks[Class << 3]; ASSERT (Class < IP4_ADDR_CLASSE);
SubnetMask = gIp4AllMasks[Class << 3];
} else {
SubnetMask = DhcpSb->Netmask;
}
Ip = HTONL (SubnetMask); Ip = HTONL (SubnetMask);
CopyMem (&UdpConfigData.SubnetMask, &Ip, sizeof (EFI_IPv4_ADDRESS)); CopyMem (&UdpConfigData.SubnetMask, &Ip, sizeof (EFI_IPv4_ADDRESS));
@ -1576,12 +1583,17 @@ EfiDhcp4TransmitReceive (
EndPoint.RemotePort = Token->RemotePort; EndPoint.RemotePort = Token->RemotePort;
} }
if (DhcpSb->Netmask == 0) {
Class = NetGetIpClass (ClientAddr);
ASSERT (Class < IP4_ADDR_CLASSE);
SubnetMask = gIp4AllMasks[Class << 3];
} else {
SubnetMask = DhcpSb->Netmask;
}
// //
// Get the gateway. // Get the gateway.
// //
Class = NetGetIpClass (ClientAddr);
ASSERT (Class < IP4_ADDR_CLASSE);
SubnetMask = gIp4AllMasks[Class << 3];
ZeroMem (&Gateway, sizeof (Gateway)); ZeroMem (&Gateway, sizeof (Gateway));
if (!IP4_NET_EQUAL (ClientAddr, EndPoint.RemoteAddr.Addr[0], SubnetMask)) { if (!IP4_NET_EQUAL (ClientAddr, EndPoint.RemoteAddr.Addr[0], SubnetMask)) {
CopyMem (&Gateway.v4, &Token->GatewayAddress, sizeof (EFI_IPv4_ADDRESS)); CopyMem (&Gateway.v4, &Token->GatewayAddress, sizeof (EFI_IPv4_ADDRESS));