From 10ae1bba597e562a20f44f777ae5afdefb5da6af Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期三, 28 四月 2021 15:10:35 +0800
Subject: [PATCH] 增加对zlm使用docker容器的支持
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java
index c288470..a4d7816 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java
@@ -17,7 +17,9 @@
import javax.sip.message.Response;
import com.genersoft.iot.vmp.gb28181.bean.WvpSipDate;
+import gov.nist.javax.sip.RequestEventExt;
import gov.nist.javax.sip.header.SIPDateHeader;
+import gov.nist.javax.sip.message.SIPRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
@@ -59,7 +61,9 @@
@Override
public void process(RequestEvent evt) {
try {
- logger.info("鏀跺埌娉ㄥ唽璇锋眰锛屽紑濮嬪鐞�");
+ RequestEventExt evtExt = (RequestEventExt)evt;
+ String requestAddress = evtExt.getRemoteIpAddress() + ":" + evtExt.getRemotePort();
+ logger.info("[{}] 鏀跺埌娉ㄥ唽璇锋眰锛屽紑濮嬪鐞�", requestAddress);
Request request = evt.getRequest();
Response response = null;
@@ -78,9 +82,9 @@
if (authorhead == null || !passwordCorrect) {
if (authorhead == null) {
- logger.info("鏈惡甯︽巿鏉冨ご 鍥炲401");
+ logger.info("[{}] 鏈惡甯︽巿鏉冨ご 鍥炲401", requestAddress);
} else if (!passwordCorrect) {
- logger.info("瀵嗙爜閿欒 鍥炲401");
+ logger.info("[{}] 瀵嗙爜閿欒 鍥炲401", requestAddress);
}
response = getMessageFactory().createResponse(Response.UNAUTHORIZED, request);
new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getSipDomain());
@@ -146,8 +150,8 @@
// 娉ㄥ唽鎴愬姛
// 淇濆瓨鍒皉edis
// 涓嬪彂catelog鏌ヨ鐩綍
- if (registerFlag == 1 && device != null) {
- logger.info("娉ㄥ唽鎴愬姛! deviceId:" + device.getDeviceId());
+ if (registerFlag == 1 ) {
+ logger.info("[{}] 娉ㄥ唽鎴愬姛! deviceId:" + device.getDeviceId(), requestAddress);
// boolean exists = storager.exists(device.getDeviceId());
device.setRegisterTimeMillis(System.currentTimeMillis());
storager.updateDevice(device);
@@ -158,7 +162,7 @@
handler.onRegister(device);
//}
} else if (registerFlag == 2) {
- logger.info("娉ㄩ攢鎴愬姛! deviceId:" + device.getDeviceId());
+ logger.info("[{}] 娉ㄩ攢鎴愬姛! deviceId:" + device.getDeviceId(), requestAddress);
publisher.outlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_OUTLINE_UNREGISTER);
}
} catch (SipException | InvalidArgumentException | NoSuchAlgorithmException | ParseException e) {
--
Gitblit v1.8.0