From 1af77ab5f7c11a4b3d59c1989b51b9fca29679ce Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 18 十月 2022 22:18:49 +0800
Subject: [PATCH] Merge pull request #645 from IKangXu/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java | 302 +++++++++++---------------------------------------
1 files changed, 68 insertions(+), 234 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 0f6a092..6cd1924 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
@@ -1,261 +1,95 @@
package com.genersoft.iot.vmp.gb28181;
-import java.text.ParseException;
-import java.util.Properties;
-
-import javax.annotation.PostConstruct;
-import javax.sip.DialogTerminatedEvent;
-import javax.sip.IOExceptionEvent;
-import javax.sip.ListeningPoint;
-import javax.sip.RequestEvent;
-import javax.sip.ResponseEvent;
-import javax.sip.ServerTransaction;
-import javax.sip.SipFactory;
-import javax.sip.SipListener;
-import javax.sip.SipProvider;
-import javax.sip.SipStack;
-import javax.sip.TimeoutEvent;
-import javax.sip.TransactionAlreadyExistsException;
-import javax.sip.TransactionTerminatedEvent;
-import javax.sip.TransactionUnavailableException;
-import javax.sip.address.AddressFactory;
-import javax.sip.header.HeaderFactory;
-import javax.sip.header.ViaHeader;
-import javax.sip.message.MessageFactory;
-import javax.sip.message.Request;
-import javax.sip.message.Response;
-
+import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.gb28181.conf.DefaultProperties;
+import com.genersoft.iot.vmp.gb28181.transmit.ISIPProcessorObserver;
+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;
-import org.springframework.stereotype.Component;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
-import com.genersoft.iot.vmp.conf.SipConfig;
-import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorFactory;
-import com.genersoft.iot.vmp.gb28181.transmit.request.ISIPRequestProcessor;
-import com.genersoft.iot.vmp.gb28181.transmit.response.ISIPResponseProcessor;
+import javax.sip.*;
+import java.util.Properties;
+import java.util.TooManyListenersException;
-import gov.nist.javax.sip.SipStackImpl;
-
-@Component
-public class SipLayer implements SipListener, Runnable {
+@Configuration
+public class SipLayer{
private final static Logger logger = LoggerFactory.getLogger(SipLayer.class);
@Autowired
private SipConfig sipConfig;
- private SipProvider tcpSipProvider;
-
- private SipProvider udpSipProvider;
-
@Autowired
- private SIPProcessorFactory processorFactory;
+ private ISIPProcessorObserver sipProcessorObserver;
- private SipStack sipStack;
+ private SipStackImpl sipStack;
- private AddressFactory addressFactory;
- private HeaderFactory headerFactory;
- private MessageFactory messageFactory;
+ private SipFactory sipFactory;
- @PostConstruct
- private void initSipServer() {
- Thread thread = new Thread(this);
- thread.setDaemon(true);
- thread.setName("sip server thread start");
- thread.start();
+
+ @Bean("sipFactory")
+ SipFactory createSipFactory() {
+ sipFactory = SipFactory.getInstance();
+ sipFactory.setPathName("gov.nist");
+ return sipFactory;
+ }
+
+ @Bean("sipStack")
+ @DependsOn({"sipFactory"})
+ SipStackImpl createSipStack() throws PeerUnavailableException {
+ sipStack = ( SipStackImpl )sipFactory.createSipStack(DefaultProperties.getProperties(sipConfig.getMonitorIp(), false));
+ return sipStack;
}
- @Override
- public void run() {
- SipFactory sipFactory = SipFactory.getInstance();
- sipFactory.setPathName("gov.nist");
+ @Bean(name = "tcpSipProvider")
+ @DependsOn("sipStack")
+ SipProviderImpl startTcpListener() {
+ ListeningPoint tcpListeningPoint = null;
+ SipProviderImpl tcpSipProvider = null;
try {
- headerFactory = sipFactory.createHeaderFactory();
-
- addressFactory = sipFactory.createAddressFactory();
- messageFactory = sipFactory.createMessageFactory();
-
- Properties properties = new Properties();
- properties.setProperty("javax.sip.STACK_NAME", "GB28181_SIP");
- properties.setProperty("javax.sip.IP_ADDRESS", sipConfig.getSipIp());
- properties.setProperty("gov.nist.javax.sip.LOG_MESSAGE_CONTENT", "false");
- /**
- * sip_server_log.log 鍜� sip_debug_log.log public static final int TRACE_NONE =
- * 0; public static final int TRACE_MESSAGES = 16; public static final int
- * TRACE_EXCEPTION = 17; public static final int TRACE_DEBUG = 32;
- */
- properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL", "32");
- properties.setProperty("gov.nist.javax.sip.SERVER_LOG", "sip_server_log");
- properties.setProperty("gov.nist.javax.sip.DEBUG_LOG", "sip_debug_log");
- sipStack = (SipStackImpl) sipFactory.createSipStack(properties);
-
- startTcpListener();
- startUdpListener();
- } catch (Exception e) {
- logger.error("Sip Server 鍚姩澶辫触锛� port {" + sipConfig.getSipPort() + "}");
+ tcpListeningPoint = sipStack.createListeningPoint(sipConfig.getMonitorIp(), sipConfig.getPort(), "TCP");
+ tcpSipProvider = (SipProviderImpl)sipStack.createSipProvider(tcpListeningPoint);
+ tcpSipProvider.setDialogErrorsAutomaticallyHandled();
+ tcpSipProvider.addSipListener(sipProcessorObserver);
+ logger.info("[Sip Server] TCP 鍚姩鎴愬姛 {}:{}", sipConfig.getMonitorIp(), sipConfig.getPort());
+ } catch (TransportNotSupportedException e) {
+ e.printStackTrace();
+ } catch (InvalidArgumentException e) {
+ logger.error("[Sip Server] 鏃犳硶浣跨敤 [ {}:{} ]浣滀负SIP[ TCP ]鏈嶅姟锛屽彲鎺掓煡: 1. sip.monitor-ip 鏄惁涓烘湰鏈虹綉鍗P; 2. sip.port 鏄惁宸茶鍗犵敤"
+ , sipConfig.getMonitorIp(), sipConfig.getPort());
+ } catch (TooManyListenersException e) {
+ e.printStackTrace();
+ } catch (ObjectInUseException e) {
e.printStackTrace();
}
- logger.info("Sip Server 鍚姩鎴愬姛 port {" + sipConfig.getSipPort() + "}");
- }
-
- private void startTcpListener() throws Exception {
- ListeningPoint tcpListeningPoint = sipStack.createListeningPoint(sipConfig.getSipIp(), sipConfig.getSipPort(),
- "TCP");
- tcpSipProvider = sipStack.createSipProvider(tcpListeningPoint);
- tcpSipProvider.addSipListener(this);
- }
-
- private void startUdpListener() throws Exception {
- ListeningPoint udpListeningPoint = sipStack.createListeningPoint(sipConfig.getSipIp(), sipConfig.getSipPort(),
- "UDP");
- udpSipProvider = sipStack.createSipProvider(udpListeningPoint);
- udpSipProvider.addSipListener(this);
- }
-
- /**
- * SIP鏈嶅姟绔帴鏀舵秷鎭殑鏂规硶 Content 閲岄潰鏄疓BK缂栫爜 This method is called by the SIP stack when a
- * new request arrives.
- */
- @Override
- public void processRequest(RequestEvent evt) {
- ISIPRequestProcessor processor = processorFactory.createRequestProcessor(evt);
- processor.process(evt, this);
- }
-
- @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()*/);
- }
- // 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
-
- }
-
- public ServerTransaction getServerTransaction(RequestEvent evt) {
- Request request = evt.getRequest();
- ServerTransaction serverTransaction = evt.getServerTransaction();
- // 鍒ゆ柇TCP杩樻槸UDP
- boolean isTcp = false;
- ViaHeader reqViaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
- String transport = reqViaHeader.getTransport();
- if (transport.equals("TCP")) {
- isTcp = true;
- }
-
- if (serverTransaction == null) {
- try {
- if (isTcp) {
- serverTransaction = tcpSipProvider.getNewServerTransaction(request);
- } else {
- serverTransaction = udpSipProvider.getNewServerTransaction(request);
- }
- } catch (TransactionAlreadyExistsException e) {
- e.printStackTrace();
- } catch (TransactionUnavailableException e) {
- e.printStackTrace();
- }
- }
- return serverTransaction;
- }
-
- public AddressFactory getAddressFactory() {
- return addressFactory;
- }
-
- public HeaderFactory getHeaderFactory() {
- return headerFactory;
- }
-
- public MessageFactory getMessageFactory() {
- return messageFactory;
- }
-
- public SipProvider getTcpSipProvider() {
return tcpSipProvider;
}
-
- public SipProvider getUdpSipProvider() {
+
+ @Bean(name = "udpSipProvider")
+ @DependsOn("sipStack")
+ 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 Server] 鏃犳硶浣跨敤 [ {}:{} ]浣滀负SIP[ UDP ]鏈嶅姟锛屽彲鎺掓煡: 1. sip.monitor-ip 鏄惁涓烘湰鏈虹綉鍗P; 2. sip.port 鏄惁宸茶鍗犵敤"
+ , sipConfig.getMonitorIp(), sipConfig.getPort());
+ } catch (TooManyListenersException e) {
+ e.printStackTrace();
+ } catch (ObjectInUseException e) {
+ e.printStackTrace();
+ }
+ logger.info("[Sip Server] UDP 鍚姩鎴愬姛 {}:{}", sipConfig.getMonitorIp(), sipConfig.getPort());
return udpSipProvider;
}
--
Gitblit v1.8.0