sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NetworkPkg: Add dns support for target URL configuration in ISCSI.

Browse Source 
v2:
*1. Add IScsiDnsIsConfigured function in IScsiSupported to check
attempt using DNS protocol or not.2. Fix wrongs typos in IScsiDns.c
and .uni file.3. define a macro for the length of target URL.4.
update the Copyright to 2017.

Add DNS support for target URL directly configuration in UI.

Besides, When we enable the option (Get target info via DHCP) ,
the dhcp server will return target info include the  rootpath,
like the format
"iscsi:"<servername>":"<protocol>":"<port>":"<LUN>":"<targetname>
According to the RFC 4173,the server name region is expressed as
IPv4(192.168.10.20 )or IPv6 ([2000:bbbb::3]) or domain name,
but currently we only support the IP address format.
To enable this feature, we can support both.

Another enhancement is that we can deal with the data received from
the iSCSI login response with an target redirection status,
in which contains the Target Address in the format
domainname[:port][,portal-group-tag] required by RFC 3720.

Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Wu Jiaxin <jiaxin.wu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo <lubo.zhang@intel.com>
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
This commit is contained in:
Zhang Lubo
2016-12-08 19:26:24 +08:00
committed by Jiaxin Wu
parent a409875592
commit eabc6e59b9
14 changed files with 794 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
NetworkPkg/IScsiDxe/IScsiProto.c
View File

@@ -1,7 +1,7 @@
/** @file
The implementation of iSCSI protocol based on RFC3720.
Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
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
@@ -255,6 +255,23 @@ IScsiCreateConnection (
Conn->HeaderDigest = IScsiDigestNone;
Conn->DataDigest = IScsiDigestNone;
if (NvData->DnsMode) {
//
// perform dns process if target address expressed by domain name.
//
if (!Conn->Ipv6Flag) {
Status = IScsiDns4 (Private->Image, Private->Controller, NvData);
} else {
Status = IScsiDns6 (Private->Image, Private->Controller, NvData);
}
if (EFI_ERROR(Status)) {
DEBUG ((EFI_D_ERROR, "The configuration of Target address or DNS server address is invalid!\n"));
FreePool (Conn);
return NULL;
}
}
if (!Conn->Ipv6Flag) {
Tcp4IoConfig = &TcpIoConfig.Tcp4IoConfigData;
@@ -1131,8 +1148,13 @@ IScsiUpdateTargetAddress (
} else {
//
// The domainname of the target is presented in the format of a DNS host name.
// Temporary not supported.
continue;
//
IpStr = TargetAddress;
while ((*TargetAddress != '\0') && (*TargetAddress != ':') && (*TargetAddress != ',')) {
TargetAddress++;
}
NvData->DnsMode = TRUE;
}
//
@@ -1178,17 +1200,28 @@ IScsiUpdateTargetAddress (
IpMode = Session->ConfigData->AutoConfigureMode;
}
Status = IScsiAsciiStrToIp (
IpStr,
IpMode,
&Session->ConfigData->SessionConfigData.TargetIp
);
if (EFI_ERROR (Status)) {
continue;
if (NvData->DnsMode) {
//
// Target address is expressed as URL format, just save it and
// do DNS resolution when creating a TCP connection.
//
if (AsciiStrSize (IpStr) > sizeof (Session->ConfigData->SessionConfigData.TargetUrl)){
return EFI_INVALID_PARAMETER;
}
CopyMem (&Session->ConfigData->SessionConfigData.TargetUrl, IpStr, AsciiStrSize (IpStr));
} else {
NvData->RedirectFlag = TRUE;
break;
Status = IScsiAsciiStrToIp (
IpStr,
IpMode,
&Session->ConfigData->SessionConfigData.TargetIp
);
if (EFI_ERROR (Status)) {
continue;
} else {
NvData->RedirectFlag = TRUE;
break;
}
}
}