snow/asternet
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #221 from AsterNET/NewAsteriskVersions

Browse source 
Fixes to determining Asterisk version
This commit is contained in:
Deantwo 2021-04-23 10:42:11 +02:00 committed by GitHub
parent cd3934aa53 efc6a4d025
commit aa16f17769
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 78 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Asterisk.2013/Asterisk.NET/Common.cs
View file

@ -18,7 +18,7 @@ namespace AsterNET
/// <summary>Line separator</summary> /// <summary>Line separator</summary>
public const string LINE_SEPARATOR = "\r\n"; public const string LINE_SEPARATOR = "\r\n";
public static Regex ASTERISK_VERSION = new Regex( "^Asterisk\\s+\\D*([0-9]+.[0-9]+.[0-9]+|[1-9][0-9]-r[0-9]+|[0-9]+.[0-9]+-cert[0-9]).*$", public static Regex ASTERISK_VERSION = new Regex( "^Asterisk\\s+\\D*([0-9]+\\.[0-9]+\\.[0-9]+|[1-9][0-9]-r[0-9]+|[0-9]+\\.[0-9]+-cert[0-9]).*$",
RegexOptions.Compiled | RegexOptions.IgnoreCase ); RegexOptions.Compiled | RegexOptions.IgnoreCase );
public static Regex SHOW_VERSION_FILES_PATTERN = new Regex("^([\\S]+)\\s+Revision: ([0-9\\.]+)"); public static Regex SHOW_VERSION_FILES_PATTERN = new Regex("^([\\S]+)\\s+Revision: ([0-9\\.]+)");

13
Asterisk.2013/Asterisk.NET/Manager/AsteriskVersion.cs
View file

@ -1,7 +1,11 @@
namespace AsterNET.Manager namespace AsterNET.Manager
{ {
/// <summary>
/// Asterisk Version
/// </summary>
public enum AsteriskVersion public enum AsteriskVersion
{ {
Unknown = 0,
ASTERISK_1_0 = 10, ASTERISK_1_0 = 10,
ASTERISK_1_2 = 12, ASTERISK_1_2 = 12,
ASTERISK_1_4 = 14, ASTERISK_1_4 = 14,
@ -10,6 +14,11 @@ namespace AsterNET.Manager
ASTERISK_10 = 100, ASTERISK_10 = 100,
ASTERISK_11 = 110, ASTERISK_11 = 110,
ASTERISK_12 = 120, ASTERISK_12 = 120,
ASTERISK_13 = 130 ASTERISK_13 = 130,
ASTERISK_14 = 140,
ASTERISK_15 = 150,
ASTERISK_16 = 160,
ASTERISK_17 = 170,
ASTERISK_Newer = 999
} }
} }

104
Asterisk.2013/Asterisk.NET/Manager/ManagerConnection.cs
View file

@ -167,7 +167,7 @@ namespace AsterNET.Manager
/// <summary> Default Slow Reconnect interval in milliseconds.</summary> /// <summary> Default Slow Reconnect interval in milliseconds.</summary>
private int reconnectIntervalMax = 10000; private int reconnectIntervalMax = 10000;
public char[] VAR_DELIMITER = { '|' }; public char[] VAR_DELIMITER = { '|' };
#endregion #endregion
@ -1646,43 +1646,68 @@ namespace AsterNET.Manager
if (m.Groups.Count >= 2) if (m.Groups.Count >= 2)
{ {
version = m.Groups[1].Value; version = m.Groups[1].Value;
if (version.StartsWith("1.4.")) if (version.StartsWith("1.4."))
{ {
VAR_DELIMITER = new char[] { '|' }; VAR_DELIMITER = new char[] { '|' };
return AsteriskVersion.ASTERISK_1_4; return AsteriskVersion.ASTERISK_1_4;
} }
else if (version.StartsWith("1.6.")) else if (version.StartsWith("1.6."))
{ {
VAR_DELIMITER = new char[] { '|' }; VAR_DELIMITER = new char[] { '|' };
return Manager.AsteriskVersion.ASTERISK_1_6; return Manager.AsteriskVersion.ASTERISK_1_6;
} }
else if (version.StartsWith("1.8.")) else if (version.StartsWith("1.8."))
{ {
VAR_DELIMITER = new char[] { '|' }; VAR_DELIMITER = new char[] { '|' };
return Manager.AsteriskVersion.ASTERISK_1_8; return Manager.AsteriskVersion.ASTERISK_1_8;
} }
else if (version.StartsWith("10.")) else if (version.StartsWith("10."))
{ {
VAR_DELIMITER = new char[] { '|' }; VAR_DELIMITER = new char[] { '|' };
return Manager.AsteriskVersion.ASTERISK_10; return Manager.AsteriskVersion.ASTERISK_10;
} }
else if (version.StartsWith("11.")) else if (version.StartsWith("11."))
{ {
VAR_DELIMITER = new char[] { ',' }; VAR_DELIMITER = new char[] { ',' };
return Manager.AsteriskVersion.ASTERISK_11; return Manager.AsteriskVersion.ASTERISK_11;
} }
else if (version.StartsWith("12.")) else if (version.StartsWith("12."))
{ {
VAR_DELIMITER = new char[] { ',' }; VAR_DELIMITER = new char[] { ',' };
return Manager.AsteriskVersion.ASTERISK_12; return Manager.AsteriskVersion.ASTERISK_12;
} }
else if (version.StartsWith("13.")) else if (version.StartsWith("13."))
{ {
VAR_DELIMITER = new char[] { ',' }; VAR_DELIMITER = new char[] { ',' };
return Manager.AsteriskVersion.ASTERISK_13; return Manager.AsteriskVersion.ASTERISK_13;
} }
else else if (version.StartsWith("14."))
throw new ManagerException("Unknown Asterisk version " + version); {
VAR_DELIMITER = new char[] { ',' };
return Manager.AsteriskVersion.ASTERISK_14;
}
else if (version.StartsWith("15."))
{
VAR_DELIMITER = new char[] { ',' };
return Manager.AsteriskVersion.ASTERISK_15;
}
else if (version.StartsWith("16."))
{
VAR_DELIMITER = new char[] { ',' };
return Manager.AsteriskVersion.ASTERISK_16;
}
else if (version.StartsWith("17."))
{
VAR_DELIMITER = new char[] { ',' };
return Manager.AsteriskVersion.ASTERISK_17;
}
else if (version.IndexOf('.') >= 2)
{
VAR_DELIMITER = new char[] { ',' };
return Manager.AsteriskVersion.ASTERISK_Newer;
}
else
throw new ManagerException("Unknown Asterisk version " + version);
} }
} }
} }
@ -1697,7 +1722,10 @@ namespace AsterNET.Manager
string line1; string line1;
line1 = (string)showVersionFilesResult[0]; line1 = (string)showVersionFilesResult[0];
if (line1 != null && line1.StartsWith("File")) if (line1 != null && line1.StartsWith("File"))
{
VAR_DELIMITER = new char[] { '|' };
return AsteriskVersion.ASTERISK_1_2; return AsteriskVersion.ASTERISK_1_2;
}
} }
} }
return AsteriskVersion.ASTERISK_1_0; return AsteriskVersion.ASTERISK_1_0;