From c8b6ed5823fbe8e7eeef2e733859b4406b2ba4c5 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 15 一月 2021 13:22:07 +0800
Subject: [PATCH] Merge pull request #38 from lawrencehj/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java | 86 +++++++++++++++++++++++++------------------
1 files changed, 50 insertions(+), 36 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 7ca2e43..2676469 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
@@ -7,7 +7,6 @@
import javax.sip.InvalidArgumentException;
import javax.sip.RequestEvent;
-import javax.sip.ServerTransaction;
import javax.sip.SipException;
import javax.sip.header.AuthorizationHeader;
import javax.sip.header.ContactHeader;
@@ -17,19 +16,18 @@
import javax.sip.message.Request;
import javax.sip.message.Response;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.SipConfig;
-import com.genersoft.iot.vmp.gb28181.SipLayer;
import com.genersoft.iot.vmp.gb28181.auth.DigestServerAuthenticationHelper;
import com.genersoft.iot.vmp.gb28181.auth.RegisterLogicHandler;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.Host;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
-import com.genersoft.iot.vmp.gb28181.transmit.request.ISIPRequestProcessor;
+import com.genersoft.iot.vmp.gb28181.transmit.request.SIPRequestAbstractProcessor;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import gov.nist.javax.sip.address.AddressImpl;
@@ -38,34 +36,29 @@
/**
* @Description:鏀跺埌娉ㄥ唽璇锋眰 澶勭悊
- * @author: songww
+ * @author: swwheihei
* @date: 2020骞�5鏈�3鏃� 涓嬪崍4:47:25
*/
-@Component
-public class RegisterRequestProcessor implements ISIPRequestProcessor {
+public class RegisterRequestProcessor extends SIPRequestAbstractProcessor {
- @Autowired
+ private Logger logger = LoggerFactory.getLogger(RegisterRequestProcessor.class);
+
private SipConfig sipConfig;
- @Autowired
private RegisterLogicHandler handler;
- @Autowired
private IVideoManagerStorager storager;
- @Autowired
private EventPublisher publisher;
-
- /***
+
+ /**
* 鏀跺埌娉ㄥ唽璇锋眰 澶勭悊
- *
- * @param request
- * 璇锋眰娑堟伅
- */
+ * @param evt
+ */
@Override
- public void process(RequestEvent evt, SipLayer layer, ServerTransaction transaction) {
+ public void process(RequestEvent evt) {
try {
- System.out.println("鏀跺埌娉ㄥ唽璇锋眰锛屽紑濮嬪鐞�");
+ logger.info("鏀跺埌娉ㄥ唽璇锋眰锛屽紑濮嬪鐞�");
Request request = evt.getRequest();
Response response = null;
@@ -84,18 +77,18 @@
if (authorhead == null || !passwordCorrect) {
if (authorhead == null) {
- System.out.println("鏈惡甯︽巿鏉冨ご 鍥炲401");
+ logger.info("鏈惡甯︽巿鏉冨ご 鍥炲401");
} else if (!passwordCorrect) {
- System.out.println("瀵嗙爜閿欒 鍥炲401");
+ logger.info("瀵嗙爜閿欒 鍥炲401");
}
- response = layer.getMessageFactory().createResponse(Response.UNAUTHORIZED, request);
- new DigestServerAuthenticationHelper().generateChallenge(layer.getHeaderFactory(), response, sipConfig.getSipDomain());
+ response = getMessageFactory().createResponse(Response.UNAUTHORIZED, request);
+ new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getSipDomain());
}
// 鎼哄甫鎺堟潈澶村苟涓斿瘑鐮佹纭�
else if (passwordCorrect) {
- response = layer.getMessageFactory().createResponse(Response.OK, request);
+ response = getMessageFactory().createResponse(Response.OK, request);
// 娣诲姞date澶�
- response.addHeader(layer.getHeaderFactory().createDateHeader(Calendar.getInstance(Locale.ENGLISH)));
+ response.addHeader(getHeaderFactory().createDateHeader(Calendar.getInstance(Locale.ENGLISH)));
ExpiresHeader expiresHeader = (ExpiresHeader) request.getHeader(Expires.NAME);
// 娣诲姞Contact澶�
response.addHeader(request.getHeader(ContactHeader.NAME));
@@ -114,16 +107,15 @@
rPort = viaHeader.getPort();
}
//
- Host host = new Host();
- host.setIp(received);
- host.setPort(rPort);
- host.setAddress(received.concat(":").concat(String.valueOf(rPort)));
AddressImpl address = (AddressImpl) fromHeader.getAddress();
SipUri uri = (SipUri) address.getURI();
String deviceId = uri.getUser();
device = new Device();
+ device.setStreamMode("UDP");
device.setDeviceId(deviceId);
- device.setHost(host);
+ device.setIp(received);
+ device.setPort(rPort);
+ device.setHostAddress(received.concat(":").concat(String.valueOf(rPort)));
// 娉ㄩ攢鎴愬姛
if (expiresHeader != null && expiresHeader.getExpires() == 0) {
registerFlag = 2;
@@ -141,17 +133,23 @@
device.setTransport(isTcp ? "TCP" : "UDP");
}
}
- transaction.sendResponse(response);
+ getServerTransaction(evt).sendResponse(response);
// 娉ㄥ唽鎴愬姛
// 淇濆瓨鍒皉edis
// 涓嬪彂catelog鏌ヨ鐩綍
if (registerFlag == 1 && device != null) {
- System.out.println("娉ㄥ唽鎴愬姛! deviceId:" + device.getDeviceId());
- storager.update(device);
+ logger.info("娉ㄥ唽鎴愬姛! deviceId:" + device.getDeviceId());
+ boolean exists = storager.exists(device.getDeviceId());
+ device.setRegisterTimeMillis(System.currentTimeMillis());
+ storager.updateDevice(device);
publisher.onlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_ONLINE_REGISTER);
- handler.onRegister(device);
+
+ // 閲嶆柊娉ㄥ唽鏇存柊璁惧鍜岄�氶亾锛屼互鍏嶈澶囨浛鎹㈡垨鏇存柊鍚庝俊鎭棤娉曟洿鏂�
+ //if (!exists) {
+ handler.onRegister(device);
+ //}
} else if (registerFlag == 2) {
- System.out.println("娉ㄩ攢鎴愬姛! deviceId:" + device.getDeviceId());
+ logger.info("娉ㄩ攢鎴愬姛! deviceId:" + device.getDeviceId());
publisher.outlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_OUTLINE_UNREGISTER);
}
} catch (SipException | InvalidArgumentException | NoSuchAlgorithmException | ParseException e) {
@@ -159,5 +157,21 @@
}
}
+
+ public void setSipConfig(SipConfig sipConfig) {
+ this.sipConfig = sipConfig;
+ }
+
+ public void setHandler(RegisterLogicHandler handler) {
+ this.handler = handler;
+ }
+
+ public void setVideoManagerStorager(IVideoManagerStorager storager) {
+ this.storager = storager;
+ }
+
+ public void setPublisher(EventPublisher publisher) {
+ this.publisher = publisher;
+ }
}
--
Gitblit v1.8.0