From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 306D71A1E43 for ; Tue, 6 Sep 2016 04:05:32 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 06 Sep 2016 04:05:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,291,1470726000"; d="scan'208";a="1051990171" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga002.fm.intel.com with ESMTP; 06 Sep 2016 04:05:31 -0700 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 6 Sep 2016 04:05:31 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 6 Sep 2016 04:05:30 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.102]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.166]) with mapi id 14.03.0248.002; Tue, 6 Sep 2016 19:05:28 +0800 From: "Wu, Jiaxin" To: Santhapur Naveen , "edk2-devel@lists.01.org" CC: "Ye, Ting" , "Fu, Siyuan" Thread-Topic: [edk2] [Patch] MdeModulePkg: Support classless IP for DHCPv4 TransmitReceive() Thread-Index: AQHR+RLeHiECohhR806RNjKSnViC9aBN2AGAgABcjqCAF5ss8IAGmtVA Date: Tue, 6 Sep 2016 11:05:27 +0000 Message-ID: <895558F6EA4E3B41AC93A00D163B7274137FA5AF@SHSMSX103.ccr.corp.intel.com> References: <1471498722-36656-1-git-send-email-jiaxin.wu@intel.com> <895558F6EA4E3B41AC93A00D163B7274137C87CB@SHSMSX103.ccr.corp.intel.com> <625A2455CC232F40B0F38F05ACED6D976C5472EB@VENUS1.in.megatrends.com> In-Reply-To: <625A2455CC232F40B0F38F05ACED6D976C5472EB@VENUS1.in.megatrends.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOGYzYjhmMDAtZmQ3Ny00ZTExLWIwZTktZGQ2NDQ4YTIyNzljIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6Ikx6T25yckJ6NitTcmNYbEdLN0VcL3ptcUQ1bFlqT3pUTHNOY2trWThQdU1JPSJ9 x-ctpclassification: CTP_IC x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] MdeModulePkg: Support classless IP for DHCPv4 TransmitReceive() X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Sep 2016 11:05:32 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Naveen, The patch has been committed: SHA-1: 8c5f78a2cc15199e3f77ae4b156023af366fd6c7 * MdeModulePkg: Support classless IP for DHCPv4 TransmitReceive() Thanks, Jiaxin > -----Original Message----- > From: Santhapur Naveen [mailto:naveens@amiindia.co.in] > Sent: Friday, September 2, 2016 2:16 PM > To: Wu, Jiaxin ; edk2-devel@lists.01.org > Cc: Ye, Ting ; Fu, Siyuan > Subject: RE: [edk2] [Patch] MdeModulePkg: Support classless IP for DHCPv4 > TransmitReceive() >=20 > Hello Jiaxin, >=20 > My sincere apologies for the delayed response. >=20 > I've verified the patch from my side and PXE boot is happening > successfully even in classless IP network. >=20 > May I know whether this will be included in EDK2? If yes, can you > please provide any schedule for the same? >=20 > Best regards, > Naveen >=20 > -----Original Message----- > From: Santhapur Naveen > Sent: Thursday, August 18, 2016 11:14 AM > To: 'Wu, Jiaxin'; edk2-devel@lists.01.org > Cc: Ye, Ting; Fu, Siyuan; Sivaraman Nainar; Madhan B. Santharam > Subject: RE: [edk2] [Patch] MdeModulePkg: Support classless IP for DHCPv4 > TransmitReceive() >=20 > Jiaxin, >=20 > We will verify the patch and update you the result. >=20 > Thanks, > Naveen >=20 > -----Original Message----- > From: Wu, Jiaxin [mailto:jiaxin.wu@intel.com] > Sent: Thursday, August 18, 2016 11:12 AM > To: Santhapur Naveen; Wu, Jiaxin; edk2-devel@lists.01.org > Cc: Ye, Ting; Fu, Siyuan; Sivaraman Nainar; Madhan B. Santharam > Subject: RE: [edk2] [Patch] MdeModulePkg: Support classless IP for DHCPv4 > TransmitReceive() >=20 > Naveen, >=20 > Can you help to verify this patch to support the classless IP. >=20 > Thanks, > Jiaxin >=20 > > -----Original Message----- > > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of > > Jiaxin Wu > > Sent: Thursday, August 18, 2016 1:39 PM > > To: edk2-devel@lists.01.org > > Cc: Ye, Ting ; Fu, Siyuan ; > > Santhapur Naveen > > Subject: [edk2] [Patch] 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 > > Cc: Ye Ting > > Cc: Fu Siyuan > > Contributed-under: TianoCore Contribution Agreement 1.0 > > Signed-off-by: Jiaxin Wu > > --- > > .../Universal/Network/Dhcp4Dxe/Dhcp4Impl.c | 28 > +++++++++++++++- > > ------ > > 1 file changed, 20 insertions(+), 8 deletions(-) > > > > diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c > > b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c > > index 4f491b4..79f7cde 100644 > > --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c > > +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c > > @@ -1,9 +1,9 @@ > > /** @file > > This file implement the EFI_DHCP4_PROTOCOL interface. > > > > -Copyright (c) 2006 - 2015, Intel Corporation. All rights > > reserved.
> > +Copyright (c) 2006 - 2016, Intel Corporation. All rights > > +reserved.
> > This program and the accompanying materials 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 http://opensource.org/licenses/bsd-license.php > > > > @@ -1186,18 +1186,20 @@ Dhcp4InstanceConfigUdpIo ( > > IN UDP_IO *UdpIo, > > IN VOID *Context > > ) > > { > > DHCP_PROTOCOL *Instance; > > + DHCP_SERVICE *DhcpSb; > > EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN *Token; > > EFI_UDP4_CONFIG_DATA UdpConfigData; > > IP4_ADDR ClientAddr; > > IP4_ADDR Ip; > > INTN Class; > > IP4_ADDR SubnetMask; > > > > Instance =3D (DHCP_PROTOCOL *) Context; > > + DhcpSb =3D Instance->Service; > > Token =3D Instance->Token; > > > > ZeroMem (&UdpConfigData, sizeof (EFI_UDP4_CONFIG_DATA)); > > > > UdpConfigData.AcceptBroadcast =3D TRUE; > > @@ -1206,14 +1208,19 @@ Dhcp4InstanceConfigUdpIo ( > > UdpConfigData.DoNotFragment =3D TRUE; > > > > ClientAddr =3D EFI_NTOHL (Token->Packet->Dhcp4.Header.ClientAddr); > > Ip =3D HTONL (ClientAddr); > > CopyMem (&UdpConfigData.StationAddress, &Ip, sizeof > > (EFI_IPv4_ADDRESS)); > > - > > - Class =3D NetGetIpClass (ClientAddr); > > - ASSERT (Class < IP4_ADDR_CLASSE); > > - SubnetMask =3D gIp4AllMasks[Class << 3]; > > + > > + if (DhcpSb->Netmask =3D=3D 0) { > > + Class =3D NetGetIpClass (ClientAddr); > > + ASSERT (Class < IP4_ADDR_CLASSE); > > + SubnetMask =3D gIp4AllMasks[Class << 3]; } else { > > + SubnetMask =3D DhcpSb->Netmask; > > + } > > + > > Ip =3D HTONL (SubnetMask); > > CopyMem (&UdpConfigData.SubnetMask, &Ip, sizeof > > (EFI_IPv4_ADDRESS)); > > > > if ((Token->ListenPointCount =3D=3D 0) || > > (Token->ListenPoints[0].ListenPort > > =3D=3D 0)) { > > UdpConfigData.StationPort =3D DHCP_CLIENT_PORT; @@ -1574,16 > > +1581,21 @@ EfiDhcp4TransmitReceive ( > > EndPoint.RemotePort =3D DHCP_SERVER_PORT; > > } else { > > EndPoint.RemotePort =3D Token->RemotePort; > > } > > > > + if (DhcpSb->Netmask =3D=3D 0) { > > + Class =3D NetGetIpClass (ClientAddr); > > + ASSERT (Class < IP4_ADDR_CLASSE); > > + SubnetMask =3D gIp4AllMasks[Class << 3]; } else { > > + SubnetMask =3D DhcpSb->Netmask; > > + } > > + > > // > > // Get the gateway. > > // > > - Class =3D NetGetIpClass (ClientAddr); > > - ASSERT (Class < IP4_ADDR_CLASSE); > > - SubnetMask =3D gIp4AllMasks[Class << 3]; > > ZeroMem (&Gateway, sizeof (Gateway)); > > if (!IP4_NET_EQUAL (ClientAddr, EndPoint.RemoteAddr.Addr[0], > > SubnetMask)) { > > CopyMem (&Gateway.v4, &Token->GatewayAddress, sizeof > > (EFI_IPv4_ADDRESS)); > > Gateway.Addr[0] =3D NTOHL (Gateway.Addr[0]); > > } > > -- > > 1.9.5.msysgit.1 > > > > _______________________________________________ > > edk2-devel mailing list > > edk2-devel@lists.01.org > > https://lists.01.org/mailman/listinfo/edk2-devel