修正设备注册认证时验证Response计算的错误

lawrencehj

2021-08-26 45969a00b74b5a240c0dc6e2c37f5381cd0cb65f

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

@@ -37,17 +37,16 @@
      SipURI requestURI = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), device.getHostAddress());

      // via

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

      ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(),

            device.getTransport(), viaTag);

      ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getIp(), sipConfig.getPort(), device.getTransport(), viaTag);

      viaHeader.setRPort();

      viaHeaders.add(viaHeader);

      // from

      SipURI fromSipURI = sipFactory.createAddressFactory().createSipURI(sipConfig.getSipId(),

            sipConfig.getSipIp() + ":" + sipConfig.getSipPort());

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

            sipConfig.getIp() + ":" + sipConfig.getPort());

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

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

      // to

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

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

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

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



@@ -69,16 +68,16 @@
      SipURI requestLine = sipFactory.createAddressFactory().createSipURI(channelId, device.getHostAddress());

      //via

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

      ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(), device.getTransport(), viaTag);

      ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getIp(), sipConfig.getPort(), device.getTransport(), viaTag);

      viaHeader.setRPort();

      viaHeaders.add(viaHeader);



      //from

      SipURI fromSipURI = sipFactory.createAddressFactory().createSipURI(sipConfig.getSipId(),sipConfig.getSipDomain());

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

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

      FromHeader fromHeader = sipFactory.createHeaderFactory().createFromHeader(fromAddress, fromTag); //必须要有标记，否则无法创建会话，无法回应ack

      //to

      SipURI toSipURI = sipFactory.createAddressFactory().createSipURI(channelId,sipConfig.getSipDomain()); 
      SipURI toSipURI = sipFactory.createAddressFactory().createSipURI(channelId,sipConfig.getDomain()); 
      Address toAddress = sipFactory.createAddressFactory().createAddress(toSipURI);

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

      

@@ -89,11 +88,11 @@
      CSeqHeader cSeqHeader = sipFactory.createHeaderFactory().createCSeqHeader(1L, Request.INVITE);

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

      

      Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getSipId(), sipConfig.getSipIp()+":"+sipConfig.getSipPort()));

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

      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));

      // Subject

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

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

      request.addHeader(subjectHeader);

      ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("APPLICATION", "SDP");

      request.setContent(content, contentTypeHeader);

@@ -110,11 +109,11 @@
      viaHeader.setRPort();

      viaHeaders.add(viaHeader);

      //from

      SipURI fromSipURI = sipFactory.createAddressFactory().createSipURI(sipConfig.getSipId(),sipConfig.getSipDomain());

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

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

      FromHeader fromHeader = sipFactory.createHeaderFactory().createFromHeader(fromAddress, fromTag); //必须要有标记，否则无法创建会话，无法回应ack

      //to

      SipURI toSipURI = sipFactory.createAddressFactory().createSipURI(channelId,sipConfig.getSipDomain()); 
      SipURI toSipURI = sipFactory.createAddressFactory().createSipURI(channelId,sipConfig.getDomain()); 
      Address toAddress = sipFactory.createAddressFactory().createAddress(toSipURI);

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

      

@@ -125,8 +124,8 @@
      CSeqHeader cSeqHeader = sipFactory.createHeaderFactory().createCSeqHeader(1L, Request.INVITE);

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

      

      Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getSipId(), sipConfig.getSipIp()+":"+sipConfig.getSipPort()));

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

      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));

      

      ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("APPLICATION", "SDP");

@@ -140,14 +139,14 @@
      SipURI requestLine = sipFactory.createAddressFactory().createSipURI(channelId, device.getHostAddress());

      // via

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

      ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(), device.getTransport(), viaTag);

      ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getIp(), sipConfig.getPort(), device.getTransport(), viaTag);

      viaHeaders.add(viaHeader);

      //from

      SipURI fromSipURI = sipFactory.createAddressFactory().createSipURI(sipConfig.getSipId(),sipConfig.getSipDomain());

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

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

      FromHeader fromHeader = sipFactory.createHeaderFactory().createFromHeader(fromAddress, fromTag); //必须要有标记，否则无法创建会话，无法回应ack

      //to

      SipURI toSipURI = sipFactory.createAddressFactory().createSipURI(channelId,sipConfig.getSipDomain());

      SipURI toSipURI = sipFactory.createAddressFactory().createSipURI(channelId,sipConfig.getDomain());

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

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



@@ -159,7 +158,7 @@
      CallIdHeader callIdHeader = sipFactory.createHeaderFactory().createCallIdHeader(callId);

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



      Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getSipId(), sipConfig.getSipIp()+":"+sipConfig.getSipPort()));

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



      return request;

   }

@@ -170,17 +169,17 @@
      SipURI requestURI = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), device.getHostAddress());

      // via

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

      ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(),

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

            device.getTransport(), viaTag);

      viaHeader.setRPort();

      viaHeaders.add(viaHeader);

      // from

      SipURI fromSipURI = sipFactory.createAddressFactory().createSipURI(sipConfig.getSipId(),

            sipConfig.getSipIp() + ":" + sipConfig.getSipPort());

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

            sipConfig.getIp() + ":" + sipConfig.getPort());

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

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

      // to

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

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

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

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



@@ -193,7 +192,7 @@
            toHeader, viaHeaders, maxForwards);





      Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getSipId(), sipConfig.getSipIp()+":"+sipConfig.getSipPort()));

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

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



      // Expires