From f1217682a9d1726b5b5673343dfe9b035e1180d4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 05 十一月 2021 18:27:41 +0800
Subject: [PATCH] 重构28181信令结构，解决循环依赖导致的无法直接注入
---
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java | 182 ++++-----------------------------------------
1 files changed, 17 insertions(+), 165 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
index 1afabb7..5a573f7 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
@@ -1,19 +1,10 @@
package com.genersoft.iot.vmp.gb28181;
-import java.text.ParseException;
-import java.util.Properties;
-import java.util.TooManyListenersException;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import javax.sip.*;
-import javax.sip.header.CallIdHeader;
-import javax.sip.header.Header;
-import javax.sip.message.Response;
-
+import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
+import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
import gov.nist.javax.sip.SipProviderImpl;
+import gov.nist.javax.sip.SipStackImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,14 +12,15 @@
import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component;
-import com.genersoft.iot.vmp.conf.SipConfig;
-import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorFactory;
-import com.genersoft.iot.vmp.gb28181.transmit.response.ISIPResponseProcessor;
-
-import gov.nist.javax.sip.SipStackImpl;
+import javax.sip.*;
+import java.util.Properties;
+import java.util.TooManyListenersException;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
@Component
-public class SipLayer implements SipListener {
+public class SipLayer{
private final static Logger logger = LoggerFactory.getLogger(SipLayer.class);
@@ -36,7 +28,7 @@
private SipConfig sipConfig;
@Autowired
- private SIPProcessorFactory processorFactory;
+ private SIPProcessorObserver sipProcessorObserver;
@Autowired
private SipSubscribe sipSubscribe;
@@ -50,19 +42,16 @@
*/
private ThreadPoolExecutor processThreadPool;
- @Bean("initSipServer")
- private ThreadPoolExecutor initSipServer() {
-
+ public SipLayer() {
int processThreadNum = Runtime.getRuntime().availableProcessors() * 10;
LinkedBlockingQueue<Runnable> processQueue = new LinkedBlockingQueue<>(10000);
processThreadPool = new ThreadPoolExecutor(processThreadNum,processThreadNum,
0L,TimeUnit.MILLISECONDS,processQueue,
new ThreadPoolExecutor.CallerRunsPolicy());
- return processThreadPool;
}
-
+
+
@Bean("sipFactory")
- @DependsOn("initSipServer")
private SipFactory createSipFactory() {
sipFactory = SipFactory.getInstance();
sipFactory.setPathName("gov.nist");
@@ -70,7 +59,7 @@
}
@Bean("sipStack")
- @DependsOn({"initSipServer", "sipFactory"})
+ @DependsOn({"sipFactory"})
private SipStack createSipStack() throws PeerUnavailableException {
Properties properties = new Properties();
properties.setProperty("javax.sip.STACK_NAME", "GB28181_SIP");
@@ -96,7 +85,7 @@
try {
tcpListeningPoint = sipStack.createListeningPoint(sipConfig.getMonitorIp(), sipConfig.getPort(), "TCP");
tcpSipProvider = (SipProviderImpl)sipStack.createSipProvider(tcpListeningPoint);
- tcpSipProvider.addSipListener(this);
+ tcpSipProvider.addSipListener(sipProcessorObserver);
logger.info("Sip Server TCP 鍚姩鎴愬姛 port {" + sipConfig.getMonitorIp() + ":" + sipConfig.getPort() + "}");
} catch (TransportNotSupportedException e) {
e.printStackTrace();
@@ -119,8 +108,7 @@
try {
udpListeningPoint = sipStack.createListeningPoint(sipConfig.getMonitorIp(), sipConfig.getPort(), "UDP");
udpSipProvider = (SipProviderImpl)sipStack.createSipProvider(udpListeningPoint);
- udpSipProvider.addSipListener(this);
-// udpSipProvider.setAutomaticDialogSupportEnabled(false);
+ udpSipProvider.addSipListener(sipProcessorObserver);
} catch (TransportNotSupportedException e) {
e.printStackTrace();
} catch (InvalidArgumentException e) {
@@ -133,142 +121,6 @@
}
logger.info("Sip Server UDP 鍚姩鎴愬姛 port [" + sipConfig.getMonitorIp() + ":" + sipConfig.getPort() + "]");
return udpSipProvider;
- }
-
- /**
- * SIP鏈嶅姟绔帴鏀舵秷鎭殑鏂规硶 Content 閲岄潰鏄疓BK缂栫爜 This method is called by the SIP stack when a
- * new request arrives.
- */
- @Override
- public void processRequest(RequestEvent evt) {
- logger.debug(evt.getRequest().toString());
- // 鐢变簬jainsip鏄崟绾跨▼绋嬪簭锛屼负鎻愰珮鎬ц兘骞跺彂澶勭悊
- processThreadPool.execute(() -> {
- if (processorFactory != null) {
- processorFactory.createRequestProcessor(evt).process();
- }
- });
- }
-
- @Override
- public void processResponse(ResponseEvent evt) {
- Response response = evt.getResponse();
- logger.debug(evt.getResponse().toString());
- int status = response.getStatusCode();
- if (((status >= 200) && (status < 300)) || status == 401) { // Success!
- ISIPResponseProcessor processor = processorFactory.createResponseProcessor(evt);
- try {
- processor.process(evt, this, sipConfig);
- } catch (ParseException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- if (evt.getResponse() != null && sipSubscribe.getOkSubscribesSize() > 0 ) {
- CallIdHeader callIdHeader = (CallIdHeader)evt.getResponse().getHeader(CallIdHeader.NAME);
- if (callIdHeader != null) {
- SipSubscribe.Event subscribe = sipSubscribe.getOkSubscribe(callIdHeader.getCallId());
- if (subscribe != null) {
- SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(evt);
- subscribe.response(eventResult);
- }
- }
- }
- } else if ((status >= 100) && (status < 200)) {
- // 澧炲姞鍏跺畠鏃犻渶鍥炲鐨勫搷搴旓紝濡�101銆�180绛�
- } else {
- logger.warn("鎺ユ敹鍒板け璐ョ殑response鍝嶅簲锛乻tatus锛�" + status + ",message:" + response.getReasonPhrase()/* .getContent().toString()*/);
- if (evt.getResponse() != null && sipSubscribe.getErrorSubscribesSize() > 0 ) {
- CallIdHeader callIdHeader = (CallIdHeader)evt.getResponse().getHeader(CallIdHeader.NAME);
- if (callIdHeader != null) {
- SipSubscribe.Event subscribe = sipSubscribe.getErrorSubscribe(callIdHeader.getCallId());
- if (subscribe != null) {
- SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(evt);
- subscribe.response(eventResult);
- }
- }
- }
- }
-
-
-
- }
-
- /**
- * <p>
- * Title: processTimeout
- * </p>
- * <p>
- * Description:
- * </p>
- *
- * @param timeoutEvent
- */
- @Override
- public void processTimeout(TimeoutEvent timeoutEvent) {
- // TODO Auto-generated method stub
- CallIdHeader callIdHeader = timeoutEvent.getClientTransaction().getDialog().getCallId();
- String callId = callIdHeader.getCallId();
- SipSubscribe.Event errorSubscribe = sipSubscribe.getErrorSubscribe(callId);
- SipSubscribe.EventResult<TimeoutEvent> timeoutEventEventResult = new SipSubscribe.EventResult<>(timeoutEvent);
- errorSubscribe.response(timeoutEventEventResult);
- }
-
- /**
- * <p>
- * Title: processIOException
- * </p>
- * <p>
- * Description:
- * </p>
- *
- * @param exceptionEvent
- */
- @Override
- public void processIOException(IOExceptionEvent exceptionEvent) {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * <p>
- * Title: processTransactionTerminated
- * </p>
- * <p>
- * Description:
- * </p>
- *
- * @param transactionTerminatedEvent
- */
- @Override
- public void processTransactionTerminated(TransactionTerminatedEvent transactionTerminatedEvent) {
- // TODO Auto-generated method stub
-// CallIdHeader callIdHeader = transactionTerminatedEvent.getClientTransaction().getDialog().getCallId();
-// String callId = callIdHeader.getCallId();
-// SipSubscribe.Event errorSubscribe = sipSubscribe.getErrorSubscribe(callId);
-// SipSubscribe.EventResult<TransactionTerminatedEvent> eventResult = new SipSubscribe.EventResult<>(transactionTerminatedEvent);
-// errorSubscribe.response(eventResult);
- }
-
- /**
- * <p>
- * Title: processDialogTerminated
- * </p>
- * <p>
- * Description:
- * </p>
- *
- * @param dialogTerminatedEvent
- */
- @Override
- public void processDialogTerminated(DialogTerminatedEvent dialogTerminatedEvent) {
- // TODO Auto-generated method stub
-// CallIdHeader callIdHeader = dialogTerminatedEvent.getDialog().getCallId();
-// String callId = callIdHeader.getCallId();
-// SipSubscribe.Event errorSubscribe = sipSubscribe.getErrorSubscribe(callId);
-// SipSubscribe.EventResult<DialogTerminatedEvent> eventResult = new SipSubscribe.EventResult<>(dialogTerminatedEvent);
-// errorSubscribe.response(eventResult);
-
}
}
--
Gitblit v1.8.0