From 45969a00b74b5a240c0dc6e2c37f5381cd0cb65f Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期四, 26 八月 2021 23:57:38 +0800
Subject: [PATCH] 修正设备注册认证时验证Response计算的错误
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java | 65 +++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java
index 4204ce7..c807c04 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java
@@ -1,37 +1,72 @@
package com.genersoft.iot.vmp.gb28181.transmit.response.impl;
-import javax.sip.Dialog;
-import javax.sip.InvalidArgumentException;
-import javax.sip.ResponseEvent;
-import javax.sip.SipException;
-import javax.sip.message.Request;
+import java.text.ParseException;
+import javax.sip.*;
+import javax.sip.address.SipURI;
+import javax.sip.header.CSeqHeader;
+import javax.sip.message.Request;
+import javax.sip.message.Response;
+
+import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
+import gov.nist.javax.sip.ResponseEventExt;
+import gov.nist.javax.sip.stack.SIPDialog;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.gb28181.SipLayer;
import com.genersoft.iot.vmp.gb28181.transmit.response.ISIPResponseProcessor;
-/**
+
+/**
* @Description:澶勭悊INVITE鍝嶅簲
- * @author: songww
- * @date: 2020骞�5鏈�3鏃� 涓嬪崍4:43:52
+ * @author: swwheihei
+ * @date: 2020骞�5鏈�3鏃� 涓嬪崍4:43:52
*/
@Component
public class InviteResponseProcessor implements ISIPResponseProcessor {
+ private final static Logger logger = LoggerFactory.getLogger(InviteResponseProcessor.class);
+
+ @Autowired
+ private VideoStreamSessionManager streamSession;
+
/**
* 澶勭悊invite鍝嶅簲
*
- * @param request
- * 鍝嶅簲娑堟伅
- */
+ * @param evt 鍝嶅簲娑堟伅
+ * @throws ParseException
+ */
@Override
- public void process(ResponseEvent evt, SipLayer layer, SipConfig config) {
+ public void process(ResponseEvent evt, SipLayer layer, SipConfig config) throws ParseException {
try {
- Dialog dialog = evt.getDialog();
- Request reqAck =dialog.createAck(1L);
- dialog.sendAck(reqAck);
+ Response response = evt.getResponse();
+ int statusCode = response.getStatusCode();
+ // trying涓嶄細鍥炲
+ if (statusCode == Response.TRYING) {
+ }
+ // 鎴愬姛鍝嶅簲
+ // 涓嬪彂ack
+ if (statusCode == Response.OK) {
+ ResponseEventExt event = (ResponseEventExt)evt;
+ SIPDialog dialog = (SIPDialog)evt.getDialog();
+ CSeqHeader cseq = (CSeqHeader) response.getHeader(CSeqHeader.NAME);
+ Request reqAck = dialog.createAck(cseq.getSeqNumber());
+ SipURI requestURI = (SipURI) reqAck.getRequestURI();
+ requestURI.setHost(event.getRemoteIpAddress());
+ requestURI.setPort(event.getRemotePort());
+ reqAck.setRequestURI(requestURI);
+ logger.info("鍚� " + event.getRemoteIpAddress() + ":" + event.getRemotePort() + "鍥炲ack");
+ SipURI sipURI = (SipURI)dialog.getRemoteParty().getURI();
+ String deviceId = requestURI.getUser();
+ String channelId = sipURI.getUser();
+
+ dialog.sendAck(reqAck);
+
+ }
} catch (InvalidArgumentException | SipException e) {
e.printStackTrace();
}
--
Gitblit v1.8.0