From 613399cc6d14cfe5b8a245d462629ecee5deb2db Mon Sep 17 00:00:00 2001
From: xiaoQQya <xiaoQQya@126.com>
Date: 星期二, 17 十月 2023 17:49:31 +0800
Subject: [PATCH] fix(play): 修复单端口推流下级自定义 ssrc 时, 流注册后接口仍然超时的问题
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java | 54 +++++++++++++++++++++++++-----------------------------
1 files changed, 25 insertions(+), 29 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..52356c1 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,10 +3,9 @@
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 gov.nist.javax.sip.message.SIPRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,13 +13,11 @@
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.net.InetAddress;
import java.util.Map;
-import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -33,7 +30,7 @@
private final static Logger logger = LoggerFactory.getLogger(SIPProcessorObserver.class);
- private static Map<String, ISIPRequestProcessor> requestProcessorMap = new ConcurrentHashMap<>();
+ private static Map<String, ISIPRequestProcessor> requestProcessorMap = new ConcurrentHashMap<>();
private static Map<String, ISIPResponseProcessor> responseProcessorMap = new ConcurrentHashMap<>();
private static ITimeoutProcessor timeoutProcessor;
@@ -42,9 +39,6 @@
@Autowired
private EventPublisher eventPublisher;
-
-
-
/**
* 娣诲姞 request璁㈤槄
@@ -77,13 +71,13 @@
* @param requestEvent RequestEvent浜嬩欢
*/
@Override
- @Async
+ @Async("taskExecutor")
public void processRequest(RequestEvent requestEvent) {
- logger.debug("\n鏀跺埌璇锋眰锛歕n{}", requestEvent.getRequest());
String method = requestEvent.getRequest().getMethod();
ISIPRequestProcessor sipRequestProcessor = requestProcessorMap.get(method);
if (sipRequestProcessor == null) {
logger.warn("涓嶆敮鎸佹柟娉晎}鐨剅equest", method);
+ // TODO 鍥炲閿欒鐜�
return;
}
requestProcessorMap.get(method).process(requestEvent);
@@ -95,13 +89,13 @@
* @param responseEvent responseEvent浜嬩欢
*/
@Override
- @Async
+ @Async("taskExecutor")
public void processResponse(ResponseEvent responseEvent) {
Response response = responseEvent.getResponse();
- logger.debug("\n鏀跺埌鍝嶅簲锛歕n{}", responseEvent.getResponse());
int status = response.getStatusCode();
- if (((status >= 200) && (status < 300)) || status == Response.UNAUTHORIZED) { // Success!
+ // Success
+ if (((status >= Response.OK) && (status < Response.MULTIPLE_CHOICES)) || status == Response.UNAUTHORIZED) {
CSeqHeader cseqHeader = (CSeqHeader) responseEvent.getResponse().getHeader(CSeqHeader.NAME);
String method = cseqHeader.getMethod();
ISIPResponseProcessor sipRequestProcessor = responseProcessorMap.get(method);
@@ -119,10 +113,10 @@
}
}
}
- } else if ((status >= 100) && (status < 200)) {
+ } else if ((status >= Response.TRYING) && (status < Response.OK)) {
// 澧炲姞鍏跺畠鏃犻渶鍥炲鐨勫搷搴旓紝濡�101銆�180绛�
} else {
- logger.warn("鎺ユ敹鍒板け璐ョ殑response鍝嶅簲锛乻tatus锛�" + status + ",message:" + response.getReasonPhrase()/* .getContent().toString()*/);
+ logger.warn("鎺ユ敹鍒板け璐ョ殑response鍝嶅簲锛乻tatus锛�" + status + ",message:" + response.getReasonPhrase());
if (responseEvent.getResponse() != null && sipSubscribe.getErrorSubscribesSize() > 0 ) {
CallIdHeader callIdHeader = (CallIdHeader)responseEvent.getResponse().getHeader(CallIdHeader.NAME);
if (callIdHeader != null) {
@@ -150,30 +144,26 @@
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);
+ if (subscribe != null){
+ 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
@@ -183,6 +173,12 @@
@Override
public void processTransactionTerminated(TransactionTerminatedEvent transactionTerminatedEvent) {
+// if (transactionTerminatedEvent.isServerTransaction()) {
+// ServerTransaction serverTransaction = transactionTerminatedEvent.getServerTransaction();
+// serverTransaction.get
+// }
+
+
// Transaction transaction = null;
// System.out.println("processTransactionTerminated");
// if (transactionTerminatedEvent.isServerTransaction()) {
--
Gitblit v1.8.0