From 80d2edeef25f752e0a80a6cff99e38f61c2d2cb2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 18 十月 2022 13:07:38 +0800
Subject: [PATCH] 优化sip消息构建，去除ServerTransaction的使用
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java
index f74c250..1f4513e 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java
@@ -23,12 +23,8 @@
import javax.sip.InvalidArgumentException;
import javax.sip.RequestEvent;
-import javax.sip.ServerTransaction;
import javax.sip.SipException;
-import javax.sip.address.SipURI;
-import javax.sip.header.CSeqHeader;
import javax.sip.header.CallIdHeader;
-import javax.sip.message.Request;
import javax.sip.message.Response;
import java.text.ParseException;
import java.util.Map;
@@ -80,16 +76,13 @@
if (ssrcTransaction != null) {
deviceId = ssrcTransaction.getDeviceId();
}
-
- ServerTransaction serverTransaction = getServerTransaction(evt);
-
+ SIPRequest request = (SIPRequest) evt.getRequest();
// 鏌ヨ璁惧鏄惁瀛樺湪
Device device = redisCatchStorage.getDevice(deviceId);
// 鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪
ParentPlatform parentPlatform = storage.queryParentPlatByServerGBId(deviceId);
try {
if (device != null && parentPlatform != null) {
- SIPRequest request = (SIPRequest) evt.getRequest();
String hostAddress = request.getRemoteAddress().getHostAddress();
int remotePort = request.getRemotePort();
if (device.getHostAddress().equals(hostAddress + ":" + remotePort)) {
@@ -100,7 +93,7 @@
}
if (device == null && parentPlatform == null) {
// 涓嶅瓨鍦ㄥ垯鍥炲404
- responseAck(serverTransaction, Response.NOT_FOUND, "device "+ deviceId +" not found");
+ responseAck(request, Response.NOT_FOUND, "device "+ deviceId +" not found");
logger.warn("[璁惧鏈壘鍒� ]锛� {}", deviceId);
if (sipSubscribe.getErrorSubscribe(callIdHeader.getCallId()) != null){
DeviceNotFoundEvent deviceNotFoundEvent = new DeviceNotFoundEvent(evt.getDialog());
@@ -114,13 +107,13 @@
rootElement = getRootElement(evt);
if (rootElement == null) {
logger.error("澶勭悊MESSAGE璇锋眰 鏈幏鍙栧埌娑堟伅浣搟}", evt.getRequest());
- responseAck(serverTransaction, Response.BAD_REQUEST, "content is null");
+ responseAck(request, Response.BAD_REQUEST, "content is null");
return;
}
} catch (DocumentException e) {
logger.warn("瑙ｆ瀽XML娑堟伅鍐呭寮傚父", e);
// 涓嶅瓨鍦ㄥ垯鍥炲404
- responseAck(serverTransaction, Response.BAD_REQUEST, e.getMessage());
+ responseAck(request, Response.BAD_REQUEST, e.getMessage());
}
String name = rootElement.getName();
IMessageHandler messageHandler = messageHandlerMap.get(name);
@@ -133,7 +126,7 @@
}else {
// 涓嶆敮鎸佺殑message
// 涓嶅瓨鍦ㄥ垯鍥炲415
- responseAck(serverTransaction, Response.UNSUPPORTED_MEDIA_TYPE, "Unsupported message type, must Control/Notify/Query/Response");
+ responseAck(request, Response.UNSUPPORTED_MEDIA_TYPE, "Unsupported message type, must Control/Notify/Query/Response");
}
}
} catch (SipException e) {
--
Gitblit v1.8.0