Merge branch 'wvp-28181-2.0'

648540858

2022-09-24 d7a1b94f905c5f28c9c8f2d48c3f9e28ebcf9cc4

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

@@ -13,8 +13,10 @@
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;

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

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

import com.genersoft.iot.vmp.utils.GitUtil;

import gov.nist.javax.sip.SipProviderImpl;

import gov.nist.javax.sip.SipStackImpl;

import gov.nist.javax.sip.message.SIPRequest;

import gov.nist.javax.sip.stack.SIPDialog;

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

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

@@ -36,6 +38,9 @@
   

   @Autowired

   private SipFactory sipFactory;



   @Autowired

   private GitUtil gitUtil;



   @Autowired

   private IRedisCatchStorage redisCatchStorage;

@@ -76,6 +81,9 @@


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

            toHeader, viaHeaders, maxForwards);



      request.addHeader(SipUtils.createUserAgentHeader(sipFactory, gitUtil));



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

      request.setContent(content, contentTypeHeader);

      return request;

@@ -106,7 +114,9 @@
      //ceq

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

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

		


      request.addHeader(SipUtils.createUserAgentHeader(sipFactory, gitUtil));



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

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

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

@@ -146,6 +156,9 @@
      Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getId(), sipConfig.getIp()+":"+sipConfig.getPort()));

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

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



      request.addHeader(SipUtils.createUserAgentHeader(sipFactory, gitUtil));



      // Subject

      SubjectHeader subjectHeader = sipFactory.createHeaderFactory().createSubjectHeader(String.format("%s:%s,%s:%s", channelId, ssrc, sipConfig.getId(), 0));

      request.addHeader(subjectHeader);

@@ -180,29 +193,31 @@
      CallIdHeader callIdHeader = sipFactory.createHeaderFactory().createCallIdHeader(callId);

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



      request.addHeader(SipUtils.createUserAgentHeader(sipFactory, gitUtil));



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



      return request;

   }



   public Request createSubscribeRequest(Device device, String content, String viaTag, String fromTag, String toTag, Integer expires, String event, CallIdHeader callIdHeader) throws ParseException, InvalidArgumentException, PeerUnavailableException {

   public Request createSubscribeRequest(Device device, String content, SIPRequest requestOld, Integer expires, String event, CallIdHeader callIdHeader) throws ParseException, InvalidArgumentException, PeerUnavailableException {

      Request request = null;

      // sipuri

      SipURI requestURI = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), device.getHostAddress());

      // via

      ArrayList<ViaHeader> viaHeaders = new ArrayList<ViaHeader>();

      ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getIp(), sipConfig.getPort(),

            device.getTransport(), viaTag);

            device.getTransport(), SipUtils.getNewViaTag());

      viaHeader.setRPort();

      viaHeaders.add(viaHeader);

      // from

      SipURI fromSipURI = sipFactory.createAddressFactory().createSipURI(sipConfig.getId(), sipConfig.getDomain());

      Address fromAddress = sipFactory.createAddressFactory().createAddress(fromSipURI);

      FromHeader fromHeader = sipFactory.createHeaderFactory().createFromHeader(fromAddress, fromTag);

      FromHeader fromHeader = sipFactory.createHeaderFactory().createFromHeader(fromAddress, requestOld == null ? SipUtils.getNewFromTag() :requestOld.getFromTag());

      // to

      SipURI toSipURI = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), device.getHostAddress());

      Address toAddress = sipFactory.createAddressFactory().createAddress(toSipURI);

      ToHeader toHeader = sipFactory.createHeaderFactory().createToHeader(toAddress, toTag);

      ToHeader toHeader = sipFactory.createHeaderFactory().createToHeader(toAddress, requestOld == null ? null :requestOld.getToTag());



      // Forwards

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

@@ -224,12 +239,15 @@
      // Event

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



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

      int random = (int) Math.floor(Math.random() * 10000);

      eventHeader.setEventId(random + "");

      request.addHeader(eventHeader);



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

      request.setContent(content, contentTypeHeader);



      request.addHeader(SipUtils.createUserAgentHeader(sipFactory, gitUtil));



      return request;

   }



@@ -264,8 +282,7 @@
      Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory()

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

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

      UserAgentHeader userAgentHeader = SipUtils.createUserAgentHeader(sipFactory);

      infoRequest.addHeader(userAgentHeader);

      infoRequest.addHeader(SipUtils.createUserAgentHeader(sipFactory, gitUtil));



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

            "MANSRTSP");