From 92cbbefcf4773ba136f15afa1ca89e9c050b1aba Mon Sep 17 00:00:00 2001
From: swwhaha <swwheihei@163.com>
Date: 星期五, 26 六月 2020 12:05:23 +0800
Subject: [PATCH] Merge pull request #10 from lawrencehj/master
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java | 94 +++++++++++++++++++-----------
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java | 14 +++-
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java | 8 ++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java | 15 +++++
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 2
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java | 3
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/ISIPResponseProcessor.java | 4 +
7 files changed, 97 insertions(+), 43 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 b70c5eb..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,5 +1,6 @@
package com.genersoft.iot.vmp.gb28181;
+import java.text.ParseException;
import java.util.Properties;
import javax.annotation.PostConstruct;
@@ -128,11 +129,18 @@
int status = response.getStatusCode();
if ((status >= 200) && (status < 300)) { // Success!
ISIPResponseProcessor processor = processorFactory.createResponseProcessor(evt);
- processor.process(evt, this, sipConfig);
- } else if (status == Response.TRYING) {
+ 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) {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
index c15b9b6..7a95268 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
@@ -79,7 +79,8 @@
SipURI requestLine = layer.getAddressFactory().createSipURI(channelId, host.getAddress());
//via
ArrayList<ViaHeader> viaHeaders = new ArrayList<ViaHeader>();
- ViaHeader viaHeader = layer.getHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(), device.getTransport(), viaTag);
+ // ViaHeader viaHeader = layer.getHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(), device.getTransport(), viaTag);
+ ViaHeader viaHeader = layer.getHeaderFactory().createViaHeader(device.getHost().getIp(), device.getHost().getPort(), device.getTransport(), viaTag);
viaHeader.setRPort();
viaHeaders.add(viaHeader);
//from
@@ -108,6 +109,7 @@
request = layer.getMessageFactory().createRequest(requestLine, Request.INVITE, callIdHeader, cSeqHeader,fromHeader, toHeader, viaHeaders, maxForwards);
Address concatAddress = layer.getAddressFactory().createAddress(layer.getAddressFactory().createSipURI(sipConfig.getSipId(), sipConfig.getSipIp()+":"+sipConfig.getSipPort()));
+ // Address concatAddress = layer.getAddressFactory().createAddress(layer.getAddressFactory().createSipURI(sipConfig.getSipId(), device.getHost().getIp()+":"+device.getHost().getPort()));
request.addHeader(layer.getHeaderFactory().createContactHeader(concatAddress));
ContentTypeHeader contentTypeHeader = layer.getHeaderFactory().createContentTypeHeader("Application", "SDP");
@@ -122,7 +124,8 @@
SipURI requestLine = layer.getAddressFactory().createSipURI(device.getDeviceId(), host.getAddress());
//via
ArrayList<ViaHeader> viaHeaders = new ArrayList<ViaHeader>();
- ViaHeader viaHeader = layer.getHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(), device.getTransport(), viaTag);
+ // ViaHeader viaHeader = layer.getHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(), device.getTransport(), viaTag);
+ ViaHeader viaHeader = layer.getHeaderFactory().createViaHeader(device.getHost().getIp(), device.getHost().getPort(), device.getTransport(), viaTag);
viaHeader.setRPort();
viaHeaders.add(viaHeader);
//from
@@ -151,6 +154,7 @@
request = layer.getMessageFactory().createRequest(requestLine, Request.INVITE, callIdHeader, cSeqHeader,fromHeader, toHeader, viaHeaders, maxForwards);
Address concatAddress = layer.getAddressFactory().createAddress(layer.getAddressFactory().createSipURI(sipConfig.getSipId(), sipConfig.getSipIp()+":"+sipConfig.getSipPort()));
+ // Address concatAddress = layer.getAddressFactory().createAddress(layer.getAddressFactory().createSipURI(sipConfig.getSipId(), device.getHost().getIp()+":"+device.getHost().getPort()));
request.addHeader(layer.getHeaderFactory().createContactHeader(concatAddress));
ContentTypeHeader contentTypeHeader = layer.getHeaderFactory().createContentTypeHeader("Application", "SDP");
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
index b70f353..96618d0 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
@@ -7,10 +7,13 @@
import javax.sip.InvalidArgumentException;
import javax.sip.SipException;
import javax.sip.TransactionDoesNotExistException;
+import javax.sip.address.Address;
+import javax.sip.address.SipURI;
import javax.sip.header.ViaHeader;
import javax.sip.message.Request;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.security.SecurityProperties.Headers;
import org.springframework.stereotype.Component;
import com.genersoft.iot.vmp.conf.SipConfig;
@@ -20,6 +23,9 @@
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderProvider;
import com.genersoft.iot.vmp.gb28181.utils.DateUtil;
+
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
/**
* @Description:璁惧鑳藉姏鎺ュ彛锛岀敤浜庡畾涔夎澶囩殑鎺у埗銆佹煡璇㈣兘鍔�
@@ -288,6 +294,13 @@
return;
}
Request byeRequest = dialog.createRequest(Request.BYE);
+ SipURI byeURI = (SipURI) byeRequest.getRequestURI();
+ String vh = transaction.getRequest().getHeader(ViaHeader.NAME).toString();
+ Pattern p = Pattern.compile("(\\d+\\.\\d+\\.\\d+\\.\\d+)\\:(\\d+)");
+ Matcher matcher = p.matcher(vh);
+ if (matcher.find()) {
+ byeURI.setHost(matcher.group(1));
+ }
ViaHeader viaHeader = (ViaHeader) byeRequest.getHeader(ViaHeader.NAME);
String protocol = viaHeader.getTransport().toUpperCase();
ClientTransaction clientTransaction = null;
@@ -301,6 +314,8 @@
e.printStackTrace();
} catch (SipException e) {
e.printStackTrace();
+ } catch (ParseException e) {
+ e.printStackTrace();
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
index fd5ca37..f5c3c8b 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
@@ -100,6 +100,7 @@
Request request = evt.getRequest();
SAXReader reader = new SAXReader();
+ reader.setEncoding("gbk");
Document xml;
try {
xml = reader.read(new ByteArrayInputStream(request.getRawContent()));
@@ -375,7 +376,7 @@
private Element getRootElement(RequestEvent evt) throws DocumentException {
Request request = evt.getRequest();
SAXReader reader = new SAXReader();
- reader.setEncoding("GB2312");
+ reader.setEncoding("gbk");
Document xml = reader.read(new ByteArrayInputStream(request.getRawContent()));
return xml.getRootElement();
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/ISIPResponseProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/ISIPResponseProcessor.java
index 9ff9959..458158b 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/ISIPResponseProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/ISIPResponseProcessor.java
@@ -1,5 +1,7 @@
package com.genersoft.iot.vmp.gb28181.transmit.response;
+import java.text.ParseException;
+
import javax.sip.ResponseEvent;
import com.genersoft.iot.vmp.conf.SipConfig;
@@ -12,6 +14,6 @@
*/
public interface ISIPResponseProcessor {
- public void process(ResponseEvent evt, SipLayer layer, SipConfig config);
+ public void process(ResponseEvent evt, SipLayer layer, SipConfig config) throws ParseException;
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java
index 9b1783f..9c862fa 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java
@@ -7,8 +7,11 @@
import javax.sip.InvalidArgumentException;
import javax.sip.ResponseEvent;
import javax.sip.SipException;
+import javax.sip.address.Address;
import javax.sip.address.SipURI;
import javax.sip.header.CSeqHeader;
+import javax.sip.header.ContactHeader;
+import javax.sip.header.FromHeader;
import javax.sip.header.ViaHeader;
import javax.sip.message.Request;
import javax.sip.message.Response;
@@ -22,57 +25,78 @@
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorFactory;
import com.genersoft.iot.vmp.gb28181.transmit.response.ISIPResponseProcessor;
-/**
+// import java.util.regex.Pattern;
+// import java.util.regex.Matcher;
+
+/**
* @Description:澶勭悊INVITE鍝嶅簲
* @author: songww
- * @date: 2020骞�5鏈�3鏃� 涓嬪崍4:43:52
+ * @date: 2020骞�5鏈�3鏃� 涓嬪崍4:43:52
*/
@Component
public class InviteResponseProcessor implements ISIPResponseProcessor {
private final static Logger logger = LoggerFactory.getLogger(SIPProcessorFactory.class);
-
+
/**
* 澶勭悊invite鍝嶅簲
*
- * @param evt
- * 鍝嶅簲娑堟伅
- */
+ * @param evt 鍝嶅簲娑堟伅
+ * @throws ParseException
+ */
@Override
- public void process(ResponseEvent evt, SipLayer layer, SipConfig config) {
+ public void process(ResponseEvent evt, SipLayer layer, SipConfig config) throws ParseException {
try {
Response response = evt.getResponse();
int statusCode = response.getStatusCode();
- //trying涓嶄細鍥炲
- if(statusCode == Response.TRYING){
-
+ // trying涓嶄細鍥炲
+ if (statusCode == Response.TRYING) {
}
- //鎴愬姛鍝嶅簲
- //涓嬪彂ack
- if(statusCode == Response.OK){
-// ClientTransaction clientTransaction = evt.getClientTransaction();
-// if(clientTransaction == null){
-// logger.error("鍥炲ACK鏃讹紝clientTransaction涓簄ull >>> {}",response);
-// return;
-// }
-// Dialog clientDialog = clientTransaction.getDialog();
-//
-// CSeqHeader clientCSeqHeader = (CSeqHeader) response.getHeader(CSeqHeader.NAME);
-// long cseqId = clientCSeqHeader.getSeqNumber();
-// /*
-// createAck鍑芥暟锛屽垱寤虹殑ackRequest锛屼細閲囩敤Invite鍝嶅簲鐨�200OK锛屼腑鐨刢ontact瀛楁涓殑鍦板潃锛屼綔涓虹洰鏍囧湴鍧�銆�
-// 鏈夌殑缁堢浼犱笂鏉ョ殑鍙兘杩樻槸鍐呯綉鍦板潃锛屼細閫犳垚ack鍙戦�佷笉鍑哄幓銆傛帴鍙椾笉鍒伴煶瑙嗛娴�
-// 鎵�浠ュ湪姝ゅ缁熶竴鏇挎崲鍦板潃銆傚拰鍝嶅簲娑堟伅鐨刅ia澶翠腑鐨勫湴鍧�淇濇寔涓�鑷淬��
-// */
-// Request ackRequest = clientDialog.createAck(cseqId);
-// SipURI requestURI = (SipURI) ackRequest.getRequestURI();
-// ViaHeader viaHeader = (ViaHeader) response.getHeader(ViaHeader.NAME);
-// requestURI.setHost(viaHeader.getHost());
-// requestURI.setPort(viaHeader.getPort());
-// clientDialog.sendAck(ackRequest);
-
+ // 鎴愬姛鍝嶅簲
+ // 涓嬪彂ack
+ if (statusCode == Response.OK) {
+ // ClientTransaction clientTransaction = evt.getClientTransaction();
+ // if(clientTransaction == null){
+ // logger.error("鍥炲ACK鏃讹紝clientTransaction涓簄ull >>> {}",response);
+ // return;
+ // }
+ // Dialog clientDialog = clientTransaction.getDialog();
+
+ // CSeqHeader clientCSeqHeader = (CSeqHeader)
+ // response.getHeader(CSeqHeader.NAME);
+ // long cseqId = clientCSeqHeader.getSeqNumber();
+ // /*
+ // createAck鍑芥暟锛屽垱寤虹殑ackRequest锛屼細閲囩敤Invite鍝嶅簲鐨�200OK锛屼腑鐨刢ontact瀛楁涓殑鍦板潃锛屼綔涓虹洰鏍囧湴鍧�銆�
+ // 鏈夌殑缁堢浼犱笂鏉ョ殑鍙兘杩樻槸鍐呯綉鍦板潃锛屼細閫犳垚ack鍙戦�佷笉鍑哄幓銆傛帴鍙椾笉鍒伴煶瑙嗛娴�
+ // 鎵�浠ュ湪姝ゅ缁熶竴鏇挎崲鍦板潃銆傚拰鍝嶅簲娑堟伅鐨刅ia澶翠腑鐨勫湴鍧�淇濇寔涓�鑷淬��
+ // */
+ // Request ackRequest = clientDialog.createAck(cseqId);
+ // SipURI requestURI = (SipURI) ackRequest.getRequestURI();
+ // ViaHeader viaHeader = (ViaHeader) response.getHeader(ViaHeader.NAME);
+ // try {
+ // requestURI.setHost(viaHeader.getHost());
+ // } catch (Exception e) {
+ // e.printStackTrace();
+ // }
+ // requestURI.setPort(viaHeader.getPort());
+ // clientDialog.sendAck(ackRequest);
+
Dialog dialog = evt.getDialog();
- Request reqAck =dialog.createAck(1L);
+ CSeqHeader cseq = (CSeqHeader) response.getHeader(CSeqHeader.NAME);
+ Request reqAck = dialog.createAck(cseq.getSeqNumber());
+
+ SipURI requestURI = (SipURI) reqAck.getRequestURI();
+ ViaHeader viaHeader = (ViaHeader) response.getHeader(ViaHeader.NAME);
+ // String viaHost =viaHeader.getHost();
+ //getHost()鍑芥暟鍙栧洖鐨処P鍦板潃鏄�淸xxx.xxx.xxx.xxx:yyyy]鈥濈殑鏍煎紡锛岄渶鐢ㄦ鍒欒〃杈惧紡鎴彇涓衡�渪xx.xxx.xxx.xxx"鏍煎紡
+ // Pattern p = Pattern.compile("(?<=//|)((\\w)+\\.)+\\w+");
+ // Matcher matcher = p.matcher(viaHeader.getHost());
+ // if (matcher.find()) {
+ // requestURI.setHost(matcher.group());
+ // }
+ requestURI.setHost(viaHeader.getHost());
+ requestURI.setPort(viaHeader.getPort());
+ reqAck.setRequestURI(requestURI);
dialog.sendAck(reqAck);
}
} catch (InvalidArgumentException | SipException e) {
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index e4be40b..25f000b 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -22,7 +22,7 @@
* @date: 2020骞�5鏈�8鏃� 涓婂崍10:46:48
*/
@RestController
-@RequestMapping("/hook/zlm")
+@RequestMapping("/index/hook")
public class ZLMHttpHookListener {
private final static Logger logger = LoggerFactory.getLogger(ZLMHttpHookListener.class);
--
Gitblit v1.8.0