|
|
|
@ -138,7 +138,12 @@ void CProtocol::OnDvFramePacketIn(CDvFramePacket *Frame, const CIp *Ip)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// find the stream
|
|
|
|
// find the stream
|
|
|
|
CPacketStream *stream = GetStream(Frame->GetStreamId(), Ip);
|
|
|
|
CPacketStream *stream = GetStream(Frame->GetStreamId(), Ip);
|
|
|
|
if ( stream != NULL )
|
|
|
|
if ( stream == NULL )
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
std::cout << "Deleting oprhaned Frame Packet with StreamId " << Frame->GetStreamId() << " from " << *Ip << std::endl;
|
|
|
|
|
|
|
|
delete Frame;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
//std::cout << "DV frame" << "from " << *Ip << std::endl;
|
|
|
|
//std::cout << "DV frame" << "from " << *Ip << std::endl;
|
|
|
|
// and push
|
|
|
|
// and push
|
|
|
|
@ -152,7 +157,12 @@ void CProtocol::OnDvLastFramePacketIn(CDvLastFramePacket *Frame, const CIp *Ip)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// find the stream
|
|
|
|
// find the stream
|
|
|
|
CPacketStream *stream = GetStream(Frame->GetStreamId(), Ip);
|
|
|
|
CPacketStream *stream = GetStream(Frame->GetStreamId(), Ip);
|
|
|
|
if ( stream != NULL )
|
|
|
|
if ( stream == NULL )
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
std::cout << "Deleting oprhaned Last Frame Packet with StreamId " << Frame->GetStreamId() << " from " << *Ip << std::endl;
|
|
|
|
|
|
|
|
delete Frame;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// push
|
|
|
|
// push
|
|
|
|
stream->Lock();
|
|
|
|
stream->Lock();
|
|
|
|
@ -256,5 +266,3 @@ uint32 CProtocol::ModuleToDmrDestId(char m) const
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return (uint32)(m - 'A')+1;
|
|
|
|
return (uint32)(m - 'A')+1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|