From 38a85d432ae9bb861dbcbf090d68fb3dca0d85f6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 29 十一月 2022 17:51:45 +0800
Subject: [PATCH] 修复合并的bug
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SipTransactionInfo.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SipTransactionInfo.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SipTransactionInfo.java
index c68be12..8099600 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SipTransactionInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SipTransactionInfo.java
@@ -1,6 +1,6 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import gov.nist.javax.sip.message.SIPRequest;
+import gov.nist.javax.sip.message.SIPResponse;
public class SipTransactionInfo {
@@ -9,11 +9,22 @@
private String toTag;
private String viaBranch;
- public SipTransactionInfo(SIPRequest request) {
- this.callId = request.getCallIdHeader().getCallId();
- this.fromTag = request.getFromTag();
- this.toTag = request.getToTag();
- this.viaBranch = request.getTopmostViaHeader().getBranch();
+ private boolean fromServer;
+
+ public SipTransactionInfo(SIPResponse response, boolean fromServer) {
+ this.callId = response.getCallIdHeader().getCallId();
+ this.fromTag = response.getFromTag();
+ this.toTag = response.getToTag();
+ this.viaBranch = response.getTopmostViaHeader().getBranch();
+ this.fromServer = fromServer;
+ }
+
+ public SipTransactionInfo(SIPResponse response) {
+ this.callId = response.getCallIdHeader().getCallId();
+ this.fromTag = response.getFromTag();
+ this.toTag = response.getToTag();
+ this.viaBranch = response.getTopmostViaHeader().getBranch();
+ this.fromServer = true;
}
public SipTransactionInfo() {
@@ -50,4 +61,12 @@
public void setViaBranch(String viaBranch) {
this.viaBranch = viaBranch;
}
+
+ public boolean isFromServer() {
+ return fromServer;
+ }
+
+ public void setFromServer(boolean fromServer) {
+ this.fromServer = fromServer;
+ }
}
--
Gitblit v1.8.0