From 764d04b497356ba6bcbb75fd42b51eca750f7223 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 29 五月 2024 15:02:51 +0800
Subject: [PATCH] 调整上级观看消息的发送
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java | 184 +++++++++++++++++++++++++++++----------------
1 files changed, 119 insertions(+), 65 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
old mode 100644
new mode 100755
index 7516011..69dc455
--- 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
@@ -1,31 +1,41 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;
import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.gb28181.auth.DigestServerAuthenticationHelper;
import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.bean.WvpSipDate;
+import com.genersoft.iot.vmp.gb28181.bean.RemoteAddressInfo;
+import com.genersoft.iot.vmp.gb28181.bean.SipTransactionInfo;
+import com.genersoft.iot.vmp.gb28181.bean.GbSipDate;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
+import com.genersoft.iot.vmp.gb28181.transmit.SIPSender;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.utils.DateUtil;
import gov.nist.javax.sip.RequestEventExt;
import gov.nist.javax.sip.address.AddressImpl;
import gov.nist.javax.sip.address.SipUri;
-import gov.nist.javax.sip.clientauthutils.DigestServerAuthenticationHelper;
-import gov.nist.javax.sip.header.Expires;
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
+import org.springframework.util.ObjectUtils;
-import javax.sip.InvalidArgumentException;
-import javax.sip.RequestEvent;
-import javax.sip.ServerTransaction;
-import javax.sip.SipException;
+import javax.sip.*;
import javax.sip.header.*;
+import javax.sip.message.Request;
+import javax.sip.RequestEvent;
+import javax.sip.SipException;
+import javax.sip.header.AuthorizationHeader;
+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;
@@ -41,7 +51,7 @@
private final Logger logger = LoggerFactory.getLogger(RegisterRequestProcessor.class);
- public String method = "REGISTER";
+ public final String method = "REGISTER";
@Autowired
private SipConfig sipConfig;
@@ -51,6 +61,12 @@
@Autowired
private IDeviceService deviceService;
+
+ @Autowired
+ private SIPSender sipSender;
+
+ @Autowired
+ private UserSetting userSetting;
@Override
public void afterPropertiesSet() throws Exception {
@@ -67,60 +83,87 @@
public void process(RequestEvent evt) {
try {
RequestEventExt evtExt = (RequestEventExt) evt;
- String requestAddress = evtExt.getRemoteIpAddress() + ":" + evtExt.getRemotePort();
- logger.info("[娉ㄥ唽璇锋眰] 寮�濮嬪鐞�: {}", requestAddress);
- Request request = evt.getRequest();
- ExpiresHeader expiresHeader = (ExpiresHeader) request.getHeader(Expires.NAME);
+
+ SIPRequest request = (SIPRequest)evt.getRequest();
Response response = null;
boolean passwordCorrect = false;
// 娉ㄥ唽鏍囧織
- boolean registerFlag = false;
+ boolean registerFlag = true;
+ if (request.getExpires().getExpires() == 0) {
+ // 娉ㄩ攢鎴愬姛
+ registerFlag = false;
+ }
FromHeader fromHeader = (FromHeader) request.getHeader(FromHeader.NAME);
AddressImpl address = (AddressImpl) fromHeader.getAddress();
SipUri uri = (SipUri) address.getURI();
String deviceId = uri.getUser();
+ Device device = deviceService.getDevice(deviceId);
+
+ RemoteAddressInfo remoteAddressInfo = SipUtils.getRemoteAddressFromRequest(request,
+ userSetting.getSipUseSourceIpAsRemoteAddress());
+ String requestAddress = remoteAddressInfo.getIp() + ":" + remoteAddressInfo.getPort();
+ String title = registerFlag ? "[娉ㄥ唽璇锋眰]": "[娉ㄩ攢璇锋眰]";
+ logger.info(title + "璁惧锛歿}, 寮�濮嬪鐞�: {}", deviceId, requestAddress);
+ if (device != null &&
+ device.getSipTransactionInfo() != null &&
+ request.getCallIdHeader().getCallId().equals(device.getSipTransactionInfo().getCallId())) {
+ logger.info(title + "璁惧锛歿}, 娉ㄥ唽缁: {}",device.getDeviceId(), device.getDeviceId());
+ if (registerFlag) {
+ 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);
+ }else {
+ deviceService.offline(deviceId, "涓诲姩娉ㄩ攢");
+ }
+ return;
+ }
+ String password = (device != null && !ObjectUtils.isEmpty(device.getPassword()))? device.getPassword() : sipConfig.getPassword();
AuthorizationHeader authHead = (AuthorizationHeader) request.getHeader(AuthorizationHeader.NAME);
- if (authHead == null && !StringUtils.isEmpty(sipConfig.getPassword())) {
- logger.info("[娉ㄥ唽璇锋眰] 鏈惡甯︽巿鏉冨ご 鍥炲401: {}", requestAddress);
+ if (authHead == null && !ObjectUtils.isEmpty(password)) {
+ logger.info(title + " 璁惧锛歿}, 鍥炲401: {}",deviceId, requestAddress);
response = getMessageFactory().createResponse(Response.UNAUTHORIZED, request);
new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getDomain());
- sendResponse(evt, response);
+ sipSender.transmitRequest(request.getLocalAddress().getHostAddress(), response);
return;
}
// 鏍￠獙瀵嗙爜鏄惁姝ｇ‘
- passwordCorrect = StringUtils.isEmpty(sipConfig.getPassword()) ||
- new DigestServerAuthenticationHelper().doAuthenticatePlainTextPassword(request, sipConfig.getPassword());
- // 鏈惡甯︽巿鏉冨ご鎴栬�呭瘑鐮侀敊璇� 鍥炲401
+ passwordCorrect = ObjectUtils.isEmpty(password) ||
+ new DigestServerAuthenticationHelper().doAuthenticatePlainTextPassword(request, password);
if (!passwordCorrect) {
// 娉ㄥ唽澶辫触
response = getMessageFactory().createResponse(Response.FORBIDDEN, request);
response.setReasonPhrase("wrong password");
- logger.info("[娉ㄥ唽璇锋眰] 瀵嗙爜/SIP鏈嶅姟鍣↖D閿欒, 鍥炲403: {}", requestAddress);
- sendResponse(evt, response);
+ logger.info(title + " 璁惧锛歿}, 瀵嗙爜/SIP鏈嶅姟鍣↖D閿欒, 鍥炲403: {}", deviceId, requestAddress);
+ sipSender.transmitRequest(request.getLocalAddress().getHostAddress(), response);
return;
}
-
- Device device = deviceService.queryDevice(deviceId);
// 鎼哄甫鎺堟潈澶村苟涓斿瘑鐮佹纭�
response = getMessageFactory().createResponse(Response.OK, request);
// 娣诲姞date澶�
SIPDateHeader dateHeader = new SIPDateHeader();
// 浣跨敤鑷繁淇敼鐨�
- WvpSipDate wvpSipDate = new WvpSipDate(Calendar.getInstance(Locale.ENGLISH).getTimeInMillis());
- dateHeader.setDate(wvpSipDate);
+ GbSipDate gbSipDate = new GbSipDate(Calendar.getInstance(Locale.ENGLISH).getTimeInMillis());
+ dateHeader.setDate(gbSipDate);
response.addHeader(dateHeader);
- if (expiresHeader == null) {
+ if (request.getExpires() == null) {
response = getMessageFactory().createResponse(Response.BAD_REQUEST, request);
- ServerTransaction serverTransaction = getServerTransaction(evt);
- serverTransaction.sendResponse(response);
- if (serverTransaction.getDialog() != null) {
- serverTransaction.getDialog().delete();
- }
+ sipSender.transmitRequest(request.getLocalAddress().getHostAddress(), response);
return;
}
// 娣诲姞Contact澶�
@@ -128,64 +171,75 @@
// 娣诲姞Expires澶�
response.addHeader(request.getExpires());
- // 鑾峰彇鍒伴�氫俊鍦板潃绛変俊鎭�
- ViaHeader viaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
- String received = viaHeader.getReceived();
- int rPort = viaHeader.getRPort();
- // 瑙ｆ瀽鏈湴鍦板潃鏇夸唬
- if (StringUtils.isEmpty(received) || rPort == -1) {
- received = viaHeader.getHost();
- rPort = viaHeader.getPort();
- }
if (device == null) {
device = new Device();
device.setStreamMode("UDP");
device.setCharset("GB2312");
+ device.setGeoCoordSys("WGS84");
device.setDeviceId(deviceId);
+ device.setOnLine(false);
+ }else {
+ if (ObjectUtils.isEmpty(device.getStreamMode())) {
+ device.setStreamMode("UDP");
+ }
+ if (ObjectUtils.isEmpty(device.getCharset())) {
+ device.setCharset("GB2312");
+ }
+ if (ObjectUtils.isEmpty(device.getGeoCoordSys())) {
+ device.setGeoCoordSys("WGS84");
+ }
}
- device.setIp(received);
- device.setPort(rPort);
- device.setHostAddress(received.concat(":").concat(String.valueOf(rPort)));
- if (expiresHeader.getExpires() == 0) {
+
+ device.setIp(remoteAddressInfo.getIp());
+ device.setPort(remoteAddressInfo.getPort());
+ device.setHostAddress(remoteAddressInfo.getIp().concat(":").concat(String.valueOf(remoteAddressInfo.getPort())));
+ device.setLocalIp(request.getLocalAddress().getHostAddress());
+ if (request.getExpires().getExpires() == 0) {
// 娉ㄩ攢鎴愬姛
registerFlag = false;
} else {
// 娉ㄥ唽鎴愬姛
- device.setExpires(expiresHeader.getExpires());
+ device.setExpires(request.getExpires().getExpires());
registerFlag = true;
// 鍒ゆ柇TCP杩樻槸UDP
ViaHeader reqViaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
String transport = reqViaHeader.getTransport();
- device.setTransport("TCP".equals(transport) ? "TCP" : "UDP");
+ device.setTransport("TCP".equalsIgnoreCase(transport) ? "TCP" : "UDP");
}
- sendResponse(evt, response);
+ sipSender.transmitRequest(request.getLocalAddress().getHostAddress(), response);
// 娉ㄥ唽鎴愬姛
// 淇濆瓨鍒皉edis
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 | InvalidArgumentException | NoSuchAlgorithmException | ParseException e) {
- e.printStackTrace();
- }
-
- }
-
- private void sendResponse(RequestEvent evt, Response response) throws InvalidArgumentException, SipException {
- ServerTransaction serverTransaction = getServerTransaction(evt);
- if (serverTransaction == null) {
- logger.warn("[鍥炲澶辫触]锛歿}", response);
- return;
- }
- serverTransaction.sendResponse(response);
- if (serverTransaction.getDialog() != null) {
- serverTransaction.getDialog().delete();
+ } catch (SipException | NoSuchAlgorithmException | ParseException e) {
+ logger.error("鏈鐞嗙殑寮傚父 ", e);
}
}
+ private Response getRegisterOkResponse(Request request) throws ParseException {
+ // 鎼哄甫鎺堟潈澶村苟涓斿瘑鐮佹纭�
+ Response response = getMessageFactory().createResponse(Response.OK, request);
+ // 娣诲姞date澶�
+ SIPDateHeader dateHeader = new SIPDateHeader();
+ // 浣跨敤鑷繁淇敼鐨�
+ GbSipDate gbSipDate = new GbSipDate(Calendar.getInstance(Locale.ENGLISH).getTimeInMillis());
+ dateHeader.setDate(gbSipDate);
+ response.addHeader(dateHeader);
+
+ // 娣诲姞Contact澶�
+ response.addHeader(request.getHeader(ContactHeader.NAME));
+ // 娣诲姞Expires澶�
+ response.addHeader(request.getExpires());
+
+ return response;
+
+ }
}
--
Gitblit v1.8.0