From 2d492c5b6b33554d9512753e92dd1d89a489e3f2 Mon Sep 17 00:00:00 2001
From: lin <lin@pop-os.localdomain>
Date: 星期三, 01 二月 2023 10:09:01 +0800
Subject: [PATCH] 国标回放超时时间使用点播超时一样的字段
---
src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
index 5c31f90..f3fbbb4 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
@@ -121,6 +121,12 @@
return builder.toString();
}
+ /**
+ * 浠庤姹備腑鑾峰彇璁惧ip鍦板潃鍜岀鍙ｅ彿
+ * @param request 璇锋眰
+ * @param sipUseSourceIpAsRemoteAddress false 浠巚ia涓幏鍙栧湴鍧�锛� true 鐩存帴鑾峰彇杩滅▼鍦板潃
+ * @return 鍦板潃淇℃伅
+ */
public static RemoteAddressInfo getRemoteAddressFromRequest(SIPRequest request, boolean sipUseSourceIpAsRemoteAddress) {
String remoteAddress;
@@ -132,11 +138,11 @@
// 鍒ゆ柇RPort鏄惁鏀瑰彉锛屾敼鍙樺垯璇存槑璺敱nat淇℃伅鍙樺寲锛屼慨鏀硅澶囦俊鎭�
// 鑾峰彇鍒伴�氫俊鍦板潃绛変俊鎭�
remoteAddress = request.getTopmostViaHeader().getReceived();
- remotePort = request.getTopmostViaHeader().getPort();
+ remotePort = request.getTopmostViaHeader().getRPort();
// 瑙ｆ瀽鏈湴鍦板潃鏇夸唬
if (ObjectUtils.isEmpty(remoteAddress) || remotePort == -1) {
- remoteAddress = request.getViaHost();
- remotePort = request.getViaPort();
+ remoteAddress = request.getTopmostViaHeader().getHost();
+ remotePort = request.getTopmostViaHeader().getPort();
}
}
--
Gitblit v1.8.0