hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RTSP now uses ephemeral UDP ports instead of semi-random ports, preventing collisions

Browse source
This commit is contained in:
Thulinma 2017-01-31 14:31:48 +01:00
parent c867ea6d26
commit 478e9d7f47
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/output/output_rtsp.cpp
View file

@ -437,7 +437,10 @@ namespace Mist {
for (std::map<int, RTPTrack>::iterator it = tracks.begin(); it != tracks.end(); ++it){
Socket::UDPConnection & s = it->second.data;
while (s.Receive()){
if (s.getDestPort() != it->second.cPort){continue;}//port mismatch = skip
if (s.getDestPort() != it->second.cPort){
//wrong sending port, ignore packet
continue;
}
RTP::Packet pack(s.data, s.data_len);
if (!it->second.rtpSeq){it->second.rtpSeq = pack.getSequence();}
//packet is very early - assume dropped after 10 packets

13
src/output/output_rtsp.h
View file

@ -109,18 +109,23 @@ namespace Mist {
channel = -1;
size_t port_loc = transport.rfind("client_port=") + 12;
cPort = atol(transport.substr(port_loc, transport.rfind('-') - port_loc).c_str());
unsigned int rand_offset = ((rand() % 4000) << 1) + 2000;
uint32_t portA, portB;
//find available ports locally;
int sendbuff = 4*1024*1024;
data.SetDestination(host, cPort);
data.bind(rand_offset + trk.trackID * 2);
portA = data.bind(0);
setsockopt(data.getSock(), SOL_SOCKET, SO_SNDBUF, &sendbuff, sizeof(sendbuff));
rtcp.SetDestination(host, cPort + 1);
rtcp.bind(rand_offset + trk.trackID * 2 + 1);
portB = rtcp.bind(0);
setsockopt(rtcp.getSock(), SOL_SOCKET, SO_SNDBUF, &sendbuff, sizeof(sendbuff));
std::stringstream tStr;
tStr << "RTP/AVP/UDP;unicast;client_port=" << cPort << '-' << cPort + 1 << ";source="<< source <<";server_port=" << (rand_offset + trk.trackID * 2) << "-" << (rand_offset + trk.trackID * 2 + 1) << ";ssrc=" << std::hex << SSrc << std::dec;
tStr << "RTP/AVP/UDP;unicast;client_port=" << cPort << '-' << cPort + 1 << ";";
if (source.size()){
tStr << "source=" << source << ";";
}
tStr << "server_port=" << portA << "-" << portB << ";ssrc=" << std::hex << SSrc << std::dec;
transportString = tStr.str();
INFO_MSG("Transport string: %s", transportString.c_str());
}
return true;
}