Skip to content

Commit ace3ecd

Browse files
lostmsulostmsu
committed
merge upstream/master
2 parents 9b9b887 + cf3c1d1 commit ace3ecd

104 files changed

Lines changed: 2022 additions & 812 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ deploy:
5555
- provider: NuGet
5656
server: # If empty pushes to NuGet.org
5757
api_key:
58-
secure: i/5CxYEh5rTFRMfNJXfuz4LHYL5shrABI2DOvAnwmarFuhVPBKDZv464v5ZCWpK8
58+
secure: 4uoZLi6jO2/43iTwmLPFkSohcQSAYz+EAqwvu7A9HwBsOFYdwfbK8jLnGiqs5j3b
5959
skip_symbols: false
6060
symbol_server: # If empty pushes symbols to SymbolSource.org
6161
artifact: /.*\.nupkg/

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
2-
<PropertyGroup Condition=" '$(Framework)' != 'NET461'">
3-
<LangVersion>8.0</LangVersion>
2+
<PropertyGroup>
3+
<LangVersion>12.0</LangVersion>
44
</PropertyGroup>
55
</Project>

‎examples/SIPExamples/AsteriskIce/AsteriskIce.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
1111
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
1212
<PackageReference Include="SIPSorcery" Version="6.2.0" />
13-
<PackageReference Include="SIPSorceryMedia.Encoders" Version="0.0.12-pre" />
13+
<PackageReference Include="SIPSorceryMedia.Encoders" Version="0.0.13" />
1414
<PackageReference Include="SIPSorceryMedia.Windows" Version="0.0.31-pre" />
1515
</ItemGroup>
1616

‎examples/SIPExamples/GetStarted/GetStarted.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
1111
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
1212
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
13-
<PackageReference Include="SIPSorcery" Version="6.2.0" />
13+
<PackageReference Include="SIPSorcery" Version="8.0.0" />
1414
<PackageReference Include="SIPSorceryMedia.Windows" Version="6.0.5" />
1515
</ItemGroup>
1616

‎examples/SIPExamples/GetStartedVideo/GetStartedVideo.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
1313
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
1414
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
15-
<PackageReference Include="SIPSorcery" Version="6.2.0" />
16-
<PackageReference Include="SIPSorceryMedia.Encoders" Version="0.0.12-pre" />
15+
<PackageReference Include="SIPSorcery" Version="8.0.0" />
16+
<PackageReference Include="SIPSorceryMedia.Encoders" Version="0.0.13" />
1717
</ItemGroup>
1818

1919
</Project>

‎examples/SIPExamples/GetStartedVideo/Program.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
// History:
1515
// 21 Feb 2020 Aaron Clauson Created, Dublin, Ireland.
1616
// 02 Feb 2021 Aaron Clauson Simplified by switching to video test pattern only.
17+
// 30 Sep 2024 Aaron Clauson Can't find a SIP echo server that supports video calls :(
1718
//
1819
// License:
1920
// BSD 3-Clause "New" or "Revised" License, see included LICENSE.md file.
@@ -41,7 +42,11 @@ namespace demo
4142
class Program
4243
{
4344
// Need to find a new echo endpoint since the sipsorcery cloud was turned off to save $$. 14 Jan 2024.
44-
private static string DESTINATION = "echo@sipsorcery.cloud";
45+
//private static string DESTINATION = "echo@iptel.org"; // Doesn't support video.
46+
//private static string DESTINATION = "3333@sip2sip.info"; // Doesn't support video.
47+
//private static string DESTINATION = "echo@linphone.org"; // Authentication required.
48+
//private static string DESTINATION = "echo@onsip.com"; // Not found.
49+
private static string DESTINATION = "???";
4550
private static int VIDEO_FRAME_WIDTH = 640;
4651
private static int VIDEO_FRAME_HEIGHT = 480;
4752

‎examples/SIPExamples/PlaySounds/PlaySounds.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
1010
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
1111
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
12-
<PackageReference Include="SIPSorcery" Version="6.2.0" />
13-
<PackageReference Include="SIPSorceryMedia.Windows" Version="6.0.4" />
12+
<PackageReference Include="SIPSorcery" Version="8.0.0" />
13+
<PackageReference Include="SIPSorceryMedia.Windows" Version="6.0.5" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎examples/SIPExamples/PlaySounds/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace demo
3434
{
3535
class Program
3636
{
37-
private static string DESTINATION = "aaron@192.168.1.101";
37+
private static string DESTINATION = "aaron@127.0.0.1:5080";
3838
private static SIPEndPoint OUTBOUND_PROXY = null;
3939

4040
private const string WELCOME_8K = "Sounds/hellowelcome8k.raw";

‎examples/SIPExamples/SIPCallServer/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ private static async Task OnRequest(SIPEndPoint localSIPEndPoint, SIPEndPoint re
376376

377377
SIPUserAgent ua = new SIPUserAgent(_sipTransport, null);
378378
ua.OnCallHungup += OnHangup;
379-
ua.ServerCallCancelled += (uas) => Log.LogDebug("Incoming call cancelled by remote party.");
379+
ua.ServerCallCancelled += (uas, cancelReq) => Log.LogDebug("Incoming call cancelled by remote party.");
380380
ua.OnDtmfTone += (key, duration) => OnDtmfTone(ua, key, duration);
381381
ua.OnRtpEvent += (evt, hdr) => Log.LogDebug($"rtp event {evt.EventID}, duration {evt.Duration}, end of event {evt.EndOfEvent}, timestamp {hdr.Timestamp}, marker {hdr.MarkerBit}.");
382382
//ua.OnTransactionTraceMessage += (tx, msg) => Log.LogDebug($"uas tx {tx.TransactionId}: {msg}");
@@ -483,4 +483,4 @@ private static Microsoft.Extensions.Logging.ILogger AddConsoleLogger()
483483
return factory.CreateLogger<Program>();
484484
}
485485
}
486-
}
486+
}

‎examples/SIPExamples/SIPCallServer/SIPCallServer.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
99
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
1010
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
1111
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
12-
<PackageReference Include="SIPSorcery" Version="6.2.0" />
12+
<PackageReference Include="SIPSorcery" Version="8.0.0" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

0 commit comments

Comments
 (0)