From b4048fbe80dba8e7756ae557a15ab60b4f80a44b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 04 四月 2023 09:09:07 +0800
Subject: [PATCH] 合并开源主线
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 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 4927763..9033963 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
@@ -5,6 +5,7 @@
import com.genersoft.iot.vmp.gb28181.auth.DigestServerAuthenticationHelper;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.RemoteAddressInfo;
+import com.genersoft.iot.vmp.gb28181.bean.SipTransactionInfo;
import com.genersoft.iot.vmp.gb28181.bean.WvpSipDate;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
import com.genersoft.iot.vmp.gb28181.transmit.SIPSender;
@@ -18,6 +19,7 @@
import gov.nist.javax.sip.address.SipUri;
import gov.nist.javax.sip.header.SIPDateHeader;
import gov.nist.javax.sip.message.SIPRequest;
+import gov.nist.javax.sip.message.SIPResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
@@ -34,6 +36,7 @@
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;
import java.security.NoSuchAlgorithmException;
import java.text.ParseException;
@@ -105,6 +108,30 @@
SipUri uri = (SipUri) address.getURI();
String deviceId = uri.getUser();
Device device = deviceService.getDevice(deviceId);
+
+ RemoteAddressInfo remoteAddressInfo = SipUtils.getRemoteAddressFromRequest(request,
+ userSetting.getSipUseSourceIpAsRemoteAddress());
+
+ if (device != null &&
+ device.getSipTransactionInfo() != null &&
+ request.getCallIdHeader().getCallId().equals(device.getSipTransactionInfo().getCallId())) {
+ logger.info("[娉ㄥ唽璇锋眰] 娉ㄥ唽缁: {}", device.getDeviceId());
+ device.setExpires(request.getExpires().getExpires());
+ device.setIp(remoteAddressInfo.getIp());
+ device.setPort(remoteAddressInfo.getPort());
+ device.setHostAddress(remoteAddressInfo.getIp().concat(":").concat(String.valueOf(remoteAddressInfo.getPort())));
+ device.setLocalIp(request.getLocalAddress().getHostAddress());
+ Response registerOkResponse = getRegisterOkResponse(request);
+ // 鍒ゆ柇TCP杩樻槸UDP
+ ViaHeader reqViaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
+ String transport = reqViaHeader.getTransport();
+ device.setTransport("TCP".equalsIgnoreCase(transport) ? "TCP" : "UDP");
+ sipSender.transmitRequest(request.getLocalAddress().getHostAddress(), registerOkResponse);
+ device.setRegisterTime(DateUtil.getNow());
+ SipTransactionInfo sipTransactionInfo = new SipTransactionInfo((SIPResponse)registerOkResponse);
+ deviceService.online(device, sipTransactionInfo);
+ return;
+ }
String password = (device != null && !ObjectUtils.isEmpty(device.getPassword()))? device.getPassword() : sipConfig.getPassword();
AuthorizationHeader authHead = (AuthorizationHeader) request.getHeader(AuthorizationHeader.NAME);
if (authHead == null && !ObjectUtils.isEmpty(password)) {
@@ -147,9 +174,6 @@
// 娣诲姞Expires澶�
response.addHeader(request.getExpires());
- RemoteAddressInfo remoteAddressInfo = SipUtils.getRemoteAddressFromRequest(request,
- userSetting.getSipUseSourceIpAsRemoteAddress());
-
if (device == null) {
device = new Device();
device.setStreamMode("UDP");
@@ -182,13 +206,33 @@
if (registerFlag) {
logger.info("[娉ㄥ唽鎴愬姛] deviceId: {}->{}", deviceId, requestAddress);
device.setRegisterTime(DateUtil.getNow());
- deviceService.online(device);
+ SipTransactionInfo sipTransactionInfo = new SipTransactionInfo((SIPResponse)response);
+ deviceService.online(device, sipTransactionInfo);
} else {
logger.info("[娉ㄩ攢鎴愬姛] deviceId: {}->{}" ,deviceId, requestAddress);
- deviceService.offline(deviceId);
+ deviceService.offline(deviceId, "涓诲姩娉ㄩ攢");
}
} catch (SipException | NoSuchAlgorithmException | ParseException e) {
- e.printStackTrace();
+ logger.error("鏈鐞嗙殑寮傚父 ", e);
}
}
+
+ private Response getRegisterOkResponse(Request request) throws ParseException {
+ // 鎼哄甫鎺堟潈澶村苟涓斿瘑鐮佹纭�
+ Response response = getMessageFactory().createResponse(Response.OK, request);
+ // 娣诲姞date澶�
+ SIPDateHeader dateHeader = new SIPDateHeader();
+ // 浣跨敤鑷繁淇敼鐨�
+ WvpSipDate wvpSipDate = new WvpSipDate(Calendar.getInstance(Locale.ENGLISH).getTimeInMillis());
+ dateHeader.setDate(wvpSipDate);
+ response.addHeader(dateHeader);
+
+ // 娣诲姞Contact澶�
+ response.addHeader(request.getHeader(ContactHeader.NAME));
+ // 娣诲姞Expires澶�
+ response.addHeader(request.getExpires());
+
+ return response;
+
+ }
}
--
Gitblit v1.8.0