From 3a502b36a8cfcdd455edb22e5771115559873731 Mon Sep 17 00:00:00 2001
From: songww <songww@inspur.com>
Date: 星期日, 10 五月 2020 22:33:21 +0800
Subject: [PATCH] 完善ssrc符合国标,并完善很多小问题

---
 src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 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 273f4ed..2f585d2 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
@@ -42,7 +42,7 @@
 	private final static Logger logger = LoggerFactory.getLogger(SipLayer.class);
 
 	@Autowired
-	private SipConfig config;
+	private SipConfig sipConfig;
 
 	private SipProvider tcpSipProvider;
 
@@ -77,7 +77,7 @@
 
 			Properties properties = new Properties();
 			properties.setProperty("javax.sip.STACK_NAME", "GB28181_SIP");
-			properties.setProperty("javax.sip.IP_ADDRESS", config.getSipIp());
+			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 =
@@ -92,20 +92,20 @@
 			startTcpListener();
 			startUdpListener();
 		} catch (Exception e) {
-			logger.error("Sip Server 鍚姩澶辫触锛� port {" + config.getSipPort() + "}");
+			logger.error("Sip Server 鍚姩澶辫触锛� port {" + sipConfig.getSipPort() + "}");
 			e.printStackTrace();
 		}
-		logger.info("Sip Server 鍚姩鎴愬姛 port {" + config.getSipPort() + "}");
+		logger.info("Sip Server 鍚姩鎴愬姛 port {" + sipConfig.getSipPort() + "}");
 	}
 
 	private void startTcpListener() throws Exception {
-		ListeningPoint tcpListeningPoint = sipStack.createListeningPoint(config.getSipIp(), config.getSipPort(), "TCP");
+		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(config.getSipIp(), config.getSipPort(), "UDP");
+		ListeningPoint udpListeningPoint = sipStack.createListeningPoint(sipConfig.getSipIp(), sipConfig.getSipPort(), "UDP");
 		udpSipProvider = sipStack.createSipProvider(udpListeningPoint);
 		udpSipProvider.addSipListener(this);
 	}
@@ -126,7 +126,7 @@
 		int status = response.getStatusCode();
 		if ((status >= 200) && (status < 300)) { // Success!
 			ISIPResponseProcessor processor = processorFactory.createResponseProcessor(evt);
-			processor.process(evt, this, config);
+			processor.process(evt, this, sipConfig);
 		} else {
 			logger.warn("鎺ユ敹鍒板け璐ョ殑response鍝嶅簲锛乻tatus锛�" + status + ",message:" + response.getContent().toString());
 		}

--
Gitblit v1.8.0