[Change summary]:
1. Update NetLib to a combined NetLib support dual network stack: 1) Add Network Debug facility for IPv4 stack. 2) Extend the library APIs to support IPv6 stack: a. NetIp6IsUnspecifiedAddr b. NetIp6IsLinkLocalAddr c. NetIp6IsNetEqual d. NetLibCreateIPv6DPathNode. e. NetIp6PseudoHeadChecksum f. NetIp6IsValidUnicast 3) Update the structure definitions: a. Update NET_BUF to add EFI_IP6_HEADER and EFI_UDP_HEADER b. Add NET_IP6_PSEUDO_HDR 4) Update Ip4IsUnicast to NetIp4IsUnicast 2. Update the impacted modules to adopt the combined NetLib. 3. Clean up coding style errors in all network drivers and libraries. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9391 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -46,27 +46,24 @@ typedef struct _IP4_CONFIG_INSTANCE IP4_CONFIG_INSTANCE;
|
||||
//
|
||||
// Global variables
|
||||
//
|
||||
extern EFI_DRIVER_BINDING_PROTOCOL gIp4ConfigDriverBinding;
|
||||
extern EFI_COMPONENT_NAME_PROTOCOL gIp4ConfigComponentName;
|
||||
extern EFI_COMPONENT_NAME2_PROTOCOL gIp4ConfigComponentName2;
|
||||
|
||||
extern IP4_CONFIG_INSTANCE *mIp4ConfigNicList[MAX_IP4_CONFIG_IN_VARIABLE];
|
||||
extern EFI_IP4_CONFIG_PROTOCOL mIp4ConfigProtocolTemplate;
|
||||
extern EFI_DRIVER_BINDING_PROTOCOL gIp4ConfigDriverBinding;
|
||||
extern EFI_COMPONENT_NAME_PROTOCOL gIp4ConfigComponentName;
|
||||
extern EFI_COMPONENT_NAME2_PROTOCOL gIp4ConfigComponentName2;
|
||||
|
||||
extern IP4_CONFIG_INSTANCE *mIp4ConfigNicList[MAX_IP4_CONFIG_IN_VARIABLE];
|
||||
extern EFI_IP4_CONFIG_PROTOCOL mIp4ConfigProtocolTemplate;
|
||||
|
||||
#define IP4_PROTO_ICMP 0x01
|
||||
#define IP4_CONFIG_INSTANCE_SIGNATURE SIGNATURE_32 ('I', 'P', '4', 'C')
|
||||
|
||||
typedef enum {
|
||||
IP4_CONFIG_STATE_IDLE = 0,
|
||||
IP4_CONFIG_STATE_STARTED,
|
||||
IP4_CONFIG_STATE_CONFIGURED
|
||||
} IP4_CONFIG_STATE;
|
||||
#define IP4_CONFIG_STATE_IDLE 0
|
||||
#define IP4_CONFIG_STATE_STARTED 1
|
||||
#define IP4_CONFIG_STATE_CONFIGURED 2
|
||||
|
||||
#define DHCP_TAG_PARA_LIST 55
|
||||
#define DHCP_TAG_NETMASK 1
|
||||
#define DHCP_TAG_ROUTER 3
|
||||
|
||||
typedef enum {
|
||||
DHCP_TAG_PARA_LIST = 55,
|
||||
DHCP_TAG_NETMASK = 1,
|
||||
DHCP_TAG_ROUTER = 3
|
||||
} DHCP_TAGS;
|
||||
|
||||
//
|
||||
// Configure the DHCP to request the routers and netmask
|
||||
|
@@ -198,8 +198,8 @@ Ip4ConfigIpToStr (
|
||||
/**
|
||||
Convert the network configuration data into the IFR data.
|
||||
|
||||
@param[in] ConfigFormEntry The IP4 configuration form entry.
|
||||
@param[out] IfrNvData The IFR nv data.
|
||||
@param[in] Ip4ConfigInstance The IP4Config instance
|
||||
@param[out] IfrFormNvData The IFR nv data.
|
||||
**/
|
||||
VOID
|
||||
Ip4ConfigConvertDeviceConfigDataToIfrNvData (
|
||||
@@ -700,7 +700,7 @@ Ip4FormCallback (
|
||||
case KEY_LOCAL_IP:
|
||||
UnicodeStrToAsciiStr (IfrFormNvData->StationAddress, Ip4String);
|
||||
Status = Ip4AsciiStrToIp (Ip4String, &HostIp.v4);
|
||||
if (EFI_ERROR (Status) || !Ip4IsUnicast (NTOHL (HostIp.Addr[0]), 0)) {
|
||||
if (EFI_ERROR (Status) || !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), 0)) {
|
||||
CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);
|
||||
Status = EFI_INVALID_PARAMETER;
|
||||
} else {
|
||||
@@ -724,7 +724,7 @@ Ip4FormCallback (
|
||||
case KEY_GATE_WAY:
|
||||
UnicodeStrToAsciiStr (IfrFormNvData->GatewayAddress, Ip4String);
|
||||
Status = Ip4AsciiStrToIp (Ip4String, &Gateway.v4);
|
||||
if (EFI_ERROR (Status) || ((Gateway.Addr[0] != 0) && !Ip4IsUnicast (NTOHL (Gateway.Addr[0]), 0))) {
|
||||
if (EFI_ERROR (Status) || ((Gateway.Addr[0] != 0) && !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), 0))) {
|
||||
CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Gateway!", NULL);
|
||||
Status = EFI_INVALID_PARAMETER;
|
||||
} else {
|
||||
|
@@ -1,7 +1,7 @@
|
||||
/** @file
|
||||
Routines used to operate the Ip4 configure variable.
|
||||
|
||||
Copyright (c) 2006 - 2008, Intel Corporation.<BR>
|
||||
Copyright (c) 2006 - 2009, Intel Corporation.<BR>
|
||||
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<BR>
|
||||
@@ -45,7 +45,7 @@ Ip4ConfigIsValid (
|
||||
Netmask = EFI_NTOHL (IpConfig->SubnetMask);
|
||||
|
||||
if ((Netmask == 0) || !IP4_IS_VALID_NETMASK (Netmask) ||
|
||||
(Station == 0) || !Ip4IsUnicast (Station, Netmask)) {
|
||||
(Station == 0) || !NetIp4IsUnicast (Station, Netmask)) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@@ -57,7 +57,7 @@ Ip4ConfigIsValid (
|
||||
Gateway = EFI_NTOHL (IpConfig->RouteTable[Index].GatewayAddress);
|
||||
|
||||
if ((Gateway != 0) && (!IP4_NET_EQUAL (Station, Gateway, Netmask) ||
|
||||
!Ip4IsUnicast (Gateway, Netmask))) {
|
||||
!NetIp4IsUnicast (Gateway, Netmask))) {
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user