From 42a2772d1aa7493bcc4fac3e24ee8eda4eebc23d Mon Sep 17 00:00:00 2001
From: xubinbin <1323875150@qq.com>
Date: 星期二, 12 十二月 2023 17:09:04 +0800
Subject: [PATCH] bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/InviteResponseProcessor.java | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/InviteResponseProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/InviteResponseProcessor.java
old mode 100644
new mode 100755
index 89958e9..436d2a4
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/InviteResponseProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/InviteResponseProcessor.java
@@ -1,22 +1,26 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.response.impl;
-import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.gb28181.SipLayer;
-import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
+import com.genersoft.iot.vmp.gb28181.bean.Gb28181Sdp;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
+import com.genersoft.iot.vmp.gb28181.transmit.SIPSender;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderProvider;
import com.genersoft.iot.vmp.gb28181.transmit.event.response.SIPResponseProcessorAbstract;
+import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
import gov.nist.javax.sip.ResponseEventExt;
-import gov.nist.javax.sip.stack.SIPDialog;
+import gov.nist.javax.sip.message.SIPResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import javax.sdp.SdpParseException;
+import javax.sdp.SessionDescription;
import javax.sip.InvalidArgumentException;
import javax.sip.ResponseEvent;
import javax.sip.SipException;
+import javax.sip.SipFactory;
import javax.sip.address.SipURI;
-import javax.sip.header.CSeqHeader;
import javax.sip.message.Request;
import javax.sip.message.Response;
import java.text.ParseException;
@@ -34,14 +38,18 @@
private final String method = "INVITE";
@Autowired
+ private SIPProcessorObserver sipProcessorObserver;
+
+
+ @Autowired
private SipLayer sipLayer;
@Autowired
- private SipConfig config;
-
+ private SIPSender sipSender;
@Autowired
- private SIPProcessorObserver sipProcessorObserver;
+ private SIPRequestHeaderProvider headerProvider;
+
@Override
public void afterPropertiesSet() throws Exception {
@@ -49,8 +57,7 @@
sipProcessorObserver.addResponseProcessor(method, this);
}
- @Autowired
- private VideoStreamSessionManager streamSession;
+
/**
* 澶勭悊invite鍝嶅簲
@@ -60,8 +67,9 @@
*/
@Override
public void process(ResponseEvent evt ){
+ logger.debug("鎺ユ敹鍒版秷鎭細" + evt.getResponse());
try {
- Response response = evt.getResponse();
+ SIPResponse response = (SIPResponse)evt.getResponse();
int statusCode = response.getStatusCode();
// trying涓嶄細鍥炲
if (statusCode == Response.TRYING) {
@@ -70,24 +78,18 @@
// 涓嬪彂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();
- try {
- requestURI.setHost(event.getRemoteIpAddress());
- } catch (ParseException e) {
- e.printStackTrace();
- }
- requestURI.setPort(event.getRemotePort());
- reqAck.setRequestURI(requestURI);
- logger.info("[鍥炲ack] {}-> {}:{} ",requestURI, event.getRemoteIpAddress(), event.getRemotePort());
- dialog.sendAck(reqAck);
+ String contentString = new String(response.getRawContent());
+ Gb28181Sdp gb28181Sdp = SipUtils.parseSDP(contentString);
+ SessionDescription sdp = gb28181Sdp.getBaseSdb();
+ SipURI requestUri = SipFactory.getInstance().createAddressFactory().createSipURI(sdp.getOrigin().getUsername(), event.getRemoteIpAddress() + ":" + event.getRemotePort());
+ Request reqAck = headerProvider.createAckRequest(response.getLocalAddress().getHostAddress(), requestUri, response);
+ logger.info("[鍥炲ack] {}-> {}:{} ", sdp.getOrigin().getUsername(), event.getRemoteIpAddress(), event.getRemotePort());
+ sipSender.transmitRequest( response.getLocalAddress().getHostAddress(), reqAck);
}
- } catch (InvalidArgumentException | SipException e) {
- e.printStackTrace();
+ } catch (InvalidArgumentException | ParseException | SipException | SdpParseException e) {
+ logger.info("[鐐规挱鍥炲ACK]锛屽紓甯革細", e );
}
}
--
Gitblit v1.8.0