From 0a404e23896b566a4dc017431951f8b73578ed73 Mon Sep 17 00:00:00 2001
From: 百鸣 <94030128+ixingqiao@users.noreply.github.com>
Date: 星期五, 26 八月 2022 11:49:43 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java | 26 ++++++--------------------
1 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java
index a06a73d..319016c 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java
@@ -3,8 +3,6 @@
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
-import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.RegisterRequestProcessor;
-import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.cmd.KeepaliveNotifyMessageHandler;
import com.genersoft.iot.vmp.gb28181.transmit.event.response.ISIPResponseProcessor;
import com.genersoft.iot.vmp.gb28181.transmit.event.timeout.ITimeoutProcessor;
import org.slf4j.Logger;
@@ -14,13 +12,10 @@
import org.springframework.stereotype.Component;
import javax.sip.*;
-import javax.sip.address.SipURI;
-import javax.sip.address.URI;
import javax.sip.header.*;
import javax.sip.message.Request;
import javax.sip.message.Response;
import java.util.Map;
-import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -42,9 +37,6 @@
@Autowired
private EventPublisher eventPublisher;
-
-
-
/**
* 娣诲姞 request璁㈤槄
@@ -150,30 +142,24 @@
public void processTimeout(TimeoutEvent timeoutEvent) {
logger.info("[娑堟伅鍙戦�佽秴鏃禲");
ClientTransaction clientTransaction = timeoutEvent.getClientTransaction();
- eventPublisher.requestTimeOut(timeoutEvent);
+
if (clientTransaction != null) {
+ logger.info("[鍙戦�侀敊璇闃匽 clientTransaction != null");
Request request = clientTransaction.getRequest();
if (request != null) {
+ logger.info("[鍙戦�侀敊璇闃匽 request != null");
CallIdHeader callIdHeader = (CallIdHeader) request.getHeader(CallIdHeader.NAME);
if (callIdHeader != null) {
+ logger.info("[鍙戦�侀敊璇闃匽");
SipSubscribe.Event subscribe = sipSubscribe.getErrorSubscribe(callIdHeader.getCallId());
SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(timeoutEvent);
subscribe.response(eventResult);
+ sipSubscribe.removeOkSubscribe(callIdHeader.getCallId());
sipSubscribe.removeErrorSubscribe(callIdHeader.getCallId());
}
}
}
-
-// Timeout timeout = timeoutEvent.getTimeout();
-// ServerTransaction serverTransaction = timeoutEvent.getServerTransaction();
-// if (serverTransaction != null) {
-// Request request = serverTransaction.getRequest();
-// URI requestURI = request.getRequestURI();
-// Header header = request.getHeader(FromHeader.NAME);
-// }
-// if(timeoutProcessor != null) {
-// timeoutProcessor.process(timeoutEvent);
-// }
+ eventPublisher.requestTimeOut(timeoutEvent);
}
@Override
--
Gitblit v1.8.0