Merge branch 'wvp-28181-2.0'

648540858

2022-09-24 d7a1b94f905c5f28c9c8f2d48c3f9e28ebcf9cc4

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

@@ -16,6 +16,7 @@
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;

@@ -199,24 +200,24 @@
      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);

@@ -238,7 +239,7 @@
      // 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);