guzijian / wvp-GB28181-pro · Commits

Commit 31dcdab4d8b71ae5a0e7a2bcf363c990b58c0d8f

Authored by 648540858
1 parent 922a9e8b

修复点播信令

Inline Side-by-side
Showing 2 changed files with 3 additions and 2 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SipTransactionInfo.java
  View file @31dcdab
@@ -25,6 +25,7 @@ public class SipTransactionInfo { @@ -25,6 +25,7 @@ public class SipTransactionInfo {
25 this.fromTag = response.getFromTag(); 25 this.fromTag = response.getFromTag();
26 this.toTag = response.getToTag(); 26 this.toTag = response.getToTag();
27 this.viaBranch = response.getTopmostViaHeader().getBranch(); 27 this.viaBranch = response.getTopmostViaHeader().getBranch();
  28 + this.asSender = false;
28 } 29 }
29 30
30 public SipTransactionInfo() { 31 public SipTransactionInfo() {
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
  View file @31dcdab
@@ -170,11 +170,11 @@ public class SIPRequestHeaderProvider { @@ -170,11 +170,11 @@ public class SIPRequestHeaderProvider {
170 //from 170 //from
171 SipURI fromSipURI = sipLayer.getSipFactory().createAddressFactory().createSipURI(sipConfig.getId(),sipConfig.getDomain()); 171 SipURI fromSipURI = sipLayer.getSipFactory().createAddressFactory().createSipURI(sipConfig.getId(),sipConfig.getDomain());
172 Address fromAddress = sipLayer.getSipFactory().createAddressFactory().createAddress(fromSipURI); 172 Address fromAddress = sipLayer.getSipFactory().createAddressFactory().createAddress(fromSipURI);
173 - FromHeader fromHeader = sipLayer.getSipFactory().createHeaderFactory().createFromHeader(fromAddress, transactionInfo.isAsSender()? transactionInfo.getFromTag():transactionInfo.getToTag()); 173 + FromHeader fromHeader = sipLayer.getSipFactory().createHeaderFactory().createFromHeader(fromAddress, transactionInfo.getFromTag());
174 //to 174 //to
175 SipURI toSipURI = sipLayer.getSipFactory().createAddressFactory().createSipURI(channelId,device.getHostAddress()); 175 SipURI toSipURI = sipLayer.getSipFactory().createAddressFactory().createSipURI(channelId,device.getHostAddress());
176 Address toAddress = sipLayer.getSipFactory().createAddressFactory().createAddress(toSipURI); 176 Address toAddress = sipLayer.getSipFactory().createAddressFactory().createAddress(toSipURI);
177 - ToHeader toHeader = sipLayer.getSipFactory().createHeaderFactory().createToHeader(toAddress, transactionInfo.isAsSender()?transactionInfo.getToTag():transactionInfo.getFromTag()); 177 + ToHeader toHeader = sipLayer.getSipFactory().createHeaderFactory().createToHeader(toAddress, transactionInfo.getToTag());
178 178
179 //Forwards 179 //Forwards
180 MaxForwardsHeader maxForwards = sipLayer.getSipFactory().createHeaderFactory().createMaxForwardsHeader(70); 180 MaxForwardsHeader maxForwards = sipLayer.getSipFactory().createHeaderFactory().createMaxForwardsHeader(70);