From a53dce38c2f58c0bfd37203e46dc57aa56025f45 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 17 十一月 2022 18:22:24 +0800
Subject: [PATCH] Merge pull request #673 from 648540858/wvp-28181-2.0-multi-network
---
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java | 161 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 105 insertions(+), 56 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 6cd1924..13fa01d 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
@@ -8,16 +8,18 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.DependsOn;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
import javax.sip.*;
-import java.util.Properties;
-import java.util.TooManyListenersException;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
-@Configuration
-public class SipLayer{
+@Component
+@Order(value=1)
+public class SipLayer implements CommandLineRunner {
private final static Logger logger = LoggerFactory.getLogger(SipLayer.class);
@@ -27,70 +29,117 @@
@Autowired
private ISIPProcessorObserver sipProcessorObserver;
- private SipStackImpl sipStack;
+
+
+ private final Map<String, SipProviderImpl> tcpSipProviderMap = new ConcurrentHashMap<>();
+ private final Map<String, SipProviderImpl> udpSipProviderMap = new ConcurrentHashMap<>();
private SipFactory sipFactory;
+ @Override
+ public void run(String... args) {
+ List<String> monitorIps = new ArrayList<>();
+ // 浣跨敤閫楀彿鍒嗗壊澶氫釜ip
+ String separator = ",";
+ if (sipConfig.getIp().indexOf(separator) > 0) {
+ String[] split = sipConfig.getIp().split(separator);
+ monitorIps.addAll(Arrays.asList(split));
+ }else {
+ monitorIps.add(sipConfig.getIp());
+ }
- @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;
+ if (monitorIps.size() > 0) {
+ for (String monitorIp : monitorIps) {
+ addListeningPoint(monitorIp, sipConfig.getPort());
+ }
+ if (udpSipProviderMap.size() + tcpSipProviderMap.size() == 0) {
+ System.exit(1);
+ }
+ }
}
- @Bean(name = "tcpSipProvider")
- @DependsOn("sipStack")
- SipProviderImpl startTcpListener() {
- ListeningPoint tcpListeningPoint = null;
- SipProviderImpl tcpSipProvider = null;
+ private void addListeningPoint(String monitorIp, int port){
+ SipStackImpl sipStack;
try {
- tcpListeningPoint = sipStack.createListeningPoint(sipConfig.getMonitorIp(), sipConfig.getPort(), "TCP");
- tcpSipProvider = (SipProviderImpl)sipStack.createSipProvider(tcpListeningPoint);
+ sipStack = (SipStackImpl)sipFactory.createSipStack(DefaultProperties.getProperties(monitorIp, false));
+ } catch (PeerUnavailableException e) {
+ logger.error("[Sip Server] SIP鏈嶅姟鍚姩澶辫触锛� 鐩戝惉鍦板潃{}澶辫触,璇锋鏌p鏄惁姝ｇ‘", monitorIp);
+ return;
+ }
+
+ try {
+ ListeningPoint tcpListeningPoint = sipStack.createListeningPoint(monitorIp, port, "TCP");
+ SipProviderImpl 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();
+ tcpSipProviderMap.put(monitorIp, tcpSipProvider);
+
+ logger.info("[Sip Server] tcp://{}:{} 鍚姩鎴愬姛", monitorIp, port);
+ } catch (TransportNotSupportedException
+ | TooManyListenersException
+ | ObjectInUseException
+ | InvalidArgumentException e) {
+ logger.error("[Sip Server] tcp://{}:{} SIP鏈嶅姟鍚姩澶辫触,璇锋鏌ョ鍙ｆ槸鍚﹁鍗犵敤鎴栬�卛p鏄惁姝ｇ‘"
+ , monitorIp, port);
}
- return tcpSipProvider;
- }
-
- @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);
+ ListeningPoint udpListeningPoint = sipStack.createListeningPoint(monitorIp, port, "UDP");
+
+ SipProviderImpl 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();
+
+ udpSipProviderMap.put(monitorIp, udpSipProvider);
+
+ logger.info("[Sip Server] udp://{}:{} 鍚姩鎴愬姛", monitorIp, port);
+ } catch (TransportNotSupportedException
+ | TooManyListenersException
+ | ObjectInUseException
+ | InvalidArgumentException e) {
+ logger.error("[Sip Server] udp://{}:{} SIP鏈嶅姟鍚姩澶辫触,璇锋鏌ョ鍙ｆ槸鍚﹁鍗犵敤鎴栬�卛p鏄惁姝ｇ‘"
+ , monitorIp, port);
}
- logger.info("[Sip Server] UDP 鍚姩鎴愬姛 {}:{}", sipConfig.getMonitorIp(), sipConfig.getPort());
- return udpSipProvider;
}
+ public SipFactory getSipFactory() {
+ return sipFactory;
+ }
+
+ public SipProviderImpl getUdpSipProvider(String ip) {
+ if (ObjectUtils.isEmpty(ip)) {
+ return null;
+ }
+ return udpSipProviderMap.get(ip);
+ }
+
+ public SipProviderImpl getUdpSipProvider() {
+ if (udpSipProviderMap.size() != 1) {
+ return null;
+ }
+ return udpSipProviderMap.values().stream().findFirst().get();
+ }
+
+ public SipProviderImpl getTcpSipProvider() {
+ if (tcpSipProviderMap.size() != 1) {
+ return null;
+ }
+ return tcpSipProviderMap.values().stream().findFirst().get();
+ }
+
+ public SipProviderImpl getTcpSipProvider(String ip) {
+ if (ObjectUtils.isEmpty(ip)) {
+ return null;
+ }
+ return tcpSipProviderMap.get(ip);
+ }
+
+ public String getLocalIp(String deviceLocalIp) {
+ if (!ObjectUtils.isEmpty(deviceLocalIp)) {
+ return deviceLocalIp;
+ }
+ return getUdpSipProvider().getListeningPoint().getIPAddress();
+ }
}
--
Gitblit v1.8.0