Merge remote-tracking branch 'origin/rtc' into commercial

648540858

2022-06-27 038d360dd4f2dd3c06f5d97dc66ed13fd78de212

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

@@ -14,7 +14,7 @@


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

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

import com.genersoft.iot.vmp.vmanager.gb28181.session.InfoCseqCache;

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

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

import org.springframework.stereotype.Component;



@@ -34,6 +34,9 @@
   

   @Autowired

   private SipFactory sipFactory;



   @Autowired

   private IRedisCatchStorage redisCatchStorage;



   @Autowired

   private VideoStreamSessionManager streamSession;

@@ -64,7 +67,7 @@


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

            toHeader, viaHeaders, maxForwards);

      ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("APPLICATION", "MANSCDP+xml");

      ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");

      request.setContent(content, contentTypeHeader);

      return request;

   }

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

      

      //ceq

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

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

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

      

      Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getId(), sipConfig.getIp()+":"+sipConfig.getPort()));

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

      

      //ceq

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

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

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

      

      Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getId(), sipConfig.getIp()+":"+sipConfig.getPort()));

@@ -195,8 +198,9 @@


      // Forwards

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



      // ceq

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

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



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

            toHeader, viaHeaders, maxForwards);

@@ -211,9 +215,12 @@


      // Event

      EventHeader eventHeader = sipFactory.createHeaderFactory().createEventHeader(event);



      int random = (int)Math.random() * 1000000000;

      eventHeader.setEventId(random + "");

      request.addHeader(eventHeader);



      ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("APPLICATION", "MANSCDP+xml");

      ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");

      request.setContent(content, contentTypeHeader);

      return request;

   }

@@ -221,7 +228,13 @@
   public Request createInfoRequest(Device device, StreamInfo streamInfo, String content)

         throws PeerUnavailableException, ParseException, InvalidArgumentException {

      Request request = null;

      Dialog dialog = streamSession.getDialog(streamInfo.getDeviceID(), streamInfo.getChannelId());

      if (streamInfo == null) {

         return null;

      }

      Dialog dialog = streamSession.getDialogByStream(streamInfo.getDeviceID(), streamInfo.getChannelId(), streamInfo.getStream());

      if (dialog == null) {

         return null;

      }



      SipURI requestLine = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(),

            device.getHostAddress());

@@ -248,9 +261,10 @@
      // Forwards

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



      Long cseq = redisCatchStorage.getCSEQ(Request.INVITE);

      // ceq

      CSeqHeader cSeqHeader = sipFactory.createHeaderFactory()

            .createCSeqHeader(InfoCseqCache.CSEQCACHE.get(streamInfo.getStreamId()), Request.INFO);

            .createCSeqHeader(cseq, Request.INFO);



      request = sipFactory.createMessageFactory().createRequest(requestLine, Request.INFO, callIdHeader, cSeqHeader,

            fromHeader, toHeader, viaHeaders, maxForwards);