与主线同步，修复zlm在docker时代理错误

Lawrence

2020-12-17 ed1fe4b9388cfa9c1cf691f840afceddce8c7bfd

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

@@ -173,7 +173,7 @@
   }





   public Request createRegisterRequest(@NotNull ParentPlatform platform, String fromTag, String viaTag) throws ParseException, InvalidArgumentException, PeerUnavailableException {

   public Request createRegisterRequest(@NotNull ParentPlatform platform, long CSeq, String fromTag, String viaTag) throws ParseException, InvalidArgumentException, PeerUnavailableException {

      Request request = null;

      String sipAddress = sipConfig.getSipIp() + ":" + sipConfig.getSipPort();

      //请求行

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



      //ceq

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

      CSeqHeader cSeqHeader = sipFactory.createHeaderFactory().createCSeqHeader(CSeq, Request.REGISTER);

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

            cSeqHeader,fromHeader, toHeader, viaHeaders, maxForwards);



@@ -214,12 +214,15 @@
            .createSipURI(platform.getDeviceGBId(), sipAddress));

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



      ExpiresHeader expires = sipFactory.createHeaderFactory().createExpiresHeader(3600);

      request.addHeader(expires);



      return request;

   }



   public Request createRegisterRequest(@NotNull ParentPlatform parentPlatform, String fromTag, String viaTag,

                               String callId, String realm, String nonce, String scheme) throws ParseException, PeerUnavailableException, InvalidArgumentException {

      Request registerRequest = createRegisterRequest(parentPlatform, fromTag, viaTag);

      Request registerRequest = createRegisterRequest(parentPlatform, 2L, fromTag, viaTag);



      CallIdHeader callIdHeader = (CallIdHeader)registerRequest.getHeader(CallIdHeader.NAME);

      callIdHeader.setCallId(callId);

@@ -233,8 +236,7 @@
      String RESPONSE = DigestUtils.md5DigestAsHex((HA1 + ":" + nonce + ":" +  HA2).getBytes());



      String authorizationHeaderContent = scheme + " username=\"" + parentPlatform.getDeviceGBId() + "\", " + "realm=\""

            + realm + "\", uri=\"" + uri  + "\", response=\"" + RESPONSE + "\", nonce=\""

            + nonce + "\"";

            + realm + "\", nonce=\"" + nonce + "\", uri=\"" + uri  + "\", response=\"" + RESPONSE + "\"" + ", algorithm=MD5";

      AuthorizationHeader authorizationHeader = sipFactory.createHeaderFactory().createAuthorizationHeader(authorizationHeaderContent);

      registerRequest.addHeader(authorizationHeader);