icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-02-16 13:15:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fixing argument exceptions when looking up LAN2 properties on a system without multiple network adapters

Browse Source
This commit is contained in:
Chris Cameron
2019-03-28 10:36:04 -04:00
parent ef19e20d67
commit c054a9d752
1 changed files with 87 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
ICD.Common.Utils/IcdEnvironment.SimplSharp.cs
View File

@@ -30,16 +30,33 @@ namespace ICD.Common.Utils
{ {
const CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET param = const CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET param =
CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS; CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS;
const EthernetAdapterType type = EthernetAdapterType.EthernetLANAdapter; const EthernetAdapterType primaryType = EthernetAdapterType.EthernetLANAdapter;
short id = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(type); const EthernetAdapterType secondaryType = EthernetAdapterType.EthernetLAN2Adapter;
var address1 = CrestronEthernetHelper.GetEthernetParameter(param, id);
string address1 = null;
try
{
short id = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(primaryType);
address1 = CrestronEthernetHelper.GetEthernetParameter(param, id);
}
catch (ArgumentException)
{
}
if (!string.IsNullOrEmpty(address1)) if (!string.IsNullOrEmpty(address1))
yield return address1; yield return address1;
const EthernetAdapterType secondaryType = EthernetAdapterType.EthernetLAN2Adapter; string address2 = null;
short adapter2Type = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(secondaryType);
var address2 = CrestronEthernetHelper.GetEthernetParameter(param, adapter2Type); try
{
short adapter2Type = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(secondaryType);
address2 = CrestronEthernetHelper.GetEthernetParameter(param, adapter2Type);
}
catch (ArgumentException)
{
}
if (!string.IsNullOrEmpty(address2)) if (!string.IsNullOrEmpty(address2))
yield return address2; yield return address2;
@@ -56,9 +73,36 @@ namespace ICD.Common.Utils
{ {
const CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET param = const CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET param =
CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_MAC_ADDRESS; CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_MAC_ADDRESS;
const EthernetAdapterType type = EthernetAdapterType.EthernetLANAdapter; const EthernetAdapterType primaryType = EthernetAdapterType.EthernetLANAdapter;
short id = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(type); const EthernetAdapterType secondaryType = EthernetAdapterType.EthernetLAN2Adapter;
yield return CrestronEthernetHelper.GetEthernetParameter(param, id);
string macAddress1 = null;
try
{
short id = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(primaryType);
macAddress1 = CrestronEthernetHelper.GetEthernetParameter(param, id);
}
catch (ArgumentException)
{
}
if (!string.IsNullOrEmpty(macAddress1))
yield return macAddress1;
string macAddress2 = null;
try
{
short id = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(secondaryType);
macAddress2 = CrestronEthernetHelper.GetEthernetParameter(param, id);
}
catch (ArgumentException)
{
}
if (!string.IsNullOrEmpty(macAddress2))
yield return macAddress2;
} }
} }
@@ -73,8 +117,16 @@ namespace ICD.Common.Utils
const CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET param = const CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET param =
CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_DHCP_STATE; CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_DHCP_STATE;
const EthernetAdapterType type = EthernetAdapterType.EthernetLANAdapter; const EthernetAdapterType type = EthernetAdapterType.EthernetLANAdapter;
short id = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(type);
return CrestronEthernetHelper.GetEthernetParameter(param, id); try
{
short id = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(type);
return CrestronEthernetHelper.GetEthernetParameter(param, id);
}
catch (ArgumentException)
{
return null;
}
} }
} }
@@ -88,16 +140,34 @@ namespace ICD.Common.Utils
{ {
const CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET param = const CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET param =
CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_HOSTNAME; CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_HOSTNAME;
const EthernetAdapterType type = EthernetAdapterType.EthernetLANAdapter; const EthernetAdapterType primaryType = EthernetAdapterType.EthernetLANAdapter;
short id = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(type); const EthernetAdapterType secondaryType = EthernetAdapterType.EthernetLAN2Adapter;
var address1 = CrestronEthernetHelper.GetEthernetParameter(param, id);
string address1 = null;
try
{
short id = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(primaryType);
address1 = CrestronEthernetHelper.GetEthernetParameter(param, id);
}
catch (ArgumentException)
{
}
if (!string.IsNullOrEmpty(address1)) if (!string.IsNullOrEmpty(address1))
yield return address1; yield return address1;
const EthernetAdapterType secondaryType = EthernetAdapterType.EthernetLAN2Adapter; string address2 = null;
short adapter2Type = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(secondaryType);
var address2 = CrestronEthernetHelper.GetEthernetParameter(param, adapter2Type); try
{
short adapter2Type = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(secondaryType);
address2 = CrestronEthernetHelper.GetEthernetParameter(param, adapter2Type);
}
catch (ArgumentException)
{
}
if (!string.IsNullOrEmpty(address2)) if (!string.IsNullOrEmpty(address2))
yield return address2; yield return address2;