From 43ef195543c087d88ac3eea98067b81d7e2b10c2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 03 七月 2023 16:54:09 +0800
Subject: [PATCH] Merge branch '2.6.8' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 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 24b88e5..5a8db17 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
@@ -1,6 +1,7 @@
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;
@@ -18,7 +19,7 @@
import java.util.concurrent.ConcurrentHashMap;
@Component
-@Order(value=1)
+@Order(value=10)
public class SipLayer implements CommandLineRunner {
private final static Logger logger = LoggerFactory.getLogger(SipLayer.class);
@@ -29,10 +30,11 @@
@Autowired
private ISIPProcessorObserver sipProcessorObserver;
+ @Autowired
+ private UserSetting userSetting;
+
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) {
@@ -46,8 +48,7 @@
monitorIps.add(sipConfig.getIp());
}
- sipFactory = SipFactory.getInstance();
- sipFactory.setPathName("gov.nist");
+ SipFactory.getInstance().setPathName("gov.nist");
if (monitorIps.size() > 0) {
for (String monitorIp : monitorIps) {
addListeningPoint(monitorIp, sipConfig.getPort());
@@ -61,9 +62,9 @@
private void addListeningPoint(String monitorIp, int port){
SipStackImpl sipStack;
try {
- sipStack = (SipStackImpl)sipFactory.createSipStack(DefaultProperties.getProperties(monitorIp, false));
+ sipStack = (SipStackImpl)SipFactory.getInstance().createSipStack(DefaultProperties.getProperties(monitorIp, userSetting.getSipLog()));
} catch (PeerUnavailableException e) {
- logger.error("[Sip Server] SIP鏈嶅姟鍚姩澶辫触锛� 鐩戝惉鍦板潃{}澶辫触,璇锋鏌p鏄惁姝ｇ‘", monitorIp);
+ logger.error("[SIP SERVER] SIP鏈嶅姟鍚姩澶辫触锛� 鐩戝惉鍦板潃{}澶辫触,璇锋鏌p鏄惁姝ｇ‘", monitorIp);
return;
}
@@ -75,12 +76,12 @@
tcpSipProvider.addSipListener(sipProcessorObserver);
tcpSipProviderMap.put(monitorIp, tcpSipProvider);
- logger.info("[Sip Server] tcp://{}:{} 鍚姩鎴愬姛", monitorIp, port);
+ logger.info("[SIP SERVER] tcp://{}:{} 鍚姩鎴愬姛", monitorIp, port);
} catch (TransportNotSupportedException
| TooManyListenersException
| ObjectInUseException
| InvalidArgumentException e) {
- logger.error("[Sip Server] tcp://{}:{} SIP鏈嶅姟鍚姩澶辫触,璇锋鏌ョ鍙ｆ槸鍚﹁鍗犵敤鎴栬�卛p鏄惁姝ｇ‘"
+ logger.error("[SIP SERVER] tcp://{}:{} SIP鏈嶅姟鍚姩澶辫触,璇锋鏌ョ鍙ｆ槸鍚﹁鍗犵敤鎴栬�卛p鏄惁姝ｇ‘"
, monitorIp, port);
}
@@ -92,18 +93,14 @@
udpSipProviderMap.put(monitorIp, udpSipProvider);
- logger.info("[Sip Server] udp://{}:{} 鍚姩鎴愬姛", monitorIp, port);
+ logger.info("[SIP SERVER] udp://{}:{} 鍚姩鎴愬姛", monitorIp, port);
} catch (TransportNotSupportedException
| TooManyListenersException
| ObjectInUseException
| InvalidArgumentException e) {
- logger.error("[Sip Server] udp://{}:{} SIP鏈嶅姟鍚姩澶辫触,璇锋鏌ョ鍙ｆ槸鍚﹁鍗犵敤鎴栬�卛p鏄惁姝ｇ‘"
+ logger.error("[SIP SERVER] udp://{}:{} SIP鏈嶅姟鍚姩澶辫触,璇锋鏌ョ鍙ｆ槸鍚﹁鍗犵敤鎴栬�卛p鏄惁姝ｇ‘"
, monitorIp, port);
}
- }
-
- public SipFactory getSipFactory() {
- return sipFactory;
}
public SipProviderImpl getUdpSipProvider(String ip) {
--
Gitblit v1.8.0