merge

LICENSE.md

@@ -2,30 +2,30 @@
 
 ## 1. BSD 3-Clause "New" or "Revised" License
 
-Copyright (c) 2006–2025 Aaron Clauson
+Copyright (c) 2006–2025 Aaron Clauson
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-3. Neither the name “SIP Sorcery,” nor “Aaron Clauson,” nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+3. Neither the name “SIP Sorcery,” nor “Aaron Clauson,” nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ---
 
-## 2. Additional Restriction: Boycott, Divestment, Sanctions (BDS) – Attribution-NonCommercial-ShareAlike
+## 2. Additional Restriction: Boycott, Divestment, Sanctions (BDS) – Attribution-NonCommercial-ShareAlike
 
-**Boycott Divestment Sanctions – Attribution-NonCommercial-ShareAlike (BDS BY-NC-SA)**
+**Boycott Divestment Sanctions – Attribution-NonCommercial-ShareAlike (BDS BY-NC-SA)**
 
 This software **must not be used** to further the Apartheid policies of Israel. Use, modification, or distribution **inside** Israel and the Occupied Territories is strictly forbidden until the demands of the Boycott, Divestment and Sanctions movement have been met:
 
 * Israel has ended the occupation and colonization of all Arab lands occupied in 1967 and dismantled the Wall;
 * Arab-Palestinian citizens of Israel have been granted full equality; and
 * Palestinian refugees have obtained the right to return to their homes and properties as stipulated in UN Resolution 194.
 
-For all other geographic regions **outside** of Israel and the Occupied Territories, use, modification, and distribution are permitted under the terms of the **BSD 3-Clause "New" or "Revised" License** above (Section 1), provided that any future use, modification, or distribution carries the above BDS restriction and abides by the ShareAlike and NonCommercial principles.
+For all other geographic regions **outside** of Israel and the Occupied Territories, use, modification, and distribution are permitted under the terms of the **BSD 3-Clause "New" or "Revised" License** above (Section 1), provided that any future use, modification, or distribution carries the above BDS restriction.
 
 This restriction is **not** intended to limit the rights of Israelis or any other people residing outside of Israel and the Occupied Territories.
 
@@ -45,9 +45,10 @@ Portions of the DTLS/SRTP implementation are derived from:
 
 Because of these dependencies, users should assume GPL-style obligations apply (e.g. making source code available on request).  
 
-If you wish to avoid GPL obligations, you may remove the `src/net/DtlsSrtp` directory. This will disable WebRTC’s DTLS/SRTP support (but leave core SIP functionality intact unless SRTP is explicitly required).
+If you wish to avoid GPL obligations, you may remove the `src/net/DtlsSrtp` directory. This will disable WebRTC’s DTLS/SRTP support (but leave core SIP functionality intact unless SRTP is explicitly required).
 
-As an alternative, you could integrate Cisco’s non-GPL [libsrtp](https://github.com/cisco/libsrtp), which many upstream projects originally forked from.
+As an alternative, you could integrate Cisco’s non-GPL [libsrtp](https://github.com/cisco/libsrtp), which many upstream projects originally forked from.
 
 *Caveat: This notice is provided for informational purposes only and does not constitute legal advice.*
-
+
+

README.md

@@ -10,7 +10,7 @@
 >
 > **Key points of the BDS restriction:**  
 > - **No use inside Israel or the Occupied Territories** until the 1967 occupation ends, equality for Arab-Palestinians is enshrined, and the right of return for Palestinian refugees is honored.  
-> - **Everywhere else**, the BSD 3-Clause terms apply, provided that any redistribution retains this BDS restriction and complies with Attribution-NonCommercial-ShareAlike.  
+> - **Everywhere else**, the BSD 3-Clause terms apply, provided that any redistribution retains this BDS restriction.  
 > - In case of conflict, the BDS terms in Section 2 take precedence over Section 1.  
 >
 > Read the full text in [LICENSE](https://github.com/sipsorcery-org/sipsorcery?tab=License-1-ov-file#section-2).
@@ -258,3 +258,4 @@ Create an HTML file, paste the contents below into it, open it in a browser that
 If successful the browser should display a test pattern image.
 
 The [examples folder](https://github.com/sipsorcery-org/sipsorcery/tree/master/examples/WebRTCExamples) contains sample code to demonstrate other common WebRTC cases.
+

examples/SIPExamples/SIPExamples.sln

@@ -47,8 +47,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SIPCallServer", "SIPCallSer
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SIPCloudCallServer", "SIPCloudCallServer\SIPCloudCallServer.csproj", "{AC215797-8B94-2D46-A603-D4EAC8C8604A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UserAgentCloudClient", "UserAgentCloudClient\UserAgentCloudClient.csproj", "{BE8055DA-94F4-CA3C-B250-A0DB7BC1B686}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -323,18 +321,6 @@ Global
 		{AC215797-8B94-2D46-A603-D4EAC8C8604A}.Release|x64.Build.0 = Release|Any CPU
 		{AC215797-8B94-2D46-A603-D4EAC8C8604A}.Release|x86.ActiveCfg = Release|Any CPU
 		{AC215797-8B94-2D46-A603-D4EAC8C8604A}.Release|x86.Build.0 = Release|Any CPU
-		{BE8055DA-94F4-CA3C-B250-A0DB7BC1B686}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE8055DA-94F4-CA3C-B250-A0DB7BC1B686}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BE8055DA-94F4-CA3C-B250-A0DB7BC1B686}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BE8055DA-94F4-CA3C-B250-A0DB7BC1B686}.Debug|x64.Build.0 = Debug|Any CPU
-		{BE8055DA-94F4-CA3C-B250-A0DB7BC1B686}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BE8055DA-94F4-CA3C-B250-A0DB7BC1B686}.Debug|x86.Build.0 = Debug|Any CPU
-		{BE8055DA-94F4-CA3C-B250-A0DB7BC1B686}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BE8055DA-94F4-CA3C-B250-A0DB7BC1B686}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BE8055DA-94F4-CA3C-B250-A0DB7BC1B686}.Release|x64.ActiveCfg = Release|Any CPU
-		{BE8055DA-94F4-CA3C-B250-A0DB7BC1B686}.Release|x64.Build.0 = Release|Any CPU
-		{BE8055DA-94F4-CA3C-B250-A0DB7BC1B686}.Release|x86.ActiveCfg = Release|Any CPU
-		{BE8055DA-94F4-CA3C-B250-A0DB7BC1B686}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE