From bfafe45b26e278d35a9f50e20178164be9c85e22 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 18 三月 2024 15:39:32 +0800
Subject: [PATCH] Merge pull request #1371 from ancienter/develop
---
src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java
old mode 100644
new mode 100755
index 5cc9cb9..e07761a
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java
@@ -2,6 +2,8 @@
import com.genersoft.iot.vmp.gb28181.bean.DeviceNotFoundEvent;
import gov.nist.javax.sip.message.SIPRequest;
+import gov.nist.javax.sip.message.SIPResponse;
+import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.Scheduled;
@@ -11,8 +13,7 @@
import javax.sip.ResponseEvent;
import javax.sip.TimeoutEvent;
import javax.sip.TransactionTerminatedEvent;
-import javax.sip.header.CallIdHeader;
-import javax.sip.message.Response;
+import javax.sip.header.WarningHeader;
import java.time.Instant;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -76,7 +77,11 @@
// 浼氳瘽宸茬粨鏉�
dialogTerminated,
// 璁惧鏈壘鍒�
- deviceNotFoundEvent
+ deviceNotFoundEvent,
+ // 娑堟伅鍙戦�佸け璐�
+ cmdSendFailEvent,
+ // 娑堟伅鍙戦�佸け璐�
+ failedToGetPort
}
public static class EventResult<EventObject>{
@@ -86,23 +91,34 @@
public String callId;
public EventObject event;
- public EventResult(int statusCode, String msg) {
- this.statusCode = statusCode;
- this.msg = msg;
+ public EventResult() {
}
public EventResult(EventObject event) {
this.event = event;
if (event instanceof ResponseEvent) {
ResponseEvent responseEvent = (ResponseEvent)event;
- Response response = responseEvent.getResponse();
+ SIPResponse response = (SIPResponse)responseEvent.getResponse();
this.type = EventResultType.response;
if (response != null) {
- this.msg = response.getReasonPhrase();
+ WarningHeader warningHeader = (WarningHeader)response.getHeader(WarningHeader.NAME);
+ if (warningHeader != null && !ObjectUtils.isEmpty(warningHeader.getText())) {
+ this.msg = "";
+ if (warningHeader.getCode() > 0) {
+ this.msg += warningHeader.getCode() + ":";
+ }
+ if (warningHeader.getAgent() != null) {
+ this.msg += warningHeader.getCode() + ":";
+ }
+ if (warningHeader.getText() != null) {
+ this.msg += warningHeader.getText();
+ }
+ }else {
+ this.msg = response.getReasonPhrase();
+ }
this.statusCode = response.getStatusCode();
+ this.callId = response.getCallIdHeader().getCallId();
}
- this.callId = ((CallIdHeader)response.getHeader(CallIdHeader.NAME)).getCallId();
-
}else if (event instanceof TimeoutEvent) {
TimeoutEvent timeoutEvent = (TimeoutEvent)event;
this.type = EventResultType.timeout;
--
Gitblit v1.8.0