fix bug with H.245 address when using ExternalIP= switch without H.46…

…0.18/.19
willamowius · Jan 17, 2024 · a31e95e · a31e95e
1 parent d74e6bc
commit a31e95e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/ProxyChannel.cxx b/ProxyChannel.cxx
@@ -5606,8 +5606,17 @@ void CallSignalSocket::OnSetup(SignalingMsg * msg)
 		CallTable::Instance()->Insert(call);
 
 		if (!rejectCall) {
-            PTRACE(7, "JW RTP SetEndpointIPMapping " << _peerAddr << " <=> " << _localAddr);
-		    m_call->SetEndpointIPMapping(_peerAddr, _localAddr);
+			PString extip = Toolkit::Instance()->GetExternalIP();
+			if (extip.IsEmpty()) {
+				PTRACE(7, "JW RTP SetEndpointIPMapping " << _peerAddr << " <=> " << _localAddr);
+				m_call->SetEndpointIPMapping(_peerAddr, _localAddr);
+			} else {
+				PIPSocket::Address ext((DWORD)0);
+				H323TransportAddress ex = H323TransportAddress(extip);
+				ex.GetIpAddress(ext);
+				PTRACE(7, "JW RTP SetEndpointIPMapping to ExternalIP " << _peerAddr << " <=> " << ext);
+				m_call->SetEndpointIPMapping(_peerAddr, ext);
+			}
 		}
 		if (!rejectCall && authData.m_callDurationLimit > 0)
 			m_call->SetDurationLimit(authData.m_callDurationLimit);

diff --git a/changes.txt b/changes.txt
@@ -1,5 +1,6 @@
 Changes from 5.11 to 5.12
 =========================
+- fix bug with H.245 address when using ExternalIP= switch without H.460.18/.19
 - auto-detect public IP with ExternalIP=STUN and STUNServer=stun.example.com
 - compiler support for VS2022
 - new database driver for Oracle and new timestamp format 'Oracle'