Merge branch 'wvp-28181-2.0'

648540858

2022-09-24 d7a1b94f905c5f28c9c8f2d48c3f9e28ebcf9cc4

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java

@@ -26,6 +26,7 @@
import gov.nist.javax.sip.SipStackImpl;

import gov.nist.javax.sip.message.MessageFactoryImpl;

import gov.nist.javax.sip.message.SIPRequest;

import gov.nist.javax.sip.stack.SIPClientTransaction;

import gov.nist.javax.sip.stack.SIPDialog;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

@@ -435,7 +436,14 @@
         }), e ->{

            // 这里为例避免一个通道的点播只有一个callID这个参数使用一个固定值

            streamSession.put(device.getDeviceId(), channelId ,"play", stream, ssrcInfo.getSsrc(), mediaServerItem.getId(), ((ResponseEvent)e.event).getClientTransaction(), VideoStreamSessionManager.SessionType.play);

            streamSession.put(device.getDeviceId(), channelId ,"play", e.dialog);

            Dialog sipDialog = null;

            if (e.dialog == null) {

               SIPClientTransaction clientTransaction = (SIPClientTransaction)((ResponseEvent)e.event).getClientTransaction();

               sipDialog = new SIPDialog(clientTransaction, clientTransaction.getLastResponse());

            }else {

               sipDialog = e.dialog;

            }

            streamSession.put(device.getDeviceId(), channelId ,"play", sipDialog);

            okEvent.response(e);

         });



@@ -1446,7 +1454,7 @@
    * @return         true = 命令发送成功

    */

   @Override

   public boolean mobilePositionSubscribe(Device device, Dialog dialog, SipSubscribe.Event okEvent ,SipSubscribe.Event errorEvent) {

   public SIPRequest mobilePositionSubscribe(Device device, SIPRequest requestOld, SipSubscribe.Event okEvent ,SipSubscribe.Event errorEvent) {

      try {

         StringBuffer subscribePostitionXml = new StringBuffer(200);

         String charset = device.getCharset();

@@ -1456,38 +1464,27 @@
         subscribePostitionXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

         subscribePostitionXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

         if (device.getSubscribeCycleForMobilePosition() > 0) {

            subscribePostitionXml.append("<Interval>" + String.valueOf(device.getMobilePositionSubmissionInterval()) + "</Interval>\r\n");

            subscribePostitionXml.append("<Interval>" + device.getMobilePositionSubmissionInterval() + "</Interval>\r\n");

         }

         subscribePostitionXml.append("</Query>\r\n");



         Request request;

         if (dialog != null) {

            SipURI requestURI = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), device.getHostAddress());

            request = dialog.createRequest(Request.SUBSCRIBE);

            ExpiresHeader expiresHeader = sipFactory.createHeaderFactory().createExpiresHeader(device.getSubscribeCycleForCatalog());

            request.setExpires(expiresHeader);

         CallIdHeader callIdHeader;



            request.setRequestURI(requestURI);



            ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");

            request.setContent(subscribePostitionXml.toString(), contentTypeHeader);



            CSeqHeader cSeqHeader = (CSeqHeader)request.getHeader(CSeqHeader.NAME);

            cSeqHeader.setSeqNumber(redisCatchStorage.getCSEQ());

            request.removeHeader(CSeqHeader.NAME);

            request.addHeader(cSeqHeader);

         if (requestOld != null) {

            callIdHeader = sipFactory.createHeaderFactory().createCallIdHeader(requestOld.getCallIdHeader().getCallId());

         }else {

            CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

            callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                  : udpSipProvider.getNewCallId();

            request = headerProvider.createSubscribeRequest(device, subscribePostitionXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, device.getSubscribeCycleForMobilePosition(), "presence" ,callIdHeader); //Position;id=" + tm.substring(tm.length() - 4));

         }

         SIPRequest request = (SIPRequest)headerProvider.createSubscribeRequest(device, subscribePostitionXml.toString(), requestOld, device.getSubscribeCycleForMobilePosition(), "presence" ,callIdHeader); //Position;id=" + tm.substring(tm.length() - 4));



         transmitRequest(device, request, errorEvent, okEvent);



         return true;

         return request;



      } catch ( NumberFormatException | ParseException | InvalidArgumentException   | SipException e) {

         e.printStackTrace();

         return false;

         return null;

      }

   }



@@ -1537,7 +1534,7 @@
         CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createSubscribeRequest(device, cmdXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, expires, "presence" , callIdHeader);

         Request request = headerProvider.createSubscribeRequest(device, cmdXml.toString(), null, expires, "presence" , callIdHeader);

         transmitRequest(device, request);



         return true;

