多级虚拟组织处理修复

648540858

2022-04-25 a012007f36ba1ce44e9c932ea33120949835dfb7

 src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java

@@ -1,8 +1,7 @@
package com.genersoft.iot.vmp.gb28181;



import com.genersoft.iot.vmp.conf.SipConfig;

import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;

import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;

import com.genersoft.iot.vmp.gb28181.transmit.ISIPProcessorObserver;

import gov.nist.javax.sip.SipProviderImpl;

import gov.nist.javax.sip.SipStackImpl;

import org.slf4j.Logger;

@@ -28,27 +27,11 @@
   private SipConfig sipConfig;



   @Autowired

   private SIPProcessorObserver sipProcessorObserver;



   @Autowired

   private SipSubscribe sipSubscribe;

   private ISIPProcessorObserver sipProcessorObserver;



   private SipStackImpl sipStack;



   private SipFactory sipFactory;



   /**   
    * 消息处理器线程池

    */

   private ThreadPoolExecutor processThreadPool;



   public SipLayer() {

      int processThreadNum = Runtime.getRuntime().availableProcessors() * 10;

      LinkedBlockingQueue<Runnable> processQueue = new LinkedBlockingQueue<>(10000);

      processThreadPool = new ThreadPoolExecutor(processThreadNum,processThreadNum,

            0L,TimeUnit.MILLISECONDS,processQueue,

            new ThreadPoolExecutor.CallerRunsPolicy());

   }





   @Bean("sipFactory")

@@ -64,7 +47,8 @@
      Properties properties = new Properties();

      properties.setProperty("javax.sip.STACK_NAME", "GB28181_SIP");

      properties.setProperty("javax.sip.IP_ADDRESS", sipConfig.getMonitorIp());

      properties.setProperty("gov.nist.javax.sip.LOG_MESSAGE_CONTENT", "false");

      properties.setProperty("gov.nist.javax.sip.LOG_MESSAGE_CONTENT", "true");

      properties.setProperty("gov.nist.javax.sip.DELIVER_UNSOLICITED_NOTIFY", "true"); // 接收所有notify请求，即使没有订阅

      /**

       * sip_server_log.log 和 sip_debug_log.log public static final int TRACE_NONE =

       * 0; public static final int TRACE_MESSAGES = 16; public static final int

@@ -74,10 +58,11 @@
      properties.setProperty("gov.nist.javax.sip.SERVER_LOG", "sip_server_log");

      properties.setProperty("gov.nist.javax.sip.DEBUG_LOG", "sip_debug_log");

      sipStack = (SipStackImpl) sipFactory.createSipStack(properties);



      return sipStack;

   }



   @Bean("tcpSipProvider")

   @Bean(name = "tcpSipProvider")

   @DependsOn("sipStack")

   private SipProviderImpl startTcpListener() {

      ListeningPoint tcpListeningPoint = null;

@@ -85,7 +70,9 @@
      try {

         tcpListeningPoint = sipStack.createListeningPoint(sipConfig.getMonitorIp(), sipConfig.getPort(), "TCP");

         tcpSipProvider = (SipProviderImpl)sipStack.createSipProvider(tcpListeningPoint);

         tcpSipProvider.setDialogErrorsAutomaticallyHandled();

         tcpSipProvider.addSipListener(sipProcessorObserver);

//         tcpSipProvider.setAutomaticDialogSupportEnabled(false);

         logger.info("Sip Server TCP 启动成功 port {" + sipConfig.getMonitorIp() + ":" + sipConfig.getPort() + "}");

      } catch (TransportNotSupportedException e) {

         e.printStackTrace();

@@ -100,7 +87,7 @@
      return tcpSipProvider;

   }

   

   @Bean("udpSipProvider")

   @Bean(name = "udpSipProvider")

   @DependsOn("sipStack")

   private SipProviderImpl startUdpListener() {

      ListeningPoint udpListeningPoint = null;

@@ -109,6 +96,7 @@
         udpListeningPoint = sipStack.createListeningPoint(sipConfig.getMonitorIp(), sipConfig.getPort(), "UDP");

         udpSipProvider = (SipProviderImpl)sipStack.createSipProvider(udpListeningPoint);

         udpSipProvider.addSipListener(sipProcessorObserver);

//         udpSipProvider.setAutomaticDialogSupportEnabled(false);

      } catch (TransportNotSupportedException e) {

         e.printStackTrace();

      } catch (InvalidArgumentException e) {