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

fix: Skip over invalid adapter ids when getting network information

Browse source
This commit is contained in:
Chris Cameron 2020-01-17 11:06:02 -05:00
parent 89f0214cce
commit 201639b30b
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Changed ### Changed
- Network/MAC/DNS address utils are now enumerating all adapter types - Network/MAC/DNS address utils are now enumerating all adapter types
- Ignoring Crestron ethernet parameters that say "Invalid Value" - Ignoring Crestron ethernet parameters that say "Invalid Value"
- Skipping network interfaces with an invalid adapter id
## [10.2.0] - 2019-12-04 ## [10.2.0] - 2019-12-04
### Added ### Added

12
ICD.Common.Utils/IcdEnvironment.SimplSharp.cs
View file

@ -46,6 +46,9 @@ namespace ICD.Common.Utils
try try
{ {
short id = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(type); short id = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(type);
if (id >= InitialParametersClass.NumberOfEthernetInterfaces)
continue;
address = CrestronEthernetHelper.GetEthernetParameter(param, id); address = CrestronEthernetHelper.GetEthernetParameter(param, id);
} }
catch (ArgumentException) catch (ArgumentException)
@ -77,6 +80,9 @@ namespace ICD.Common.Utils
try try
{ {
short id = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(type); short id = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(type);
if (id >= InitialParametersClass.NumberOfEthernetInterfaces)
continue;
macAddress = CrestronEthernetHelper.GetEthernetParameter(param, id); macAddress = CrestronEthernetHelper.GetEthernetParameter(param, id);
} }
catch (ArgumentException) catch (ArgumentException)
@ -105,6 +111,9 @@ namespace ICD.Common.Utils
try try
{ {
short id = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(type); short id = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(type);
if (id >= InitialParametersClass.NumberOfEthernetInterfaces)
return null;
string status = CrestronEthernetHelper.GetEthernetParameter(param, id); string status = CrestronEthernetHelper.GetEthernetParameter(param, id);
if (!string.IsNullOrEmpty(status) && !status.Equals(INVALID_VALUE)) if (!string.IsNullOrEmpty(status) && !status.Equals(INVALID_VALUE))
@ -137,6 +146,9 @@ namespace ICD.Common.Utils
try try
{ {
short id = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(type); short id = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(type);
if (id >= InitialParametersClass.NumberOfEthernetInterfaces)
continue;
hostname = CrestronEthernetHelper.GetEthernetParameter(param, id); hostname = CrestronEthernetHelper.GetEthernetParameter(param, id);
} }
catch (ArgumentException) catch (ArgumentException)