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

lawrencehj

2021-08-26 45969a00b74b5a240c0dc6e2c37f5381cd0cb65f

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

@@ -7,11 +7,15 @@
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 org.slf4j.Logger;

import org.slf4j.LoggerFactory;

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

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;



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

@@ -40,14 +44,14 @@
import com.genersoft.iot.vmp.utils.redis.RedisUtil;



/**    

 * @Description:TODO(这里用一句话描述这个类的作用)   
 * @Description: SIP信令处理分配

 * @author: swwheihei

 * @date:   2020年5月3日 下午4:24:37     

 */

@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;

@@ -60,13 +64,19 @@


   @Autowired

   private IRedisCatchStorage redisCatchStorage;

	


   @Autowired

   private EventPublisher publisher;

   

   @Autowired

   private SIPCommander cmder;

	


   @Autowired

   private SIPCommanderFroPlatform cmderFroPlatform;



   @Autowired

   private IDeviceAlarmService deviceAlarmService;



   @Autowired

   private RedisUtil redis;

   

@@ -84,10 +94,23 @@
   

   @Autowired

   private CancelResponseProcessor cancelResponseProcessor;

	


   @Autowired

   @Lazy

   private RegisterResponseProcessor registerResponseProcessor;





   @Autowired

   private OtherResponseProcessor otherResponseProcessor;



   @Autowired

   private IPlayService playService;



   @Autowired

   private ZLMRTPServerFactory zlmrtpServerFactory;



   @Autowired

   private IMediaServerService mediaServerService;



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

   private SipProvider tcpSipProvider;

@@ -105,6 +128,14 @@
         processor.setRequestEvent(evt);

         processor.setTcpSipProvider(getTcpSipProvider());

         processor.setUdpSipProvider(getUdpSipProvider());



         processor.setCmder(cmder);

         processor.setCmderFroPlatform(cmderFroPlatform);

         processor.setPlayService(playService);

         processor.setStorager(storager);

         processor.setRedisCatchStorage(redisCatchStorage);

         processor.setZlmrtpServerFactory(zlmrtpServerFactory);

         processor.setMediaServerService(mediaServerService);

         return processor;

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

         RegisterRequestProcessor processor = new RegisterRequestProcessor();

@@ -118,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();

@@ -142,6 +183,8 @@
         processor.setDeferredResultHolder(deferredResultHolder);

         processor.setOffLineDetector(offLineDetector);

         processor.setCmder(cmder);

         processor.setCmderFroPlatform(cmderFroPlatform);

         processor.setDeviceAlarmService(deviceAlarmService);

         processor.setStorager(storager);

         processor.setRedisCatchStorage(redisCatchStorage);

         return processor;

@@ -166,6 +209,7 @@
   }

   

   public ISIPResponseProcessor createResponseProcessor(ResponseEvent evt) {



      Response response = evt.getResponse();

      CSeqHeader cseqHeader = (CSeqHeader) response.getHeader(CSeqHeader.NAME);

      String method = cseqHeader.getMethod();

@@ -175,6 +219,8 @@
         return byeResponseProcessor;

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

         return cancelResponseProcessor;

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

         return registerResponseProcessor;

      } else {

         return otherResponseProcessor;

      }