修复cseq序号回退

648540858

2022-09-08 4bda14b098bc943324c73a8365c8bcd721beaa5a

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java

@@ -12,6 +12,7 @@


import com.genersoft.iot.vmp.common.StreamInfo;

import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;

import com.genersoft.iot.vmp.gb28181.utils.HeaderUtils;

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

import gov.nist.javax.sip.SipProviderImpl;

import gov.nist.javax.sip.SipStackImpl;

@@ -73,7 +74,7 @@
      // Forwards

      MaxForwardsHeader maxForwards = sipFactory.createHeaderFactory().createMaxForwardsHeader(70);

      // ceq

      CSeqHeader cSeqHeader = sipFactory.createHeaderFactory().createCSeqHeader(1L, Request.MESSAGE);

      CSeqHeader cSeqHeader = sipFactory.createHeaderFactory().createCSeqHeader(redisCatchStorage.getCSEQ(), Request.MESSAGE);



      request = sipFactory.createMessageFactory().createRequest(requestURI, Request.MESSAGE, callIdHeader, cSeqHeader, fromHeader,

            toHeader, viaHeaders, maxForwards);

@@ -177,7 +178,7 @@
      MaxForwardsHeader maxForwards = sipFactory.createHeaderFactory().createMaxForwardsHeader(70);



      //ceq

      CSeqHeader cSeqHeader = sipFactory.createHeaderFactory().createCSeqHeader(1L, Request.BYE);

      CSeqHeader cSeqHeader = sipFactory.createHeaderFactory().createCSeqHeader(redisCatchStorage.getCSEQ(), Request.BYE);

      CallIdHeader callIdHeader = sipFactory.createHeaderFactory().createCallIdHeader(callId);

      request = sipFactory.createMessageFactory().createRequest(requestLine, Request.BYE, callIdHeader, cSeqHeader,fromHeader, toHeader, viaHeaders, maxForwards);



@@ -266,15 +267,7 @@
      Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory()

            .createSipURI(sipConfig.getId(), sipConfig.getIp() + ":" + sipConfig.getPort()));

      infoRequest.addHeader(sipFactory.createHeaderFactory().createContactHeader(concatAddress));

      List<String> agentParam = new ArrayList<>();

      agentParam.add("wvp-pro");

      // TODO 添加版本信息以及日期

      UserAgentHeader userAgentHeader = null;

      try {

         userAgentHeader = sipFactory.createHeaderFactory().createUserAgentHeader(agentParam);

      } catch (ParseException e) {

         throw new RuntimeException(e);

      }

      UserAgentHeader userAgentHeader = HeaderUtils.createUserAgentHeader(sipFactory);

      infoRequest.addHeader(userAgentHeader);



      ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application",