From e9e4e8d44a885b98e23c159015772c8d82a4878f Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期四, 25 六月 2020 15:16:13 +0800
Subject: [PATCH] 增加对invite其它响应的应对，如101 Dialog Establishement等
---
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java | 197 +++++++++++++++++++++++++++++-------------------
1 files changed, 118 insertions(+), 79 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 4d08fcc..64525d7 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
@@ -1,7 +1,9 @@
package com.genersoft.iot.vmp.gb28181;
+import java.text.ParseException;
import java.util.Properties;
+import javax.annotation.PostConstruct;
import javax.sip.DialogTerminatedEvent;
import javax.sip.IOExceptionEvent;
import javax.sip.ListeningPoint;
@@ -26,7 +28,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Component;
import com.genersoft.iot.vmp.conf.SipConfig;
@@ -37,70 +38,80 @@
import gov.nist.javax.sip.SipStackImpl;
@Component
-public class SipLayer implements SipListener{
-
+public class SipLayer implements SipListener, Runnable {
+
private final static Logger logger = LoggerFactory.getLogger(SipLayer.class);
-
+
@Autowired
- private SipConfig config;
-
+ private SipConfig sipConfig;
+
private SipProvider tcpSipProvider;
-
+
private SipProvider udpSipProvider;
-
+
@Autowired
private SIPProcessorFactory processorFactory;
-
+
private SipStack sipStack;
-
+
private AddressFactory addressFactory;
private HeaderFactory headerFactory;
private MessageFactory messageFactory;
- @Bean
- private boolean initSipServer() throws Exception {
+ @PostConstruct
+ private void initSipServer() {
+ Thread thread = new Thread(this);
+ thread.setDaemon(true);
+ thread.setName("sip server thread start");
+ thread.start();
+ }
+
+ @Override
+ public void run() {
SipFactory sipFactory = SipFactory.getInstance();
sipFactory.setPathName("gov.nist");
- headerFactory = sipFactory.createHeaderFactory();
- addressFactory = sipFactory.createAddressFactory();
- messageFactory = sipFactory.createMessageFactory();
-
- Properties properties = new Properties();
- properties.setProperty("javax.sip.STACK_NAME", "GB28181_SIP");
- properties.setProperty("javax.sip.IP_ADDRESS", config.getSipIp());
- /**
- * sip_server_log.log 鍜� sip_debug_log.log public static final int TRACE_NONE =
- * 0; public static final int TRACE_MESSAGES = 16; public static final int
- * TRACE_EXCEPTION = 17; public static final int TRACE_DEBUG = 32;
- */
- properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL", "16");
- properties.setProperty("gov.nist.javax.sip.SERVER_LOG", "sip_server_log");
- properties.setProperty("gov.nist.javax.sip.DEBUG_LOG", "sip_debug_log");
- sipStack = (SipStackImpl) sipFactory.createSipStack(properties);
-
try {
+ headerFactory = sipFactory.createHeaderFactory();
+
+ addressFactory = sipFactory.createAddressFactory();
+ messageFactory = sipFactory.createMessageFactory();
+
+ Properties properties = new Properties();
+ properties.setProperty("javax.sip.STACK_NAME", "GB28181_SIP");
+ 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 =
+ * 0; public static final int TRACE_MESSAGES = 16; public static final int
+ * TRACE_EXCEPTION = 17; public static final int TRACE_DEBUG = 32;
+ */
+ properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL", "32");
+ properties.setProperty("gov.nist.javax.sip.SERVER_LOG", "sip_server_log");
+ properties.setProperty("gov.nist.javax.sip.DEBUG_LOG", "sip_debug_log");
+ sipStack = (SipStackImpl) sipFactory.createSipStack(properties);
+
startTcpListener();
startUdpListener();
} catch (Exception e) {
- logger.error("Sip Server 鍚姩澶辫触锛� port {"+config.getSipPort()+"}");
+ logger.error("Sip Server 鍚姩澶辫触锛� port {" + sipConfig.getSipPort() + "}");
e.printStackTrace();
- throw e;
}
- logger.info("Sip Server 鍚姩鎴愬姛 port {"+config.getSipPort()+"}");
- return true;
+ 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");
+ }
+
+ private void startUdpListener() throws Exception {
+ ListeningPoint udpListeningPoint = sipStack.createListeningPoint(sipConfig.getSipIp(), sipConfig.getSipPort(),
+ "UDP");
udpSipProvider = sipStack.createSipProvider(udpListeningPoint);
udpSipProvider.addSipListener(this);
- }
+ }
/**
* SIP鏈嶅姟绔帴鏀舵秷鎭殑鏂规硶 Content 閲岄潰鏄疓BK缂栫爜 This method is called by the SIP stack when a
@@ -109,7 +120,7 @@
@Override
public void processRequest(RequestEvent evt) {
ISIPRequestProcessor processor = processorFactory.createRequestProcessor(evt);
- processor.process(evt, this, getServerTransaction(evt));
+ processor.process(evt, this);
}
@Override
@@ -118,61 +129,90 @@
int status = response.getStatusCode();
if ((status >= 200) && (status < 300)) { // Success!
ISIPResponseProcessor processor = processorFactory.createResponseProcessor(evt);
- processor.process(evt,this,config);
+ try {
+ processor.process(evt, this, sipConfig);
+ } catch (ParseException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ // } else if (status == Response.TRYING) {
+ // trying涓嶄細鍥炲
+ } else if ((status >= 100) && (status < 200)) {
+ // 澧炲姞鍏跺畠鏃犻渶鍥炲鐨勫搷搴旓紝濡�101銆�180绛�
} else {
- logger.warn("鎺ユ敹鍒板け璐ョ殑response鍝嶅簲锛乻tatus锛�"+status+",message:"+response.getContent().toString());
+ logger.warn("鎺ユ敹鍒板け璐ョ殑response鍝嶅簲锛乻tatus锛�" + status + ",message:" + response.getReasonPhrase()/* .getContent().toString()*/);
}
- //trying涓嶄細鍥炲
- if(status == Response.TRYING){
+ // trying涓嶄細鍥炲
+ // if (status == Response.TRYING) {
- }
+ // }
}
- /**
- * <p>Title: processTimeout</p>
- * <p>Description: </p>
- * @param timeoutEvent
- */
+ /**
+ * <p>
+ * Title: processTimeout
+ * </p>
+ * <p>
+ * Description:
+ * </p>
+ *
+ * @param timeoutEvent
+ */
@Override
public void processTimeout(TimeoutEvent timeoutEvent) {
// TODO Auto-generated method stub
-
+
}
- /**
- * <p>Title: processIOException</p>
- * <p>Description: </p>
- * @param exceptionEvent
- */
+ /**
+ * <p>
+ * Title: processIOException
+ * </p>
+ * <p>
+ * Description:
+ * </p>
+ *
+ * @param exceptionEvent
+ */
@Override
public void processIOException(IOExceptionEvent exceptionEvent) {
// TODO Auto-generated method stub
-
+
}
- /**
- * <p>Title: processTransactionTerminated</p>
- * <p>Description: </p>
- * @param transactionTerminatedEvent
- */
+ /**
+ * <p>
+ * Title: processTransactionTerminated
+ * </p>
+ * <p>
+ * Description:
+ * </p>
+ *
+ * @param transactionTerminatedEvent
+ */
@Override
public void processTransactionTerminated(TransactionTerminatedEvent transactionTerminatedEvent) {
// TODO Auto-generated method stub
-
+
}
- /**
- * <p>Title: processDialogTerminated</p>
- * <p>Description: </p>
- * @param dialogTerminatedEvent
- */
+ /**
+ * <p>
+ * Title: processDialogTerminated
+ * </p>
+ * <p>
+ * Description:
+ * </p>
+ *
+ * @param dialogTerminatedEvent
+ */
@Override
public void processDialogTerminated(DialogTerminatedEvent dialogTerminatedEvent) {
// TODO Auto-generated method stub
-
+
}
-
- private ServerTransaction getServerTransaction(RequestEvent evt) {
+
+ public ServerTransaction getServerTransaction(RequestEvent evt) {
Request request = evt.getRequest();
ServerTransaction serverTransaction = evt.getServerTransaction();
// 鍒ゆ柇TCP杩樻槸UDP
@@ -185,11 +225,11 @@
if (serverTransaction == null) {
try {
- if (isTcp) {
- serverTransaction = tcpSipProvider.getNewServerTransaction(request);
- } else {
- serverTransaction = udpSipProvider.getNewServerTransaction(request);
- }
+ if (isTcp) {
+ serverTransaction = tcpSipProvider.getNewServerTransaction(request);
+ } else {
+ serverTransaction = udpSipProvider.getNewServerTransaction(request);
+ }
} catch (TransactionAlreadyExistsException e) {
e.printStackTrace();
} catch (TransactionUnavailableException e) {
@@ -198,7 +238,6 @@
}
return serverTransaction;
}
-
public AddressFactory getAddressFactory() {
return addressFactory;
@@ -219,5 +258,5 @@
public SipProvider getUdpSipProvider() {
return udpSipProvider;
}
-
+
}
--
Gitblit v1.8.0