Pre Merge pull request !45 from 山海守门人/dev260107_2

docker/docker-compose.yml

@@ -59,7 +59,7 @@ services:
     networks:
       - media-net
     ports:
-     #- "6080:80/tcp"     # [播流]HTTP  安全考虑-非测试阶段需要注释掉，改为由nginx代理播流地址
+     - "80:80/tcp"     # [播流]HTTP  安全考虑-非测试阶段需要注释掉，改为由nginx代理播流地址
      #- "4443:443/tcp"     # [播流]HTTPS 安全考虑-非测试阶段需要注释掉，改为由nginx代理播流地址
       - "${MediaRtmp:-10935}:${MediaRtmp:-10935}/tcp"   # [收流]RTMP  
       - "${MediaRtmp:-10935}:${MediaRtmp:-10935}/udp"   # [收流]RTMP  

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) {