From 2f108a46d05e34981d52b447d73f0cfd8e8c30fd Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 17 十一月 2021 16:24:31 +0800
Subject: [PATCH] Merge pull request #232 from chenparty/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java | 214 +++++++++++++---------------------------------------
1 files changed, 55 insertions(+), 159 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 9cc9c25..420a30a 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
@@ -1,25 +1,11 @@
package com.genersoft.iot.vmp.gb28181;
-import java.text.ParseException;
-import java.util.Properties;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import javax.sip.DialogTerminatedEvent;
-import javax.sip.IOExceptionEvent;
-import javax.sip.ListeningPoint;
-import javax.sip.PeerUnavailableException;
-import javax.sip.RequestEvent;
-import javax.sip.ResponseEvent;
-import javax.sip.SipFactory;
-import javax.sip.SipListener;
-import javax.sip.SipProvider;
-import javax.sip.SipStack;
-import javax.sip.TimeoutEvent;
-import javax.sip.TransactionTerminatedEvent;
-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.ISIPProcessorObserver;
+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;
@@ -27,14 +13,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);
@@ -42,30 +29,14 @@
private SipConfig sipConfig;
@Autowired
- private SIPProcessorFactory processorFactory;
+ private ISIPProcessorObserver sipProcessorObserver;
- private SipStack sipStack;
+ private SipStackImpl sipStack;
private SipFactory sipFactory;
- /**
- * 娑堟伅澶勭悊鍣ㄧ嚎绋嬫睜
- */
- private ThreadPoolExecutor processThreadPool;
- @Bean("initSipServer")
- @DependsOn("allOffline")
- private void initSipServer() {
-
- int processThreadNum = Runtime.getRuntime().availableProcessors() * 10;
- LinkedBlockingQueue<Runnable> processQueue = new LinkedBlockingQueue<Runnable>(10000);
- processThreadPool = new ThreadPoolExecutor(processThreadNum,processThreadNum,
- 0L,TimeUnit.MILLISECONDS,processQueue,
- new ThreadPoolExecutor.CallerRunsPolicy());
- }
-
@Bean("sipFactory")
- @DependsOn("initSipServer")
private SipFactory createSipFactory() {
sipFactory = SipFactory.getInstance();
sipFactory.setPathName("gov.nist");
@@ -73,11 +44,11 @@
}
@Bean("sipStack")
- @DependsOn({"initSipServer", "sipFactory"})
+ @DependsOn({"sipFactory"})
private SipStack createSipStack() throws PeerUnavailableException {
Properties properties = new Properties();
properties.setProperty("javax.sip.STACK_NAME", "GB28181_SIP");
- properties.setProperty("javax.sip.IP_ADDRESS", sipConfig.getSipIp());
+ properties.setProperty("javax.sip.IP_ADDRESS", sipConfig.getMonitorIp());
properties.setProperty("gov.nist.javax.sip.LOG_MESSAGE_CONTENT", "false");
/**
* sip_server_log.log 鍜� sip_debug_log.log public static final int TRACE_NONE =
@@ -91,125 +62,50 @@
return sipStack;
}
- @Bean("tcpSipProvider")
+ @Bean(name = "tcpSipProvider")
@DependsOn("sipStack")
- private SipProvider startTcpListener() throws Exception {
- ListeningPoint tcpListeningPoint = sipStack.createListeningPoint(sipConfig.getSipIp(), sipConfig.getSipPort(), "TCP");
- SipProvider tcpSipProvider = sipStack.createSipProvider(tcpListeningPoint);
- tcpSipProvider.addSipListener(this);
- logger.info("Sip Server TCP 鍚姩鎴愬姛 port {" + sipConfig.getSipPort() + "}");
+ private SipProviderImpl startTcpListener() {
+ ListeningPoint tcpListeningPoint = null;
+ SipProviderImpl tcpSipProvider = null;
+ try {
+ tcpListeningPoint = sipStack.createListeningPoint(sipConfig.getMonitorIp(), sipConfig.getPort(), "TCP");
+ tcpSipProvider = (SipProviderImpl)sipStack.createSipProvider(tcpListeningPoint);
+ tcpSipProvider.addSipListener(sipProcessorObserver);
+ logger.info("Sip Server TCP 鍚姩鎴愬姛 port {" + sipConfig.getMonitorIp() + ":" + sipConfig.getPort() + "}");
+ } catch (TransportNotSupportedException e) {
+ e.printStackTrace();
+ } catch (InvalidArgumentException e) {
+ logger.error("鏃犳硶浣跨敤 [ {}:{} ]浣滀负SIP[ TCP ]鏈嶅姟锛屽彲鎺掓煡: 1. sip.monitor-ip 鏄惁涓烘湰鏈虹綉鍗P; 2. sip.port 鏄惁宸茶鍗犵敤"
+ , sipConfig.getMonitorIp(), sipConfig.getPort());
+ } catch (TooManyListenersException e) {
+ e.printStackTrace();
+ } catch (ObjectInUseException e) {
+ e.printStackTrace();
+ }
return tcpSipProvider;
}
- @Bean("udpSipProvider")
+ @Bean(name = "udpSipProvider")
@DependsOn("sipStack")
- private SipProvider startUdpListener() throws Exception {
- ListeningPoint udpListeningPoint = sipStack.createListeningPoint(sipConfig.getSipIp(), sipConfig.getSipPort(), "UDP");
- SipProvider udpSipProvider = sipStack.createSipProvider(udpListeningPoint);
- udpSipProvider.addSipListener(this);
- logger.info("Sip Server TCP 鍚姩鎴愬姛 port {" + sipConfig.getSipPort() + "}");
- return udpSipProvider;
- }
-
- /**
- * SIP鏈嶅姟绔帴鏀舵秷鎭殑鏂规硶 Content 閲岄潰鏄疓BK缂栫爜 This method is called by the SIP stack when a
- * new request arrives.
- */
- @Override
- public void processRequest(RequestEvent evt) {
- // 鐢变簬jainsip鏄崟绾跨▼绋嬪簭锛屼负鎻愰珮鎬ц兘骞跺彂澶勭悊
- processThreadPool.execute(() -> {
- processorFactory.createRequestProcessor(evt).process();
- });
- }
-
- @Override
- public void processResponse(ResponseEvent evt) {
- Response response = evt.getResponse();
- int status = response.getStatusCode();
- if ((status >= 200) && (status < 300)) { // Success!
- ISIPResponseProcessor processor = processorFactory.createResponseProcessor(evt);
- try {
- processor.process(evt, this, sipConfig);
- } catch (ParseException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- // } else if (status == Response.TRYING) {
- // trying涓嶄細鍥炲
- } else if ((status >= 100) && (status < 200)) {
- // 澧炲姞鍏跺畠鏃犻渶鍥炲鐨勫搷搴旓紝濡�101銆�180绛�
- } else {
- logger.warn("鎺ユ敹鍒板け璐ョ殑response鍝嶅簲锛乻tatus锛�" + status + ",message:" + response.getReasonPhrase()/* .getContent().toString()*/);
+ private SipProviderImpl startUdpListener() {
+ ListeningPoint udpListeningPoint = null;
+ SipProviderImpl udpSipProvider = null;
+ try {
+ udpListeningPoint = sipStack.createListeningPoint(sipConfig.getMonitorIp(), sipConfig.getPort(), "UDP");
+ udpSipProvider = (SipProviderImpl)sipStack.createSipProvider(udpListeningPoint);
+ udpSipProvider.addSipListener(sipProcessorObserver);
+ } catch (TransportNotSupportedException e) {
+ e.printStackTrace();
+ } catch (InvalidArgumentException e) {
+ logger.error("鏃犳硶浣跨敤 [ {}:{} ]浣滀负SIP[ UDP ]鏈嶅姟锛屽彲鎺掓煡: 1. sip.monitor-ip 鏄惁涓烘湰鏈虹綉鍗P; 2. sip.port 鏄惁宸茶鍗犵敤"
+ , sipConfig.getMonitorIp(), sipConfig.getPort());
+ } catch (TooManyListenersException e) {
+ e.printStackTrace();
+ } catch (ObjectInUseException e) {
+ e.printStackTrace();
}
- // trying涓嶄細鍥炲
- // if (status == Response.TRYING) {
-
- // }
- }
-
- /**
- * <p>
- * Title: processTimeout
- * </p>
- * <p>
- * Description:
- * </p>
- *
- * @param timeoutEvent
- */
- @Override
- public void processTimeout(TimeoutEvent timeoutEvent) {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * <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
-
- }
-
- /**
- * <p>
- * Title: processDialogTerminated
- * </p>
- * <p>
- * Description:
- * </p>
- *
- * @param dialogTerminatedEvent
- */
- @Override
- public void processDialogTerminated(DialogTerminatedEvent dialogTerminatedEvent) {
- // TODO Auto-generated method stub
-
+ logger.info("Sip Server UDP 鍚姩鎴愬姛 port [" + sipConfig.getMonitorIp() + ":" + sipConfig.getPort() + "]");
+ return udpSipProvider;
}
}
--
Gitblit v1.8.0