From c084d6c98af1ef4d36a61adc719df5db76589428 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 07 十月 2023 18:00:08 +0800
Subject: [PATCH] 优化国标级联心跳失败判断逻辑
---
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java | 281 ++++++++++++++++++++++++++++----------------------------
1 files changed, 141 insertions(+), 140 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 5a8db17..56663f1 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
@@ -1,140 +1,141 @@
-package com.genersoft.iot.vmp.gb28181;
-
-import com.genersoft.iot.vmp.conf.SipConfig;
-import com.genersoft.iot.vmp.conf.UserSetting;
-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.boot.CommandLineRunner;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-import org.springframework.util.ObjectUtils;
-
-import javax.sip.*;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
-@Component
-@Order(value=10)
-public class SipLayer implements CommandLineRunner {
-
- private final static Logger logger = LoggerFactory.getLogger(SipLayer.class);
-
- @Autowired
- private SipConfig sipConfig;
-
- @Autowired
- private ISIPProcessorObserver sipProcessorObserver;
-
- @Autowired
- private UserSetting userSetting;
-
- private final Map<String, SipProviderImpl> tcpSipProviderMap = new ConcurrentHashMap<>();
- private final Map<String, SipProviderImpl> udpSipProviderMap = new ConcurrentHashMap<>();
-
- @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());
- }
-
- SipFactory.getInstance().setPathName("gov.nist");
- if (monitorIps.size() > 0) {
- for (String monitorIp : monitorIps) {
- addListeningPoint(monitorIp, sipConfig.getPort());
- }
- if (udpSipProviderMap.size() + tcpSipProviderMap.size() == 0) {
- System.exit(1);
- }
- }
- }
-
- private void addListeningPoint(String monitorIp, int port){
- SipStackImpl sipStack;
- try {
- sipStack = (SipStackImpl)SipFactory.getInstance().createSipStack(DefaultProperties.getProperties(monitorIp, userSetting.getSipLog()));
- } 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);
- 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);
- }
-
- try {
- ListeningPoint udpListeningPoint = sipStack.createListeningPoint(monitorIp, port, "UDP");
-
- SipProviderImpl udpSipProvider = (SipProviderImpl)sipStack.createSipProvider(udpListeningPoint);
- udpSipProvider.addSipListener(sipProcessorObserver);
-
- 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);
- }
- }
-
- 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();
- }
-}
+package com.genersoft.iot.vmp.gb28181;
+
+import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.gb28181.bean.GbStringMsgParserFactory;
+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.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+
+import javax.sip.*;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Component
+@Order(value=10)
+public class SipLayer implements CommandLineRunner {
+
+ private final static Logger logger = LoggerFactory.getLogger(SipLayer.class);
+
+ @Autowired
+ private SipConfig sipConfig;
+
+ @Autowired
+ private ISIPProcessorObserver sipProcessorObserver;
+
+ @Autowired
+ private UserSetting userSetting;
+
+ private final Map<String, SipProviderImpl> tcpSipProviderMap = new ConcurrentHashMap<>();
+ private final Map<String, SipProviderImpl> udpSipProviderMap = new ConcurrentHashMap<>();
+
+ @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());
+ }
+
+ SipFactory.getInstance().setPathName("gov.nist");
+ if (monitorIps.size() > 0) {
+ for (String monitorIp : monitorIps) {
+ addListeningPoint(monitorIp, sipConfig.getPort());
+ }
+ if (udpSipProviderMap.size() + tcpSipProviderMap.size() == 0) {
+ System.exit(1);
+ }
+ }
+ }
+
+ private void addListeningPoint(String monitorIp, int port){
+ SipStackImpl sipStack;
+ try {
+ sipStack = (SipStackImpl)SipFactory.getInstance().createSipStack(DefaultProperties.getProperties("GB28181_SIP", userSetting.getSipLog()));
+ sipStack.setMessageParserFactory(new GbStringMsgParserFactory());
+ } 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);
+ 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);
+ }
+
+ try {
+ ListeningPoint udpListeningPoint = sipStack.createListeningPoint(monitorIp, port, "UDP");
+
+ SipProviderImpl udpSipProvider = (SipProviderImpl)sipStack.createSipProvider(udpListeningPoint);
+ udpSipProvider.addSipListener(sipProcessorObserver);
+
+ 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);
+ }
+ }
+
+ 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