修复dockerfile

648540858

2021-11-03 8c36287f7cd073bdf2ef5fd84161622068af34b2

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

@@ -9,9 +9,11 @@


import javax.sip.*;

import javax.sip.header.CallIdHeader;

import javax.sip.header.Header;

import javax.sip.message.Response;



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

import gov.nist.javax.sip.SipProviderImpl;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

@@ -39,7 +41,7 @@
   @Autowired

   private SipSubscribe sipSubscribe;



   private SipStack sipStack;

   private SipStackImpl sipStack;



   private SipFactory sipFactory;



@@ -52,7 +54,7 @@
   private ThreadPoolExecutor initSipServer() {

      

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

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

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

      processThreadPool = new ThreadPoolExecutor(processThreadNum,processThreadNum,

            0L,TimeUnit.MILLISECONDS,processQueue,

            new ThreadPoolExecutor.CallerRunsPolicy());

@@ -88,27 +90,48 @@


   @Bean("tcpSipProvider")

   @DependsOn("sipStack")

   private SipProvider startTcpListener() {

   private SipProviderImpl startTcpListener() {

      ListeningPoint tcpListeningPoint = null;

      SipProvider tcpSipProvider  = null;

      SipProviderImpl tcpSipProvider  = null;

      try {

         tcpListeningPoint = sipStack.createListeningPoint(sipConfig.getSipIp(), sipConfig.getSipPort(), "TCP");

         tcpSipProvider = sipStack.createSipProvider(tcpListeningPoint);

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

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

         tcpSipProvider.addSipListener(this);

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

      } catch (TransportNotSupportedException | InvalidArgumentException | TooManyListenersException | ObjectInUseException e) {

         logger.error(String.format("创建SIP服务失败: %s", e.getMessage()));

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

      } catch (TransportNotSupportedException e) {

         e.printStackTrace();

      } catch (InvalidArgumentException e) {

         logger.error("无法使用 [ {}:{} ]作为SIP[ TCP ]服务，可排查: 1. sip.monitor-ip 是否为本机网卡IP; 2. sip.port 是否已被占用"

               , sipConfig.getMonitorIp(), sipConfig.getPort());

      } catch (TooManyListenersException e) {

         e.printStackTrace();

      } catch (ObjectInUseException e) {

         e.printStackTrace();

      }

      return tcpSipProvider;

   }

   

   @Bean("udpSipProvider")

   @DependsOn("sipStack")

   private SipProvider startUdpListener() throws Exception {

      ListeningPoint udpListeningPoint = sipStack.createListeningPoint(sipConfig.getSipIp(), sipConfig.getSipPort(), "UDP");

      SipProvider udpSipProvider = sipStack.createSipProvider(udpListeningPoint);

      udpSipProvider.addSipListener(this);

      logger.info("Sip Server UDP 启动成功 port {" + sipConfig.getSipPort() + "}");

   private SipProviderImpl startUdpListener() {

      ListeningPoint udpListeningPoint = null;

      SipProviderImpl udpSipProvider = null;

      try {

         udpListeningPoint = sipStack.createListeningPoint(sipConfig.getMonitorIp(), sipConfig.getPort(), "UDP");

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

         udpSipProvider.addSipListener(this);

//         udpSipProvider.setAutomaticDialogSupportEnabled(false);

      } catch (TransportNotSupportedException e) {

         e.printStackTrace();

      } catch (InvalidArgumentException e) {

         logger.error("无法使用 [ {}:{} ]作为SIP[ UDP ]服务，可排查: 1. sip.monitor-ip 是否为本机网卡IP; 2. sip.port 是否已被占用"

               , sipConfig.getMonitorIp(), sipConfig.getPort());

      } catch (TooManyListenersException e) {

         e.printStackTrace();

      } catch (ObjectInUseException e) {

         e.printStackTrace();

      }

      logger.info("Sip Server UDP 启动成功 port [" + sipConfig.getMonitorIp() + ":" + sipConfig.getPort() + "]");

      return udpSipProvider;

   }



@@ -118,7 +141,7 @@
    */

   @Override

   public void processRequest(RequestEvent evt) {

//      logger.debug(evt.getRequest().toString());

      logger.debug(evt.getRequest().toString());

      // 由于jainsip是单线程程序，为提高性能并发处理

      processThreadPool.execute(() -> {

         if (processorFactory != null) {

@@ -130,7 +153,7 @@
   @Override

   public void processResponse(ResponseEvent evt) {

      Response response = evt.getResponse();

//      logger.debug(evt.getResponse().toString());

      logger.debug(evt.getResponse().toString());

      int status = response.getStatusCode();

      if (((status >= 200) && (status < 300)) || status == 401) { // Success!

         ISIPResponseProcessor processor = processorFactory.createResponseProcessor(evt);

@@ -140,12 +163,14 @@
            // TODO Auto-generated catch block

            e.printStackTrace();

         }



         if (evt.getResponse() != null && sipSubscribe.getOkSubscribesSize() > 0 ) {

            CallIdHeader callIdHeader = (CallIdHeader)evt.getResponse().getHeader(CallIdHeader.NAME);

            if (callIdHeader != null) {

               SipSubscribe.Event subscribe = sipSubscribe.getOkSubscribe(callIdHeader.getCallId());

               if (subscribe != null) {

                  subscribe.response(evt);

                  SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(evt);

                  subscribe.response(eventResult);

               }

            }

         }

@@ -158,7 +183,8 @@
            if (callIdHeader != null) {

               SipSubscribe.Event subscribe = sipSubscribe.getErrorSubscribe(callIdHeader.getCallId());

               if (subscribe != null) {

                  subscribe.response(evt);

                  SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(evt);

                  subscribe.response(eventResult);

               }

            }

         }

@@ -181,7 +207,11 @@
   @Override

   public void processTimeout(TimeoutEvent timeoutEvent) {

      // TODO Auto-generated method stub



      CallIdHeader callIdHeader = timeoutEvent.getClientTransaction().getDialog().getCallId();

      String callId = callIdHeader.getCallId();

      SipSubscribe.Event errorSubscribe = sipSubscribe.getErrorSubscribe(callId);

      SipSubscribe.EventResult<TimeoutEvent> timeoutEventEventResult = new SipSubscribe.EventResult<>(timeoutEvent);

      errorSubscribe.response(timeoutEventEventResult);

   }



   /**

@@ -213,7 +243,11 @@
   @Override

   public void processTransactionTerminated(TransactionTerminatedEvent transactionTerminatedEvent) {

      // TODO Auto-generated method stub



//      CallIdHeader callIdHeader = transactionTerminatedEvent.getClientTransaction().getDialog().getCallId();

//      String callId = callIdHeader.getCallId();

//      SipSubscribe.Event errorSubscribe = sipSubscribe.getErrorSubscribe(callId);

//      SipSubscribe.EventResult<TransactionTerminatedEvent> eventResult = new SipSubscribe.EventResult<>(transactionTerminatedEvent);

//      errorSubscribe.response(eventResult);

   }



   /**

@@ -229,6 +263,11 @@
   @Override

   public void processDialogTerminated(DialogTerminatedEvent dialogTerminatedEvent) {

      // TODO Auto-generated method stub

//      CallIdHeader callIdHeader = dialogTerminatedEvent.getDialog().getCallId();

//      String callId = callIdHeader.getCallId();

//      SipSubscribe.Event errorSubscribe = sipSubscribe.getErrorSubscribe(callId);

//      SipSubscribe.EventResult<DialogTerminatedEvent> eventResult = new SipSubscribe.EventResult<>(dialogTerminatedEvent);

//      errorSubscribe.response(eventResult);



   }