Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

sc.dm

2022-03-10 4abbf4df07f02c0c94baa2787fdcf4a14dcb3463

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

@@ -85,6 +68,7 @@
      try {

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

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

         tcpSipProvider.setDialogErrorsAutomaticallyHandled();

         tcpSipProvider.addSipListener(sipProcessorObserver);

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

      } catch (TransportNotSupportedException e) {