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

lawrencehj

2021-08-26 45969a00b74b5a240c0dc6e2c37f5381cd0cb65f

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java

@@ -4,25 +4,17 @@
import javax.sip.ResponseEvent;

import javax.sip.SipProvider;

import javax.sip.header.CSeqHeader;

import javax.sip.header.CallIdHeader;

import javax.sip.header.Header;

import javax.sip.message.Request;

import javax.sip.message.Response;



import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;

import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;

import com.genersoft.iot.vmp.service.IDeviceAlarmService;

import com.genersoft.iot.vmp.service.IMediaServerService;

import com.genersoft.iot.vmp.storager.IRedisCatchStorage;

import com.alibaba.fastjson.JSON;

import com.genersoft.iot.vmp.gb28181.transmit.response.impl.*;

import com.genersoft.iot.vmp.gb28181.transmit.response.impl.*;

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

import com.genersoft.iot.vmp.vmanager.service.IPlayService;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

// import org.slf4j.Logger;

// import org.slf4j.LoggerFactory;

import com.genersoft.iot.vmp.service.IPlayService;

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

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

import org.springframework.context.annotation.Lazy;

import org.springframework.stereotype.Component;



@@ -59,7 +51,7 @@
@Component

public class SIPProcessorFactory {

   

   private final static Logger logger = LoggerFactory.getLogger(SIPProcessorFactory.class);

   // private final static Logger logger = LoggerFactory.getLogger(SIPProcessorFactory.class);

   

   @Autowired

   private SipConfig sipConfig;

@@ -81,6 +73,9 @@


   @Autowired

   private SIPCommanderFroPlatform cmderFroPlatform;



   @Autowired

   private IDeviceAlarmService deviceAlarmService;



   @Autowired

   private RedisUtil redis;

@@ -114,6 +109,8 @@
   @Autowired

   private ZLMRTPServerFactory zlmrtpServerFactory;



   @Autowired

   private IMediaServerService mediaServerService;



   // 注：这里使用注解会导致循环依赖注入，暂用springBean

   private SipProvider tcpSipProvider;

@@ -138,6 +135,7 @@
         processor.setStorager(storager);

         processor.setRedisCatchStorage(redisCatchStorage);

         processor.setZlmrtpServerFactory(zlmrtpServerFactory);

         processor.setMediaServerService(mediaServerService);

         return processor;

      } else if (Request.REGISTER.equals(method)) {

         RegisterRequestProcessor processor = new RegisterRequestProcessor();

@@ -151,15 +149,25 @@
         return processor;

      } else if (Request.SUBSCRIBE.equals(method)) {

         SubscribeRequestProcessor processor = new SubscribeRequestProcessor();

         processor.setTcpSipProvider(getTcpSipProvider());

         processor.setUdpSipProvider(getUdpSipProvider());

         processor.setRequestEvent(evt);

         return processor;

      } else if (Request.ACK.equals(method)) {

         AckRequestProcessor processor = new AckRequestProcessor();

         processor.setRequestEvent(evt);

         processor.setRedisCatchStorage(redisCatchStorage);

         processor.setZlmrtpServerFactory(zlmrtpServerFactory);

         processor.setMediaServerService(mediaServerService);

         return processor;

      } else if (Request.BYE.equals(method)) {

         ByeRequestProcessor processor = new ByeRequestProcessor();

         processor.setRequestEvent(evt);

         processor.setRedisCatchStorage(redisCatchStorage);

         processor.setStorager(storager);

         processor.setZlmrtpServerFactory(zlmrtpServerFactory);

         processor.setSIPCommander(cmder);

         processor.setMediaServerService(mediaServerService);

         return processor;

      } else if (Request.CANCEL.equals(method)) {

         CancelRequestProcessor processor = new CancelRequestProcessor();

@@ -176,6 +184,7 @@
         processor.setOffLineDetector(offLineDetector);

         processor.setCmder(cmder);

         processor.setCmderFroPlatform(cmderFroPlatform);

         processor.setDeviceAlarmService(deviceAlarmService);

         processor.setStorager(storager);

         processor.setRedisCatchStorage(redisCatchStorage);

         return processor;