增加Subject头

648540858

2020-11-09 ce1aa6137be3513352bef34bc23a598d52810dd5

增加Subject头

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

@@ -9,13 +9,7 @@
import javax.sip.SipProvider;

import javax.sip.address.Address;

import javax.sip.address.SipURI;

import javax.sip.header.CSeqHeader;

import javax.sip.header.CallIdHeader;

import javax.sip.header.ContentTypeHeader;

import javax.sip.header.FromHeader;

import javax.sip.header.MaxForwardsHeader;

import javax.sip.header.ToHeader;

import javax.sip.header.ViaHeader;

import javax.sip.header.*;

import javax.sip.message.Request;



import org.springframework.beans.factory.annotation.Autowired;

@@ -83,7 +77,7 @@
        return request;

    }

    

    public Request createInviteRequest(Device device, String channelId, String content, String viaTag, String fromTag, String toTag) throws ParseException, InvalidArgumentException, PeerUnavailableException {

    public Request createInviteRequest(Device device, String channelId, String content, String viaTag, String fromTag, String toTag, String ssrc) throws ParseException, InvalidArgumentException, PeerUnavailableException {

        Request request = null;

        Host host = device.getHost();

        //请求行

@@ -122,7 +116,9 @@
        Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getSipId(), sipConfig.getSipIp()+":"+sipConfig.getSipPort()));

        // Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getSipId(), device.getHost().getIp()+":"+device.getHost().getPort()));

        request.addHeader(sipFactory.createHeaderFactory().createContactHeader(concatAddress));

		
        // Subject

        SubjectHeader subjectHeader = sipFactory.createHeaderFactory().createSubjectHeader(String.format("%s:%s,%s:%s", channelId, ssrc, sipConfig.getSipId(), 0));

        request.addHeader(subjectHeader);

        ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "SDP");

        request.setContent(content, contentTypeHeader);

        return request;


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

@@ -309,7 +309,7 @@
            }

            content.append("y="+ssrc+"\r\n");//ssrc

            

            Request request = headerProvider.createInviteRequest(device, channelId, content.toString(), null, "live", null);

            Request request = headerProvider.createInviteRequest(device, channelId, content.toString(), null, "live", null, ssrc);

    

            ClientTransaction transaction = transmitRequest(device, request);

            streamSession.put(ssrc, transaction);