GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 08:37:25 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#893 Updates UDP packet to construct a Cellocator packet payload when the source UDP port is 231 and any time the packet contains the correct start packet identifier. Updates the decode event type label. (#894)

Browse Source 
Co-authored-by: Denny <denny@denny-desktop>
This commit is contained in:
Denny Sheirer
2020-07-25 09:01:44 -04:00
committed by GitHub
parent 030a88f5a3
commit 838016c89f
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/io/github/dsheirer/module/decode/ip/PacketMessageFactory.java
View File

@@ -84,12 +84,13 @@ public class PacketMessageFactory
/**
* Creates a UDP/IP packet payload parser
*
* @param sourcePort for the packet (to identify the protocol/format)
* @param destinationPort for the packet (to identify the protocol/format)
* @param binaryMessage containing the IP/UDP payload
* @param offset in the message to the start of the payload
* @return constructed packet messge parser
*/
public static IPacket createUDPPayload(int destinationPort, BinaryMessage binaryMessage, int offset)
public static IPacket createUDPPayload(int sourcePort, int destinationPort, BinaryMessage binaryMessage, int offset)
{
switch(destinationPort)
{
@@ -112,6 +113,23 @@ public class PacketMessageFactory
break;
}
switch(sourcePort)
{
case 231:
//Cellocator
if(MCGPHeader.isCellocatorMessage(binaryMessage, offset))
{
return MCGPMessageFactory.create(binaryMessage, offset);
}
break;
}
//This is normally source or destination port 231, but can be on other ports as well.
if(MCGPHeader.isCellocatorMessage(binaryMessage, offset))
{
return MCGPMessageFactory.create(binaryMessage, offset);
}
return new UnknownPacket(binaryMessage, offset);
}
}

4
src/main/java/io/github/dsheirer/module/decode/ip/udp/UDPPacket.java
View File

@@ -26,6 +26,7 @@ import io.github.dsheirer.module.decode.ip.IPacket;
import io.github.dsheirer.module.decode.ip.Packet;
import io.github.dsheirer.module.decode.ip.PacketMessageFactory;
import io.github.dsheirer.module.decode.ip.UnknownPacket;
import java.util.Collections;
import java.util.List;
@@ -80,7 +81,8 @@ public class UDPPacket extends Packet
{
if(getHeader().isValid())
{
mPayload = PacketMessageFactory.createUDPPayload(getHeader().getDestinationPort(), getMessage(), getOffset() + getHeader().getLength());
mPayload = PacketMessageFactory.createUDPPayload(getHeader().getSourcePort(),
getHeader().getDestinationPort(), getMessage(), getOffset() + getHeader().getLength());
}
else
{

2
src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1DecoderState.java
View File

@@ -962,7 +962,7 @@ public class P25P1DecoderState extends DecoderState implements IChannelEventList
DecodeEvent cellocatorEvent = P25DecodeEvent.builder(message.getTimestamp())
.channel(getCurrentChannel())
.eventDescription("CELLOCATOR")
.eventDescription("Cellocator")
.identifiers(ic)
.details(mcgpPacket.toString() + " " + ipv4.toString())
.build();