Pre Merge pull request !42 from 樊冲/fix-bug-fanchong

优化callID生成策略
fix: 当wvp作为下级平台时，上级以tcp-主动模式发起点播请求，这个5ms时间太短，下级的zlm刚准备好端口，上级还没来得及连接，zlm就超时端口关闭，导致上级一直报拒绝连接
2026-05-26 15:07:49 +08:00 · 2026-03-18 07:26:20 +00:00 · 2026-03-18 15:26:01 +08:00 · 2025-09-18 17:37:57 +08:00
2 changed files with 4 additions and 3 deletions
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPSender.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPSender.java
@ -143,7 +143,7 @@ public class SIPSender {

    public CallIdHeader getNewCallIdHeader(String ip, String transport) {
        if (ObjectUtils.isEmpty(transport)) {
-            return sipLayer.getUdpSipProvider().getNewCallId();
+            return sipLayer.getUdpSipProvider() != null ? sipLayer.getUdpSipProvider().getNewCallId() : sipLayer.getTcpSipProvider().getNewCallId();
        }
        SipProviderImpl sipProvider;
        if (ObjectUtils.isEmpty(ip)) {
@ -155,7 +155,8 @@ public class SIPSender {
        }

        if (sipProvider == null) {
-            sipProvider = sipLayer.getUdpSipProvider();
+            sipProvider = transport.equalsIgnoreCase("TCP") ? sipLayer.getTcpSipProvider()
+                    : sipLayer.getUdpSipProvider();
        }

        if (sipProvider != null) {
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
@ -217,7 +217,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
                        if (sendRtpItem.isTcpActive()) {
                            MediaServer mediaServer = mediaServerService.getOne(sendRtpItem.getMediaServerId());
                            try {
-                                mediaServerService.startSendRtpPassive(mediaServer, sendRtpItem, 5);
+                                mediaServerService.startSendRtpPassive(mediaServer, sendRtpItem, 5*1000);
                                DeviceChannel deviceChannel = deviceChannelService.getOneForSourceById(sendRtpItem.getChannelId());
                                if (deviceChannel != null) {
                                    redisCatchStorage.sendPlatformStartPlayMsg(sendRtpItem, deviceChannel, platform);
Author	SHA1	Message	Date
樊冲	5bc88cf842	Pre Merge pull request !42 from 樊冲/fix-bug-fanchong	2026-03-18 07:26:20 +00:00
lin	201cec7651	优化callID生成策略	2026-03-18 15:26:01 +08:00
樊冲	c543840830	fix: 当wvp作为下级平台时，上级以tcp-主动模式发起点播请求，这个5ms时间太短，下级的zlm刚准备好端口，上级还没来得及连接，zlm就超时端口关闭，导致上级一直报拒绝连接	2025-09-18 17:37:57 +08:00