From 9b71508d49e604ec786275f16a892d9dd1caf434 Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Wed, 1 Jan 2025 10:05:20 -0500 Subject: [PATCH] #2122 Removes extraneous logging from DMR processing. (#2123) Co-authored-by: Dennis Sheirer --- .../io/github/dsheirer/map/PlottableEntityModel.java | 5 ++--- .../dsheirer/module/decode/dmr/DMRDecoderState.java | 4 ++-- .../data/packet/PacketSequenceMessageFactory.java | 12 ++++++------ .../message/data/packet/UDTShortMessageService.java | 8 ++++---- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/main/java/io/github/dsheirer/map/PlottableEntityModel.java b/src/main/java/io/github/dsheirer/map/PlottableEntityModel.java index 1d9e4403..abf2fec7 100644 --- a/src/main/java/io/github/dsheirer/map/PlottableEntityModel.java +++ b/src/main/java/io/github/dsheirer/map/PlottableEntityModel.java @@ -1,6 +1,6 @@ /* * ***************************************************************************** - * Copyright (C) 2014-2024 Dennis Sheirer + * Copyright (C) 2014-2025 Dennis Sheirer * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,7 +32,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -136,7 +135,7 @@ public class PlottableEntityModel extends AbstractTableModel implements Listener } else { - LOGGER.warn("Received plottable decode event that does not contain a FROM identifier - cannot plot"); +// LOGGER.warn("Received plottable decode event that does not contain a FROM identifier - cannot plot"); } }); } diff --git a/src/main/java/io/github/dsheirer/module/decode/dmr/DMRDecoderState.java b/src/main/java/io/github/dsheirer/module/decode/dmr/DMRDecoderState.java index af5018b3..862983be 100644 --- a/src/main/java/io/github/dsheirer/module/decode/dmr/DMRDecoderState.java +++ b/src/main/java/io/github/dsheirer/module/decode/dmr/DMRDecoderState.java @@ -1,6 +1,6 @@ /* * ***************************************************************************** - * Copyright (C) 2014-2024 Dennis Sheirer + * Copyright (C) 2014-2025 Dennis Sheirer * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -895,7 +895,7 @@ public class DMRDecoderState extends TimeslotDecoderState { //Log when a CSBK that is not the Unknown CSBK is processed, to detect when new opcodes are added //that are not ChannelGrant subclass implementations. - if(!(csbk instanceof UnknownCSBKMessage)) + if(!(csbk instanceof UnknownCSBKMessage) && csbk.isValid()) { mLog.error("Unrecognized DMR channel grant CSBK ignored: " + csbk.getClass()); } diff --git a/src/main/java/io/github/dsheirer/module/decode/dmr/message/data/packet/PacketSequenceMessageFactory.java b/src/main/java/io/github/dsheirer/module/decode/dmr/message/data/packet/PacketSequenceMessageFactory.java index 7dc60f6f..da1e0f33 100644 --- a/src/main/java/io/github/dsheirer/module/decode/dmr/message/data/packet/PacketSequenceMessageFactory.java +++ b/src/main/java/io/github/dsheirer/module/decode/dmr/message/data/packet/PacketSequenceMessageFactory.java @@ -1,6 +1,6 @@ /* * ***************************************************************************** - * Copyright (C) 2014-2023 Dennis Sheirer + * Copyright (C) 2014-2025 Dennis Sheirer * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -81,7 +81,7 @@ public class PacketSequenceMessageFactory case SHORT_DATA: return createDefinedShortData(packetSequence, packet); default: - mLog.info("Unknown Packet SAP: " + primaryHeader.getServiceAccessPoint() + " - returning unknown packet"); +// mLog.info("Unknown Packet SAP: " + primaryHeader.getServiceAccessPoint() + " - returning unknown packet"); return new DMRPacketMessage(packetSequence, new UnknownPacket(packet, 0), packet, packetSequence.getTimeslot(), packetSequence.getPacketSequenceHeader().getTimestamp()); } @@ -204,9 +204,9 @@ public class PacketSequenceMessageFactory { if(packetSequence.getProprietaryDataHeader() != null) { - mLog.info("Unknown Proprietary Packet Header Type - creating unknown packet. Data Packet Format: " + - packetSequence.getPacketSequenceHeader().getDataPacketFormat() + " Proprietary Header: " + - packetSequence.getProprietaryDataHeader().getClass()); +// mLog.info("Unknown Proprietary Packet Header Type - creating unknown packet. Data Packet Format: " + +// packetSequence.getPacketSequenceHeader().getDataPacketFormat() + " Proprietary Header: " + +// packetSequence.getProprietaryDataHeader().getClass()); } return new DMRPacketMessage(packetSequence, new UnknownPacket(packet, 0), packet, @@ -230,7 +230,7 @@ public class PacketSequenceMessageFactory return new DMRPacketMessage(packetSequence, new IPV4Packet(packet, 0), packet, packetSequence.getTimeslot(), packetSequence.getPacketSequenceHeader().getTimestamp()); default: - mLog.info("Unrecognized IP Packet Version: " + version + " - returning unknown packet"); +// mLog.info("Unrecognized IP Packet Version: " + version + " - returning unknown packet"); return new DMRPacketMessage(packetSequence, new UnknownPacket(packet, 0), packet, packetSequence.getTimeslot(), packetSequence.getPacketSequenceHeader().getTimestamp()); } diff --git a/src/main/java/io/github/dsheirer/module/decode/dmr/message/data/packet/UDTShortMessageService.java b/src/main/java/io/github/dsheirer/module/decode/dmr/message/data/packet/UDTShortMessageService.java index 4049f461..7bcac036 100644 --- a/src/main/java/io/github/dsheirer/module/decode/dmr/message/data/packet/UDTShortMessageService.java +++ b/src/main/java/io/github/dsheirer/module/decode/dmr/message/data/packet/UDTShortMessageService.java @@ -1,6 +1,6 @@ /* * ***************************************************************************** - * Copyright (C) 2014-2023 Dennis Sheirer + * Copyright (C) 2014-2025 Dennis Sheirer * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -92,9 +92,9 @@ public class UDTShortMessageService extends DMRMessage case VENDOR_PROPRIETARY_9: case MIXED_FORMAT: case UNKNOWN: - LOGGER.warn("Unrecognized UDT Short Data Format: " + mHeader.getFormat() + - " - Please send this to the sdrtrunk developer - Hex:" + getMessage().toHexString() + - " As String:" + new String(getMessage().getBytes())); +// LOGGER.warn("Unrecognized UDT Short Data Format: " + mHeader.getFormat() + +// " - Please send this to the sdrtrunk developer - Hex:" + getMessage().toHexString() + +// " As String:" + new String(getMessage().getBytes())); mSMS = "Error:" + new String(getMessage().getBytes()); break; }