修正设备注册认证时验证Response计算的错误

lawrencehj

2021-08-26 45969a00b74b5a240c0dc6e2c37f5381cd0cb65f

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

@@ -12,6 +12,7 @@
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 +40,7 @@
   @Autowired

   private SipSubscribe sipSubscribe;



   private SipStack sipStack;

   private SipStackImpl sipStack;



   private SipFactory sipFactory;



@@ -52,7 +53,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());

@@ -72,7 +73,7 @@
   private SipStack createSipStack() throws PeerUnavailableException {

      Properties properties = new Properties();

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

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

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

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

      /**

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

@@ -88,27 +89,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;

   }



@@ -140,6 +162,7 @@
            // 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) {

@@ -197,7 +220,6 @@
   @Override

   public void processIOException(IOExceptionEvent exceptionEvent) {

      // TODO Auto-generated method stub



   }



   /**

@@ -213,7 +235,6 @@
   @Override

   public void processTransactionTerminated(TransactionTerminatedEvent transactionTerminatedEvent) {

      // TODO Auto-generated method stub



   }



   /**