Merge branch 'master' into gh-pages

sipsorcery · sipsorcery · commit 09d0a09731a1 · 2024-09-30T22:05:47.000Z
diff --git a/examples/SIPExamples/GetStartedVideo/Program.cs b/examples/SIPExamples/GetStartedVideo/Program.cs
@@ -14,6 +14,7 @@
 // History:
 // 21 Feb 2020	Aaron Clauson	Created, Dublin, Ireland.
 // 02 Feb 2021  Aaron Clauson   Simplified by switching to video test pattern only.
+// 30 Sep 2024  Aaron Clauson   Can't find a SIP echo server that supports video calls :(
 //
 // License: 
 // BSD 3-Clause "New" or "Revised" License, see included LICENSE.md file.
@@ -41,7 +42,11 @@ namespace demo
     class Program
     {
         // Need to find a new echo endpoint since the sipsorcery cloud was turned off to save $$. 14 Jan 2024.
-        private static string DESTINATION = "echo@sipsorcery.cloud";
+        //private static string DESTINATION = "echo@iptel.org"; // Doesn't support video.
+        //private static string DESTINATION = "3333@sip2sip.info"; // Doesn't support video.
+        //private static string DESTINATION = "echo@linphone.org"; // Authentication required.
+        //private static string DESTINATION = "echo@onsip.com"; // Not found.
+        private static string DESTINATION = "???";
         private static int VIDEO_FRAME_WIDTH = 640;
         private static int VIDEO_FRAME_HEIGHT = 480;
 
diff --git a/examples/SIPExamples/PlaySounds/Program.cs b/examples/SIPExamples/PlaySounds/Program.cs
@@ -34,7 +34,7 @@ namespace demo
 {
     class Program
     {
-        private static string DESTINATION = "aaron@192.168.1.101";
+        private static string DESTINATION = "aaron@127.0.0.1:5080";
         private static SIPEndPoint OUTBOUND_PROXY = null;
 
         private const string WELCOME_8K = "Sounds/hellowelcome8k.raw";
diff --git a/examples/SIPExamples/SIPProxy/SIPProxy.csproj b/examples/SIPExamples/SIPProxy/SIPProxy.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>StunServerExample</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="SIPSorcery" Version="6.2.0" />
+    <PackageReference Include="SIPSorcery" Version="8.0.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
   </ItemGroup>
 
diff --git a/examples/SIPExamples/SendDtmf/Program.cs b/examples/SIPExamples/SendDtmf/Program.cs
@@ -51,7 +51,8 @@ namespace SIPSorcery
 {
     class Program
     {
-        private static readonly string DEFAULT_DESTINATION_SIP_URI = "sip:*63@192.168.0.48";   // Custom Asterisk dialplan to speak back DTMF tones.
+        //private static readonly string DEFAULT_DESTINATION_SIP_URI = "sip:*63@192.168.0.48";   // Custom Asterisk dialplan to speak back DTMF tones.
+        private static readonly string DEFAULT_DESTINATION_SIP_URI = "sip:aaron@127.0.0.1:5080";
 
         private static Microsoft.Extensions.Logging.ILogger Log = NullLogger.Instance;
 
diff --git a/examples/SIPExamples/SendDtmf/SendDtmf.csproj b/examples/SIPExamples/SendDtmf/SendDtmf.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="SIPSorcery" Version="6.2.0" />
-    <PackageReference Include="SIPSorceryMedia.Windows" Version="0.0.31-pre" />
+    <PackageReference Include="SIPSorcery" Version="8.0.0" />
+    <PackageReference Include="SIPSorceryMedia.Windows" Version="6.0.5" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/SIPExamples/UserAgentClient/Program.cs b/examples/SIPExamples/UserAgentClient/Program.cs
@@ -36,7 +36,8 @@ namespace demo
 {
     class Program
     {
-        private static readonly string DEFAULT_DESTINATION_SIP_URI = "sips:helloworld@sipsorcery.cloud";
+        //private static readonly string DEFAULT_DESTINATION_SIP_URI = "sips:helloworld@sipsorcery.cloud";
+        private static readonly string DEFAULT_DESTINATION_SIP_URI = "sip:aaron@127.0.0.1:5080";
 
         private static Microsoft.Extensions.Logging.ILogger Log = NullLogger.Instance;
 
diff --git a/examples/SIPExamples/UserAgentClient/UserAgentClient.csproj b/examples/SIPExamples/UserAgentClient/UserAgentClient.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="SIPSorcery" Version="6.2.0" />
-    <PackageReference Include="SIPSorceryMedia.Windows" Version="0.0.31-pre" />
+    <PackageReference Include="SIPSorcery" Version="8.0.0" />
+    <PackageReference Include="SIPSorceryMedia.Windows" Version="6.0.5" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/SIPExamples/UserAgentRegister/UserAgentRegister.csproj b/examples/SIPExamples/UserAgentRegister/UserAgentRegister.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="SIPSorcery" Version="6.2.0" />
+    <PackageReference Include="SIPSorcery" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/SIPExamples/UserAgentServer/Program.cs b/examples/SIPExamples/UserAgentServer/Program.cs
@@ -68,7 +68,7 @@ namespace SIPSorcery
 {
     class Program
     {
-        private static int SIP_LISTEN_PORT = 5080;
+        private static int SIP_LISTEN_PORT = 5090;
         private static int SIPS_LISTEN_PORT = 5061;
         //private static int SIP_WEBSOCKET_LISTEN_PORT = 80;
         //private static int SIP_SECURE_WEBSOCKET_LISTEN_PORT = 443;
@@ -175,7 +175,7 @@ static void Main(string[] args)
 
                                 UASInviteTransaction uasTransaction = new UASInviteTransaction(sipTransport, sipRequest, null);
                                 uas = new SIPServerUserAgent(sipTransport, null, uasTransaction, null);
-                                uas.CallCancelled += (uasAgent) =>
+                                uas.CallCancelled += (uasAgent, canelReq) =>
                                 {
                                     rtpCts?.Cancel();
                                     rtpSession.Close(null);
diff --git a/examples/SIPExamples/UserAgentServer/UserAgentServer.csproj b/examples/SIPExamples/UserAgentServer/UserAgentServer.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="SIPSorcery" Version="6.2.0" />
+    <PackageReference Include="SIPSorcery" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/examples/SIPExamples/VideoPhoneCmdLine/Program.cs b/examples/SIPExamples/VideoPhoneCmdLine/Program.cs
@@ -10,6 +10,7 @@
 //
 // History:
 // 23 Dec 2020	Aaron Clauson	Created, Dublin, Ireland.
+// 30 Sep 2024  Aaron Clauson   Broken :(. Needs investigation.
 //
 // License: 
 // BSD 3-Clause "New" or "Revised" License, see included LICENSE.md file.
diff --git a/examples/SIPExamples/VideoPhoneCmdLine/VideoPhoneCmdLine.csproj b/examples/SIPExamples/VideoPhoneCmdLine/VideoPhoneCmdLine.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -13,10 +13,10 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="SIPSorcery" Version="6.2.0" />
+    <PackageReference Include="SIPSorcery" Version="8.0.0" />
     <PackageReference Include="SIPSorceryMedia.Encoders" Version="0.0.13" />
     <PackageReference Include="SIPSorceryMedia.FFmpeg" Version="1.4.2" />
-    <PackageReference Include="SIPSorceryMedia.Windows" Version="0.0.31-pre" />
+    <PackageReference Include="SIPSorceryMedia.Windows" Version="6.0.5" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ namespace demo`
`34`	`34`	`{`
`35`	`35`	`class Program`
`36`	`36`	`{`
`37`		`- private static string DESTINATION = "aaron@192.168.1.101";`
	`37`	`+ private static string DESTINATION = "aaron@127.0.0.1:5080";`
`38`	`38`	`private static SIPEndPoint OUTBOUND_PROXY = null;`
`39`	`39`
`40`	`40`	`private const string WELCOME_8K = "Sounds/hellowelcome8k.raw";`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ namespace SIPSorcery`
`51`	`51`	`{`
`52`	`52`	`class Program`
`53`	`53`	`{`
`54`		`- private static readonly string DEFAULT_DESTINATION_SIP_URI = "sip:*[email protected]"; // Custom Asterisk dialplan to speak back DTMF tones.`
	`54`	`+ //private static readonly string DEFAULT_DESTINATION_SIP_URI = "sip:*[email protected]"; // Custom Asterisk dialplan to speak back DTMF tones.`
	`55`	`+ private static readonly string DEFAULT_DESTINATION_SIP_URI = "sip:[email protected]:5080";`
`55`	`56`
`56`	`57`	`private static Microsoft.Extensions.Logging.ILogger Log = NullLogger.Instance;`
`57`	`58`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ namespace demo`
`36`	`36`	`{`
`37`	`37`	`class Program`
`38`	`38`	`{`
`39`		`- private static readonly string DEFAULT_DESTINATION_SIP_URI = "sips:[email protected]";`
	`39`	`+ //private static readonly string DEFAULT_DESTINATION_SIP_URI = "sips:[email protected]";`
	`40`	`+ private static readonly string DEFAULT_DESTINATION_SIP_URI = "sip:[email protected]:5080";`
`40`	`41`
`41`	`42`	`private static Microsoft.Extensions.Logging.ILogger Log = NullLogger.Instance;`
`42`	`43`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ namespace SIPSorcery`
`68`	`68`	`{`
`69`	`69`	`class Program`
`70`	`70`	`{`
`71`		`- private static int SIP_LISTEN_PORT = 5080;`
	`71`	`+ private static int SIP_LISTEN_PORT = 5090;`
`72`	`72`	`private static int SIPS_LISTEN_PORT = 5061;`
`73`	`73`	`//private static int SIP_WEBSOCKET_LISTEN_PORT = 80;`
`74`	`74`	`//private static int SIP_SECURE_WEBSOCKET_LISTEN_PORT = 443;`
`@@ -175,7 +175,7 @@ static void Main(string[] args)`
`175`	`175`
`176`	`176`	`UASInviteTransaction uasTransaction = new UASInviteTransaction(sipTransport, sipRequest, null);`
`177`	`177`	`uas = new SIPServerUserAgent(sipTransport, null, uasTransaction, null);`
`178`		`- uas.CallCancelled += (uasAgent) =>`
	`178`	`+ uas.CallCancelled += (uasAgent, canelReq) =>`
`179`	`179`	`{`
`180`	`180`	`rtpCts?.Cancel();`
`181`	`181`	`rtpSession.Close(null);`