From 6bb8f45e270681dbcb70aed663b406e7d905e091 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 18 四月 2022 15:04:22 +0800
Subject: [PATCH] 优化摄像头注册流程
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java | 282 +++++++++++++++++++++++++++-----------------------------
1 files changed, 136 insertions(+), 146 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 54a5204..f6a3af9 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
@@ -3,7 +3,6 @@
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.SipConfig;
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.WvpSipDate;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
@@ -42,166 +41,157 @@
@Component
public class RegisterRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
- private Logger logger = LoggerFactory.getLogger(RegisterRequestProcessor.class);
+ private final Logger logger = LoggerFactory.getLogger(RegisterRequestProcessor.class);
- public String method = "REGISTER";
+ public String method = "REGISTER";
- @Autowired
- private SipConfig sipConfig;
+ @Autowired
+ private SipConfig sipConfig;
- @Autowired
- private RegisterLogicHandler handler;
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
- @Autowired
- private IRedisCatchStorage redisCatchStorage;
+ @Autowired
+ private IVideoManagerStorage storager;
- @Autowired
- private IVideoManagerStorage storager;
+ @Autowired
+ private EventPublisher publisher;
- @Autowired
- private EventPublisher publisher;
+ @Autowired
+ private SIPProcessorObserver sipProcessorObserver;
- @Autowired
- private SIPProcessorObserver sipProcessorObserver;
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ // 娣诲姞娑堟伅澶勭悊鐨勮闃�
+ sipProcessorObserver.addRequestProcessor(method, this);
+ }
- @Override
- public void afterPropertiesSet() throws Exception {
- // 娣诲姞娑堟伅澶勭悊鐨勮闃�
- sipProcessorObserver.addRequestProcessor(method, this);
- }
+ /**
+ * 鏀跺埌娉ㄥ唽璇锋眰 澶勭悊
+ *
+ * @param evt
+ */
+ @Override
+ 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);
+ Response response = null;
+ boolean passwordCorrect = false;
+ // 娉ㄥ唽鏍囧織 0锛氭湭鎼哄甫鎺堟潈澶存垨鑰呭瘑鐮侀敊璇� 1锛氭敞鍐屾垚鍔� 2锛氭敞閿�鎴愬姛
+ int registerFlag = 0;
+ FromHeader fromHeader = (FromHeader) request.getHeader(FromHeader.NAME);
+ AddressImpl address = (AddressImpl) fromHeader.getAddress();
+ SipUri uri = (SipUri) address.getURI();
+ String deviceId = uri.getUser();
- /**
- * 鏀跺埌娉ㄥ唽璇锋眰 澶勭悊
- * @param evt
- */
- @Override
- 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);
- Response response = null;
- boolean passwordCorrect = false;
- // 娉ㄥ唽鏍囧織 0锛氭湭鎼哄甫鎺堟潈澶存垨鑰呭瘑鐮侀敊璇� 1锛氭敞鍐屾垚鍔� 2锛氭敞閿�鎴愬姛
- int registerFlag = 0;
- FromHeader fromHeader = (FromHeader) request.getHeader(FromHeader.NAME);
- AddressImpl address = (AddressImpl) fromHeader.getAddress();
- SipUri uri = (SipUri) address.getURI();
- String deviceId = uri.getUser();
- Device deviceInRedis = redisCatchStorage.getDevice(deviceId);
- Device device = storager.queryVideoDevice(deviceId);
- if (deviceInRedis != null && device == null) {
- // redis 瀛樺湪鑴忔暟鎹�
- redisCatchStorage.clearCatchByDeviceId(deviceId);
- }
- AuthorizationHeader authorhead = (AuthorizationHeader) request.getHeader(AuthorizationHeader.NAME);
- // 鏍￠獙瀵嗙爜鏄惁姝ｇ‘
- if (authorhead != null) {
- passwordCorrect = new DigestServerAuthenticationHelper().doAuthenticatePlainTextPassword(request,
- sipConfig.getPassword());
- }
- if (StringUtils.isEmpty(sipConfig.getPassword())){
- passwordCorrect = true;
- }
+ AuthorizationHeader authHead = (AuthorizationHeader) request.getHeader(AuthorizationHeader.NAME);
+ if (authHead == null) {
+ logger.info("[{}] 鏈惡甯︽巿鏉冨ご 鍥炲401", requestAddress);
+ response = getMessageFactory().createResponse(Response.UNAUTHORIZED, request);
+ new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getDomain());
+ sendResponse(evt, response);
+ return;
+ }
- // 鏈惡甯︽巿鏉冨ご鎴栬�呭瘑鐮侀敊璇� 鍥炲401
- if (authorhead == null ) {
+ // 鏍￠獙瀵嗙爜鏄惁姝ｇ‘
+ passwordCorrect = StringUtils.isEmpty(sipConfig.getPassword()) ||
+ new DigestServerAuthenticationHelper().doAuthenticatePlainTextPassword(request, sipConfig.getPassword());
+ // 鏈惡甯︽巿鏉冨ご鎴栬�呭瘑鐮侀敊璇� 鍥炲401
- logger.info("[{}] 鏈惡甯︽巿鏉冨ご 鍥炲401", requestAddress);
- response = getMessageFactory().createResponse(Response.UNAUTHORIZED, request);
- new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getDomain());
- }else {
- if (!passwordCorrect){
- // 娉ㄥ唽澶辫触
- response = getMessageFactory().createResponse(Response.FORBIDDEN, request);
- response.setReasonPhrase("wrong password");
- logger.info("[{}] 瀵嗙爜/SIP鏈嶅姟鍣↖D閿欒, 鍥炲403", requestAddress);
- }else {
- // 鎼哄甫鎺堟潈澶村苟涓斿瘑鐮佹纭�
- 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);
+ if (!passwordCorrect) {
+ // 娉ㄥ唽澶辫触
+ response = getMessageFactory().createResponse(Response.FORBIDDEN, request);
+ response.setReasonPhrase("wrong password");
+ logger.info("[{}] 瀵嗙爜/SIP鏈嶅姟鍣↖D閿欒, 鍥炲403", requestAddress);
+ sendResponse(evt, response);
+ return;
+ }
+ Device deviceInRedis = redisCatchStorage.getDevice(deviceId);
+ Device device = storager.queryVideoDevice(deviceId);
+ if (deviceInRedis != null && device == null) {
+ // redis 瀛樺湪鑴忔暟鎹�
+ redisCatchStorage.clearCatchByDeviceId(deviceId);
+ }
+ // 鎼哄甫鎺堟潈澶村苟涓斿瘑鐮佹纭�
+ 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);
- if (expiresHeader == null) {
- response = getMessageFactory().createResponse(Response.BAD_REQUEST, request);
- ServerTransaction serverTransaction = getServerTransaction(evt);
- serverTransaction.sendResponse(response);
- if (serverTransaction.getDialog() != null) serverTransaction.getDialog().delete();
- return;
- }
- // 娣诲姞Contact澶�
- response.addHeader(request.getHeader(ContactHeader.NAME));
- // 娣诲姞Expires澶�
- response.addHeader(request.getExpires());
+ if (expiresHeader == null) {
+ response = getMessageFactory().createResponse(Response.BAD_REQUEST, request);
+ ServerTransaction serverTransaction = getServerTransaction(evt);
+ serverTransaction.sendResponse(response);
+ if (serverTransaction.getDialog() != null) serverTransaction.getDialog().delete();
+ return;
+ }
+ // 娣诲姞Contact澶�
+ response.addHeader(request.getHeader(ContactHeader.NAME));
+ // 娣诲姞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();
- }
- //
+ // 鑾峰彇鍒伴�氫俊鍦板潃绛変俊鎭�
+ 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.setDeviceId(deviceId);
+ device.setFirsRegister(true);
+ } else {
+ device.setFirsRegister(device.getOnline() == 0);
+ }
+ device.setIp(received);
+ device.setPort(rPort);
+ device.setHostAddress(received.concat(":").concat(String.valueOf(rPort)));
+ if (expiresHeader.getExpires() == 0) {
+ // 娉ㄩ攢鎴愬姛
+ registerFlag = 2;
+ } else {
+ // 娉ㄥ唽鎴愬姛
+ device.setExpires(expiresHeader.getExpires());
+ registerFlag = 1;
+ // 鍒ゆ柇TCP杩樻槸UDP
+ ViaHeader reqViaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
+ String transport = reqViaHeader.getTransport();
+ device.setTransport("TCP".equals(transport) ? "TCP" : "UDP");
+ }
- if (device == null) {
- device = new Device();
- device.setStreamMode("UDP");
- device.setCharset("GB2312");
- device.setDeviceId(deviceId);
- device.setFirsRegister(true);
- }else {
- if (device.getOnline() == 0) {
- device.setFirsRegister(true);
- }
- }
- device.setIp(received);
- device.setPort(rPort);
- device.setHostAddress(received.concat(":").concat(String.valueOf(rPort)));
- // 娉ㄩ攢鎴愬姛
- if (expiresHeader.getExpires() == 0) {
- registerFlag = 2;
- }
- // 娉ㄥ唽鎴愬姛
- else {
- device.setExpires(expiresHeader.getExpires());
- registerFlag = 1;
- // 鍒ゆ柇TCP杩樻槸UDP
- boolean isTcp = false;
- ViaHeader reqViaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
- String transport = reqViaHeader.getTransport();
- if (transport.equals("TCP")) {
- isTcp = true;
- }
- device.setTransport(isTcp ? "TCP" : "UDP");
- }
- }
- }
+ sendResponse(evt, response);
+ // 娉ㄥ唽鎴愬姛
+ // 淇濆瓨鍒皉edis
+ if (registerFlag == 1) {
+ logger.info("[{}] 娉ㄥ唽鎴愬姛! deviceId:" + deviceId, requestAddress);
+ publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_REGISTER, expiresHeader.getExpires());
+ } else if (registerFlag == 2) {
+ logger.info("[{}] 娉ㄩ攢鎴愬姛! deviceId:" + deviceId, requestAddress);
+ publisher.outlineEventPublish(deviceId, VideoManagerConstants.EVENT_OUTLINE_UNREGISTER);
+ }
+ } catch (SipException | InvalidArgumentException | NoSuchAlgorithmException | ParseException e) {
+ e.printStackTrace();
+ }
- ServerTransaction serverTransaction = getServerTransaction(evt);
- serverTransaction.sendResponse(response);
- if (serverTransaction.getDialog() != null) serverTransaction.getDialog().delete();
- // 娉ㄥ唽鎴愬姛
- // 淇濆瓨鍒皉edis
- if (registerFlag == 1 ) {
- logger.info("[{}] 娉ㄥ唽鎴愬姛! deviceId:" + device.getDeviceId(), requestAddress);
- publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_REGISTER, expiresHeader.getExpires());
- } else if (registerFlag == 2) {
- logger.info("[{}] 娉ㄩ攢鎴愬姛! deviceId:" + device.getDeviceId(), requestAddress);
- publisher.outlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_OUTLINE_UNREGISTER);
- }
- } catch (SipException | InvalidArgumentException | NoSuchAlgorithmException | ParseException e) {
- e.printStackTrace();
- }
-
- }
+ }
+
+ private void sendResponse(RequestEvent evt, Response response) throws InvalidArgumentException, SipException {
+ ServerTransaction serverTransaction = getServerTransaction(evt);
+ serverTransaction.sendResponse(response);
+ if (serverTransaction.getDialog() != null) serverTransaction.getDialog().delete();
+ }
}
--
Gitblit v1.8.0