From 82adc0cb23f3ee47322e78889cdaba57e9309000 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 21 三月 2023 15:55:24 +0800
Subject: [PATCH] 完善语音对讲级联
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/InviteResponseProcessor.java | 64 ++++++++++++-------------------
1 files changed, 25 insertions(+), 39 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
index 923d79f..7feac17 100644
--- 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,12 +1,12 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.response.impl;
-import com.genersoft.iot.vmp.conf.SipConfig;
-import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
+import com.genersoft.iot.vmp.gb28181.SipLayer;
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;
@@ -15,11 +15,10 @@
import javax.sdp.SdpFactory;
import javax.sdp.SdpParseException;
import javax.sdp.SessionDescription;
-import javax.sip.*;
-import javax.sip.address.Address;
+import javax.sip.InvalidArgumentException;
+import javax.sip.ResponseEvent;
+import javax.sip.SipException;
import javax.sip.address.SipURI;
-import javax.sip.header.CSeqHeader;
-import javax.sip.header.UserAgentHeader;
import javax.sip.message.Request;
import javax.sip.message.Response;
import java.text.ParseException;
@@ -37,16 +36,18 @@
private final String method = "INVITE";
@Autowired
- private VideoStreamSessionManager streamSession;
-
- @Autowired
private SIPProcessorObserver sipProcessorObserver;
- @Autowired
- private SipConfig sipConfig;
@Autowired
- private SipFactory sipFactory;
+ private SipLayer sipLayer;
+
+ @Autowired
+ private SIPSender sipSender;
+
+ @Autowired
+ private SIPRequestHeaderProvider headerProvider;
+
@Override
public void afterPropertiesSet() throws Exception {
@@ -64,8 +65,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) {
@@ -74,10 +76,7 @@
// 涓嬪彂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();
+
String contentString = new String(response.getRawContent());
// jainSip涓嶆敮鎸亂=瀛楁锛� 绉婚櫎浠ヨВ鏋愩��
int ssrcIndex = contentString.indexOf("y=");
@@ -90,29 +89,16 @@
} else {
sdp = SdpFactory.getInstance().createSessionDescription(contentString);
}
- requestURI.setUser(sdp.getOrigin().getUsername());
- try {
- requestURI.setHost(event.getRemoteIpAddress());
- } catch (ParseException e) {
- e.printStackTrace();
- }
- requestURI.setPort(event.getRemotePort());
- reqAck.setRequestURI(requestURI);
- UserAgentHeader userAgentHeader = SipUtils.createUserAgentHeader(sipFactory);
- reqAck.addHeader(userAgentHeader);
- Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getId(), sipConfig.getIp()+":"+sipConfig.getPort()));
- reqAck.addHeader(sipFactory.createHeaderFactory().createContactHeader(concatAddress));
- logger.info("[鍥炲ack] {}-> {}:{} ",requestURI, event.getRemoteIpAddress(), event.getRemotePort());
+ // 鏌ョ湅鏄惁鏄潵鑷澶囩殑锛屾鏄洖澶�
- dialog.sendAck(reqAck);
+ SipURI requestUri = sipLayer.getSipFactory().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 (ParseException e) {
- throw new RuntimeException(e);
- } catch (SdpParseException e) {
- throw new RuntimeException(e);
+ } catch (InvalidArgumentException | ParseException | SipException | SdpParseException e) {
+ logger.info("[鐐规挱鍥炲ACK]锛屽紓甯革細", e );
}
}
--
Gitblit v1.8.0