From 0f58218badea86a5209ae7f1ccd60b7cb4b26eee Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 25 二月 2021 18:10:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 fe5be81..d67267a 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
@@ -12,14 +12,12 @@
import javax.sip.message.Request;
import javax.sip.message.Response;
-import gov.nist.javax.sip.header.CSeq;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+// import org.slf4j.Logger;
+// import org.slf4j.LoggerFactory;
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.SIPProcessorFactory;
import com.genersoft.iot.vmp.gb28181.transmit.response.ISIPResponseProcessor;
@@ -31,7 +29,7 @@
@Component
public class InviteResponseProcessor implements ISIPResponseProcessor {
- private final static Logger logger = LoggerFactory.getLogger(SIPProcessorFactory.class);
+ // private final static Logger logger = LoggerFactory.getLogger(InviteResponseProcessor.class);
/**
* 澶勭悊invite鍝嶅簲
@@ -53,8 +51,14 @@
Dialog dialog = evt.getDialog();
CSeqHeader cseq = (CSeqHeader) response.getHeader(CSeqHeader.NAME);
Request reqAck = dialog.createAck(cseq.getSeqNumber());
- dialog.sendAck(reqAck);
+ SipURI requestURI = (SipURI) reqAck.getRequestURI();
+ ViaHeader viaHeader = (ViaHeader) response.getHeader(ViaHeader.NAME);
+ requestURI.setHost(viaHeader.getHost());
+ requestURI.setPort(viaHeader.getPort());
+ reqAck.setRequestURI(requestURI);
+
+ dialog.sendAck(reqAck);
}
} catch (InvalidArgumentException | SipException e) {
e.printStackTrace();
--
Gitblit v1.8.0