From b86f0aaae2f0212bc01ddfd3e5d646c22eb1d8c0 Mon Sep 17 00:00:00 2001
From: panll <m18010473990@163.com>
Date: 星期五, 08 三月 2024 09:33:38 +0800
Subject: [PATCH] !28 语音对讲合并 语音对讲合并
---
src/main/java/com/genersoft/iot/vmp/gb28181/conf/DefaultProperties.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/conf/DefaultProperties.java b/src/main/java/com/genersoft/iot/vmp/gb28181/conf/DefaultProperties.java
old mode 100644
new mode 100755
index e0691e5..e2c9ef5
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/conf/DefaultProperties.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/conf/DefaultProperties.java
@@ -1,5 +1,9 @@
package com.genersoft.iot.vmp.gb28181.conf;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.cmd.AlarmNotifyMessageHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.Properties;
/**
@@ -8,10 +12,11 @@
*/
public class DefaultProperties {
- public static Properties getProperties(String ip, boolean isDebug) {
+ public static Properties getProperties(String name, boolean sipLog) {
Properties properties = new Properties();
- properties.setProperty("javax.sip.STACK_NAME", "GB28181_SIP");
- properties.setProperty("javax.sip.IP_ADDRESS", ip);
+ properties.setProperty("javax.sip.STACK_NAME", name);
+// properties.setProperty("javax.sip.IP_ADDRESS", ip);
+ // 鍏抽棴鑷姩浼氳瘽
properties.setProperty("javax.sip.AUTOMATIC_DIALOG_SUPPORT", "off");
/**
* 瀹屾暣閰嶇疆鍙傝�� gov.nist.javax.sip.SipStackImpl锛岄渶瑕佷笅杞芥簮鐮�
@@ -20,27 +25,39 @@
*/
// * gov/nist/javax/sip/SipStackImpl.class
- if (isDebug) {
- properties.setProperty("gov.nist.javax.sip.LOG_MESSAGE_CONTENT", "false");
- }
// 鎺ユ敹鎵�鏈塶otify璇锋眰锛屽嵆浣挎病鏈夎闃�
properties.setProperty("gov.nist.javax.sip.DELIVER_UNSOLICITED_NOTIFY", "true");
properties.setProperty("gov.nist.javax.sip.AUTOMATIC_DIALOG_ERROR_HANDLING", "false");
- properties.setProperty("gov.nist.javax.sip.CANCEL_CLIENT_TRANSACTION_CHECKED", "false");
+ properties.setProperty("gov.nist.javax.sip.CANCEL_CLIENT_TRANSACTION_CHECKED", "true");
// 涓篲NULL _瀵硅瘽妗嗕紶閫抇缁堟鐨刜浜嬩欢
properties.setProperty("gov.nist.javax.sip.DELIVER_TERMINATED_EVENT_FOR_NULL_DIALOG", "true");
+ // 鏄惁鑷姩璁＄畻content length鐨勫疄闄呴暱搴︼紝榛樿涓嶈绠�
+ properties.setProperty("gov.nist.javax.sip.COMPUTE_CONTENT_LENGTH_FROM_MESSAGE_BODY", "true");
// 浼氳瘽娓呯悊绛栫暐
properties.setProperty("gov.nist.javax.sip.RELEASE_REFERENCES_STRATEGY", "Normal");
// 澶勭悊鐢辫鏈嶅姟鍣ㄥ鐞嗙殑鍩轰簬搴曞眰TCP鐨勪繚鎸佺敓瀛樿秴鏃�
properties.setProperty("gov.nist.javax.sip.RELIABLE_CONNECTION_KEEP_ALIVE_TIMEOUT", "60");
// 鑾峰彇瀹為檯鍐呭闀垮害锛屼笉浣跨敤header涓殑闀垮害淇℃伅
properties.setProperty("gov.nist.javax.sip.COMPUTE_CONTENT_LENGTH_FROM_MESSAGE_BODY", "true");
+ // 绾跨▼鍙噸鍏�
+ properties.setProperty("gov.nist.javax.sip.REENTRANT_LISTENER", "true");
+ // 瀹氫箟搴旂敤绋嬪簭鎵撶畻澶氫箙瀹¤涓�娆� SIP 鍫嗘爤锛屼簡瑙ｅ叾鍐呴儴绾跨▼鐨勫仴搴风姸鍐碉紙璇ュ睘鎬ф寚瀹氳繛缁璁′箣闂寸殑鏃堕棿锛堜互姣涓哄崟浣嶏級锛�
+ properties.setProperty("gov.nist.javax.sip.THREAD_AUDIT_INTERVAL_IN_MILLISECS", "30000");
+
+// properties.setProperty("gov.nist.javax.sip.MESSAGE_PROCESSOR_FACTORY", "gov.nist.javax.sip.stack.NioMessageProcessorFactory");
/**
* sip_server_log.log 鍜� sip_debug_log.log ERROR, INFO, WARNING, OFF, DEBUG, TRACE
*/
- properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL", "ERROR");
-
+ Logger logger = LoggerFactory.getLogger(AlarmNotifyMessageHandler.class);
+ if (sipLog) {
+ properties.setProperty("gov.nist.javax.sip.STACK_LOGGER", "com.genersoft.iot.vmp.gb28181.conf.StackLoggerImpl");
+ properties.setProperty("gov.nist.javax.sip.SERVER_LOGGER", "com.genersoft.iot.vmp.gb28181.conf.ServerLoggerImpl");
+ properties.setProperty("gov.nist.javax.sip.LOG_MESSAGE_CONTENT", "true");
+ logger.info("[SIP鏃ュ織]宸插紑鍚�");
+ }else {
+ logger.info("[SIP鏃ュ織]宸插叧闂�");
+ }
return properties;
}
}
--
Gitblit v1.8.0