@@ -1549,7 +1546,7 @@
   }



   @Override

   public boolean catalogSubscribe(Device device, Dialog dialog, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) {

   public SIPRequest catalogSubscribe(Device device, SIPRequest requestOld, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer cmdXml = new StringBuffer(200);

         String charset = device.getCharset();

@@ -1560,40 +1557,24 @@
         cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

         cmdXml.append("</Query>\r\n");



         CallIdHeader callIdHeader ;



         Request request;

         if (dialog != null) {

            SipURI requestURI = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), device.getHostAddress());

            request = dialog.createRequest(Request.SUBSCRIBE);

            ExpiresHeader expiresHeader = sipFactory.createHeaderFactory().createExpiresHeader(device.getSubscribeCycleForCatalog());

            request.setExpires(expiresHeader);



            request.setRequestURI(requestURI);



            ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");

            request.setContent(cmdXml.toString(), contentTypeHeader);



            CSeqHeader cSeqHeader = (CSeqHeader)request.getHeader(CSeqHeader.NAME);

            cSeqHeader.setSeqNumber(redisCatchStorage.getCSEQ());

            request.removeHeader(CSeqHeader.NAME);

            request.addHeader(cSeqHeader);



         if (requestOld != null) {

            callIdHeader = sipFactory.createHeaderFactory().createCallIdHeader(requestOld.getCallIdHeader().getCallId());

         }else {

            CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

            callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                  : udpSipProvider.getNewCallId();

         }



            // 有效时间默认为60秒以上

            request = headerProvider.createSubscribeRequest(device, cmdXml.toString(), SipUtils.getNewViaTag(),

                  SipUtils.getNewFromTag(), null, device.getSubscribeCycleForCatalog(), "Catalog" ,

         SIPRequest request = (SIPRequest)headerProvider.createSubscribeRequest(device, cmdXml.toString(), requestOld,  device.getSubscribeCycleForCatalog(), "Catalog" ,

                  callIdHeader);



         }

         transmitRequest(device, request, errorEvent, okEvent);

         return true;

         return request;



      } catch ( NumberFormatException | ParseException | InvalidArgumentException   | SipException e) {

         e.printStackTrace();

         return false;

         return null;

      }

   }



@@ -1868,62 +1849,5 @@
         throw new RuntimeException(e);

      }

      return true;

   }



   private void sendNotify(Device device, String catalogXmlContent,

                     SubscribeInfo subscribeInfo, SipSubscribe.Event errorEvent,  SipSubscribe.Event okEvent )

         throws SipException, ParseException {

      MessageFactoryImpl messageFactory = (MessageFactoryImpl) sipFactory.createMessageFactory();

      String characterSet = device.getCharset();

      // 设置编码， 防止中文乱码

      messageFactory.setDefaultContentEncodingCharset(characterSet);

      Dialog dialog  = subscribeInfo.getDialog();

      if (dialog == null || !dialog.getState().equals(DialogState.CONFIRMED)) {

         return;

      }

      SIPRequest notifyRequest = (SIPRequest)dialog.createRequest(Request.NOTIFY);

      ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");

      notifyRequest.setContent(catalogXmlContent, contentTypeHeader);



      SubscriptionStateHeader subscriptionState = sipFactory.createHeaderFactory()

            .createSubscriptionStateHeader(SubscriptionStateHeader.ACTIVE);

      notifyRequest.addHeader(subscriptionState);



      EventHeader event = sipFactory.createHeaderFactory().createEventHeader(subscribeInfo.getEventType());

      if (subscribeInfo.getEventId() != null) {

         event.setEventId(subscribeInfo.getEventId());

      }

      notifyRequest.addHeader(event);



      SipURI sipURI = (SipURI) notifyRequest.getRequestURI();

      if (subscribeInfo.getTransaction() != null) {

         SIPRequest request = (SIPRequest) subscribeInfo.getTransaction().getRequest();

         sipURI.setHost(request.getRemoteAddress().getHostAddress());

         sipURI.setPort(request.getRemotePort());

      }else {

         sipURI.setHost(device.getIp());

         sipURI.setPort(device.getPort());

      }



      ClientTransaction transaction = null;

      if ("TCP".equals(device.getTransport())) {

         transaction = tcpSipProvider.getNewClientTransaction(notifyRequest);

      } else if ("UDP".equals(device.getTransport())) {

         transaction = udpSipProvider.getNewClientTransaction(notifyRequest);

      }

      // 添加错误订阅

      if (errorEvent != null) {

         sipSubscribe.addErrorSubscribe(subscribeInfo.getCallId(), errorEvent);

      }

      // 添加订阅

      if (okEvent != null) {

         sipSubscribe.addOkSubscribe(subscribeInfo.getCallId(), okEvent);

      }

      if (transaction == null) {

         logger.error("平台{}的Transport错误：{}",device.getDeviceId(), device.getTransport());

         return;

      }

      dialog.sendRequest(transaction);



   }

}