From 30ae9e929fad80f624ab632c53081db3d2dc9aec Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 25 五月 2023 17:28:57 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java | 19 +++----------------
1 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
index 3fee5e5..69969b3 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
@@ -83,21 +83,7 @@
public void process(RequestEvent evt) {
try {
RequestEventExt evtExt = (RequestEventExt) evt;
- String requestAddress = evtExt.getRemoteIpAddress() + ":" + evtExt.getRemotePort();
-// MBeanServer beanServer = ManagementFactory.getPlatformMBeanServer();
-// QueryExp protocol = Query.match(Query.attr("protocol"), Query.value("HTTP/1.1"));
-//// ObjectName name = new ObjectName("*:type=Connector,*");
-// ObjectName name = new ObjectName("*:*");
-// Set<ObjectName> objectNames = beanServer.queryNames(name, protocol);
-// for (ObjectName objectName : objectNames) {
-// String catalina = objectName.getDomain();
-// if ("Catalina".equals(catalina)) {
-// System.out.println(objectName.getKeyProperty("port"));
-// }
-// }
-
-// System.out.println(ServiceInfo.getServerPort());
SIPRequest request = (SIPRequest)evt.getRequest();
Response response = null;
boolean passwordCorrect = false;
@@ -107,12 +93,13 @@
AddressImpl address = (AddressImpl) fromHeader.getAddress();
SipUri uri = (SipUri) address.getURI();
String deviceId = uri.getUser();
- logger.info("[娉ㄥ唽璇锋眰] 璁惧锛歿}, 寮�濮嬪鐞�: {}", deviceId, requestAddress);
+
Device device = deviceService.getDevice(deviceId);
RemoteAddressInfo remoteAddressInfo = SipUtils.getRemoteAddressFromRequest(request,
userSetting.getSipUseSourceIpAsRemoteAddress());
-
+ String requestAddress = remoteAddressInfo.getIp() + ":" + remoteAddressInfo.getPort();
+ logger.info("[娉ㄥ唽璇锋眰] 璁惧锛歿}, 寮�濮嬪鐞�: {}", deviceId, requestAddress);
if (device != null &&
device.getSipTransactionInfo() != null &&
request.getCallIdHeader().getCallId().equals(device.getSipTransactionInfo().getCallId())) {
--
Gitblit v1.8.0