guzijian / wvp-GB28181-pro · Commits

Commit e166cc366cadf42c58e74fb75e39cc394334bf4d

Authored by 648540858
2 parents c9539430 8a590d5c

Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

Inline Side-by-side
Showing 1 changed file with 7 additions and 1 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderPlarformProvider.java
  View file @e166cc3
@@ -94,7 +94,13 @@ public class SIPRequestHeaderPlarformProvider { @@ -94,7 +94,13 @@ public class SIPRequestHeaderPlarformProvider {
94 SipURI requestURI = sipLayer.getSipFactory().createAddressFactory().createSipURI(parentPlatform.getServerGBId(), parentPlatform.getServerIP() + ":" + parentPlatform.getServerPort()); 94 SipURI requestURI = sipLayer.getSipFactory().createAddressFactory().createSipURI(parentPlatform.getServerGBId(), parentPlatform.getServerIP() + ":" + parentPlatform.getServerPort());
95 if (www == null) { 95 if (www == null) {
96 AuthorizationHeader authorizationHeader = sipLayer.getSipFactory().createHeaderFactory().createAuthorizationHeader("Digest"); 96 AuthorizationHeader authorizationHeader = sipLayer.getSipFactory().createHeaderFactory().createAuthorizationHeader("Digest");
97 - authorizationHeader.setUsername(parentPlatform.getDeviceGBId()); 97 + String username = parentPlatform.getUsername();
  98 + if ( username == null || username == "" )
  99 + {
  100 + authorizationHeader.setUsername(parentPlatform.getDeviceGBId());
  101 + } else {
  102 + authorizationHeader.setUsername(username);
  103 + }
98 authorizationHeader.setURI(requestURI); 104 authorizationHeader.setURI(requestURI);
99 authorizationHeader.setAlgorithm("MD5"); 105 authorizationHeader.setAlgorithm("MD5");
100 registerRequest.addHeader(authorizationHeader); 106 registerRequest.addHeader(authorizationHeader);