From 1e1364e51a66614469b91e396d33a54bdf8f6e98 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 14:33:25 +0800
Subject: [PATCH] 修复开始点播功能接口调用返回参数与定义的不符 #635
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java | 163 +++++++++++++++++++++++++++---------------------------
1 files changed, 81 insertions(+), 82 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
index 3213065..8c6ab99 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
@@ -1,10 +1,13 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
import gov.nist.javax.sip.SipProviderImpl;
import gov.nist.javax.sip.SipStackImpl;
import gov.nist.javax.sip.message.SIPRequest;
+import gov.nist.javax.sip.message.SIPResponse;
import gov.nist.javax.sip.stack.SIPServerTransaction;
+import gov.nist.javax.sip.stack.SIPServerTransactionImpl;
import org.apache.commons.lang3.ArrayUtils;
import org.dom4j.Document;
import org.dom4j.DocumentException;
@@ -19,10 +22,7 @@
import javax.sip.address.Address;
import javax.sip.address.AddressFactory;
import javax.sip.address.SipURI;
-import javax.sip.header.ContentTypeHeader;
-import javax.sip.header.ExpiresHeader;
-import javax.sip.header.HeaderFactory;
-import javax.sip.header.ViaHeader;
+import javax.sip.header.*;
import javax.sip.message.MessageFactory;
import javax.sip.message.Request;
import javax.sip.message.Response;
@@ -58,10 +58,7 @@
*/
public ServerTransaction getServerTransaction(RequestEvent evt) {
Request request = evt.getRequest();
- ServerTransaction serverTransaction = evt.getServerTransaction();
- if (serverTransaction != null) {
- System.out.println(serverTransaction.getState().toString());
- }
+ SIPServerTransactionImpl serverTransaction = (SIPServerTransactionImpl)evt.getServerTransaction();
// 鍒ゆ柇TCP杩樻槸UDP
boolean isTcp = false;
ViaHeader reqViaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
@@ -69,28 +66,28 @@
if (transport.equalsIgnoreCase("TCP")) {
isTcp = true;
}
-
+ if (serverTransaction != null && serverTransaction.getOriginalRequest() == null) {
+ serverTransaction.setOriginalRequest((SIPRequest) evt.getRequest());
+ }
if (serverTransaction == null) {
try {
if (isTcp) {
SipStackImpl stack = (SipStackImpl)tcpSipProvider.getSipStack();
- serverTransaction = (SIPServerTransaction) stack.findTransaction((SIPRequest)request, true);
+ serverTransaction = (SIPServerTransactionImpl) stack.findTransaction((SIPRequest)request, true);
if (serverTransaction == null) {
- serverTransaction = tcpSipProvider.getNewServerTransaction(request);
+ serverTransaction = (SIPServerTransactionImpl)tcpSipProvider.getNewServerTransaction(request);
}
} else {
SipStackImpl stack = (SipStackImpl)udpSipProvider.getSipStack();
- serverTransaction = (SIPServerTransaction) stack.findTransaction((SIPRequest)request, true);
+ serverTransaction = (SIPServerTransactionImpl) stack.findTransaction((SIPRequest)request, true);
if (serverTransaction == null) {
- serverTransaction = udpSipProvider.getNewServerTransaction(request);
+ serverTransaction = (SIPServerTransactionImpl)udpSipProvider.getNewServerTransaction(request);
}
}
} catch (TransactionAlreadyExistsException e) {
logger.error(e.getMessage());
} catch (TransactionUnavailableException e) {
logger.error(e.getMessage());
- }finally {
-
}
}
return serverTransaction;
@@ -123,105 +120,107 @@
return null;
}
+ class ResponseAckExtraParam{
+ String content;
+ ContentTypeHeader contentTypeHeader;
+ SipURI sipURI;
+ int expires = -1;
+ }
+
/***
* 鍥炲鐘舵�佺爜
* 100 trying
* 200 OK
* 400
* 404
- * @param evt
- * @throws SipException
- * @throws InvalidArgumentException
- * @throws ParseException
*/
- public void responseAck(RequestEvent evt, int statusCode) throws SipException, InvalidArgumentException, ParseException {
- Response response = getMessageFactory().createResponse(statusCode, evt.getRequest());
- ServerTransaction serverTransaction = getServerTransaction(evt);
- if (serverTransaction == null) {
- logger.warn("鍥炲澶辫触锛歿}", response);
- return;
- }
- serverTransaction.sendResponse(response);
- if (statusCode >= 200 && !"NOTIFY".equalsIgnoreCase(evt.getRequest().getMethod())) {
-
- if (serverTransaction.getDialog() != null) {
- serverTransaction.getDialog().delete();
- }
- }
+ public SIPResponse responseAck(ServerTransaction serverTransaction, int statusCode) throws SipException, InvalidArgumentException, ParseException {
+ return responseAck(serverTransaction, statusCode, null);
}
- public void responseAck(RequestEvent evt, int statusCode, String msg) throws SipException, InvalidArgumentException, ParseException {
- Response response = getMessageFactory().createResponse(statusCode, evt.getRequest());
- response.setReasonPhrase(msg);
- ServerTransaction serverTransaction = getServerTransaction(evt);
+ public SIPResponse responseAck(ServerTransaction serverTransaction, int statusCode, String msg) throws SipException, InvalidArgumentException, ParseException {
+ return responseAck(serverTransaction, statusCode, msg, null);
+ }
+
+ public SIPResponse responseAck(ServerTransaction serverTransaction, int statusCode, String msg, ResponseAckExtraParam responseAckExtraParam) throws SipException, InvalidArgumentException, ParseException {
+ ToHeader toHeader = (ToHeader) serverTransaction.getRequest().getHeader(ToHeader.NAME);
+ if (toHeader.getTag() == null) {
+ toHeader.setTag(SipUtils.getNewTag());
+ }
+ SIPResponse response = (SIPResponse)getMessageFactory().createResponse(statusCode, serverTransaction.getRequest());
+ if (msg != null) {
+ response.setReasonPhrase(msg);
+ }
+ if (responseAckExtraParam != null) {
+ if (responseAckExtraParam.sipURI != null && serverTransaction.getRequest().getMethod().equals(Request.INVITE)) {
+ logger.debug("responseSdpAck SipURI: {}:{}", responseAckExtraParam.sipURI.getHost(), responseAckExtraParam.sipURI.getPort());
+ Address concatAddress = SipFactory.getInstance().createAddressFactory().createAddress(
+ SipFactory.getInstance().createAddressFactory().createSipURI(responseAckExtraParam.sipURI.getUser(), responseAckExtraParam.sipURI.getHost()+":"+responseAckExtraParam.sipURI.getPort()
+ ));
+ response.addHeader(SipFactory.getInstance().createHeaderFactory().createContactHeader(concatAddress));
+ }
+ if (responseAckExtraParam.contentTypeHeader != null) {
+ response.setContent(responseAckExtraParam.content, responseAckExtraParam.contentTypeHeader);
+ }
+
+ if (serverTransaction.getRequest().getMethod().equals(Request.SUBSCRIBE)) {
+ if (responseAckExtraParam.expires == -1) {
+ logger.error("[鍙傛暟涓嶅叏] 2xx鐨凷UBSCRIBE鍥炲锛屽繀椤昏缃瓻xpires header");
+ }else {
+ ExpiresHeader expiresHeader = SipFactory.getInstance().createHeaderFactory().createExpiresHeader(responseAckExtraParam.expires);
+ response.addHeader(expiresHeader);
+ }
+ }
+ }else {
+ if (serverTransaction.getRequest().getMethod().equals(Request.SUBSCRIBE)) {
+ logger.error("[鍙傛暟涓嶅叏] 2xx鐨凷UBSCRIBE鍥炲锛屽繀椤昏缃瓻xpires header");
+ }
+ }
serverTransaction.sendResponse(response);
- if (statusCode >= 200 && !"NOTIFY".equalsIgnoreCase(evt.getRequest().getMethod())) {
+ if (statusCode >= 200 && !"NOTIFY".equalsIgnoreCase(serverTransaction.getRequest().getMethod())) {
if (serverTransaction.getDialog() != null) {
serverTransaction.getDialog().delete();
}
}
+ return response;
}
/**
* 鍥炲甯dp鐨�200
- * @param evt
- * @param sdp
- * @throws SipException
- * @throws InvalidArgumentException
- * @throws ParseException
*/
- public void responseSdpAck(RequestEvent evt, String sdp, ParentPlatform platform) throws SipException, InvalidArgumentException, ParseException {
- Response response = getMessageFactory().createResponse(Response.OK, evt.getRequest());
- SipFactory sipFactory = SipFactory.getInstance();
- ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("APPLICATION", "SDP");
- response.setContent(sdp, contentTypeHeader);
+ public SIPResponse responseSdpAck(ServerTransaction serverTransaction, String sdp, ParentPlatform platform) throws SipException, InvalidArgumentException, ParseException {
+
+ ContentTypeHeader contentTypeHeader = SipFactory.getInstance().createHeaderFactory().createContentTypeHeader("APPLICATION", "SDP");
// 鍏煎鍥芥爣涓殑浣跨敤缂栫爜@鍩熷悕浣滀负RequestURI鐨勬儏鍐�
- SipURI sipURI = (SipURI)evt.getRequest().getRequestURI();
+ SipURI sipURI = (SipURI)serverTransaction.getRequest().getRequestURI();
if (sipURI.getPort() == -1) {
- sipURI = sipFactory.createAddressFactory().createSipURI(platform.getServerGBId(), platform.getServerIP()+":"+platform.getServerPort());
+ sipURI = SipFactory.getInstance().createAddressFactory().createSipURI(platform.getServerGBId(), platform.getServerIP()+":"+platform.getServerPort());
}
- logger.debug("responseSdpAck SipURI: {}:{}", sipURI.getHost(), sipURI.getPort());
+ ResponseAckExtraParam responseAckExtraParam = new ResponseAckExtraParam();
+ responseAckExtraParam.contentTypeHeader = contentTypeHeader;
+ responseAckExtraParam.content = sdp;
+ responseAckExtraParam.sipURI = sipURI;
- Address concatAddress = sipFactory.createAddressFactory().createAddress(
- sipFactory.createAddressFactory().createSipURI(sipURI.getUser(), sipURI.getHost()+":"+sipURI.getPort()
- ));
- response.addHeader(sipFactory.createHeaderFactory().createContactHeader(concatAddress));
- ServerTransaction serverTransaction = getServerTransaction(evt);
- if (serverTransaction == null) {
-
- }
- getServerTransaction(evt).sendResponse(response);
+ return responseAck(serverTransaction, Response.OK, null, responseAckExtraParam);
}
/**
* 鍥炲甯ml鐨�200
- * @param evt
- * @param xml
- * @throws SipException
- * @throws InvalidArgumentException
- * @throws ParseException
*/
- public Response responseXmlAck(RequestEvent evt, String xml, ParentPlatform platform) throws SipException, InvalidArgumentException, ParseException {
- Response response = getMessageFactory().createResponse(Response.OK, evt.getRequest());
- SipFactory sipFactory = SipFactory.getInstance();
- ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");
- response.setContent(xml, contentTypeHeader);
+ public SIPResponse responseXmlAck(ServerTransaction serverTransaction, String xml, ParentPlatform platform, Integer expires) throws SipException, InvalidArgumentException, ParseException {
+ ContentTypeHeader contentTypeHeader = SipFactory.getInstance().createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");
- // 鍏煎鍥芥爣涓殑浣跨敤缂栫爜@鍩熷悕浣滀负RequestURI鐨勬儏鍐�
- SipURI sipURI = (SipURI)evt.getRequest().getRequestURI();
+ SipURI sipURI = (SipURI)serverTransaction.getRequest().getRequestURI();
if (sipURI.getPort() == -1) {
- sipURI = sipFactory.createAddressFactory().createSipURI(platform.getServerGBId(), platform.getServerIP()+":"+platform.getServerPort());
+ sipURI = SipFactory.getInstance().createAddressFactory().createSipURI(platform.getServerGBId(), platform.getServerIP()+":"+platform.getServerPort());
}
- logger.debug("responseXmlAck SipURI: {}:{}", sipURI.getHost(), sipURI.getPort());
-
- Address concatAddress = sipFactory.createAddressFactory().createAddress(
- sipFactory.createAddressFactory().createSipURI(sipURI.getUser(), sipURI.getHost()+":"+sipURI.getPort()
- ));
- response.addHeader(sipFactory.createHeaderFactory().createContactHeader(concatAddress));
- response.addHeader(evt.getRequest().getHeader(ExpiresHeader.NAME));
- getServerTransaction(evt).sendResponse(response);
- return response;
+ ResponseAckExtraParam responseAckExtraParam = new ResponseAckExtraParam();
+ responseAckExtraParam.contentTypeHeader = contentTypeHeader;
+ responseAckExtraParam.content = xml;
+ responseAckExtraParam.sipURI = sipURI;
+ responseAckExtraParam.expires = expires;
+ return responseAck(serverTransaction, Response.OK, null, responseAckExtraParam);
}
public Element getRootElement(RequestEvent evt) throws DocumentException {
--
Gitblit v1.8.0