GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-15 01:57:39 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Updated call event details message for traffic channel rejects (no tuner, unknown frequency) to include the original call event details in addition to the traffic channel reject message.

Browse Source
This commit is contained in:
Denny
2016-07-31 10:08:13 -04:00
parent d57c485450
commit c635dc5d79
1 changed files with 58 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/module/decode/state/TrafficChannelManager.java
View File

@@ -33,9 +33,12 @@ import controller.channel.TrafficChannelEvent;
public class TrafficChannelManager extends Module public class TrafficChannelManager extends Module
implements ICallEventProvider, IDecoderStateEventListener implements ICallEventProvider, IDecoderStateEventListener
{ {
private final static Logger mLog = LoggerFactory.getLogger( TrafficChannelManager.class ); private final static Logger mLog = LoggerFactory.getLogger( TrafficChannelManager.class );
public static final String CHANNEL_START_REJECTED = "CHANNEL START REJECTED";
public static final String NO_TUNER_AVAILABLE = "NO TUNER AVAILABLE";
public static final String UNKNOWN_FREQUENCY = "UNKNOWN FREQUENCY";
private int mTrafficChannelPoolMaximumSize = private int mTrafficChannelPoolMaximumSize =
DecodeConfiguration.TRAFFIC_CHANNEL_LIMIT_DEFAULT; DecodeConfiguration.TRAFFIC_CHANNEL_LIMIT_DEFAULT;
private List<Channel> mTrafficChannelPool = new ArrayList<Channel>(); private List<Channel> mTrafficChannelPool = new ArrayList<Channel>();
private Map<String,Channel> mTrafficChannelsInUse = new ConcurrentHashMap<String,Channel>(); private Map<String,Channel> mTrafficChannelsInUse = new ConcurrentHashMap<String,Channel>();
@@ -57,12 +60,20 @@ public class TrafficChannelManager extends Module
* to traffic channel allocation call events. Manages a pool of reusable * to traffic channel allocation call events. Manages a pool of reusable
* traffic channel allocations. * traffic channel allocations.
* *
* @param resourceManager - resource manager * @param channelModel containing channels currently in use
* *
* @param channelProcessingManager
*
* @param decodeConfiguration - decoder configuration to use for each * @param decodeConfiguration - decoder configuration to use for each
* traffic channel allocation. * traffic channel allocation.
* *
* @param recordConfiguration - recording options for each traffic channel * @param recordConfiguration - recording options for each traffic channel
*
* @param system label to use to describe the system
*
* @param site label to use to describe the site
*
* @param aliasListName designated for the channel
* *
* @param trafficChannelTimeout - millisecond call timer limit used when an * @param trafficChannelTimeout - millisecond call timer limit used when an
* end of call signalling event is not decoded. * end of call signalling event is not decoded.
@@ -215,19 +226,55 @@ public class TrafficChannelManager extends Module
else else
{ {
callEvent.setCallEventType( CallEventType.CALL_DETECT ); callEvent.setCallEventType( CallEventType.CALL_DETECT );
callEvent.setDetails( "CHANNEL START REJECTED" );
String details = callEvent.getDetails();
if(details == null || details.isEmpty())
{
callEvent.setDetails(CHANNEL_START_REJECTED);
}
else if(!details.contains(CHANNEL_START_REJECTED))
{
callEvent.setDetails(new StringBuilder(CHANNEL_START_REJECTED)
.append(" : ")
.append(callEvent.getDetails()).toString());
}
} }
} }
else else
{ {
callEvent.setCallEventType( CallEventType.CALL_DETECT ); callEvent.setCallEventType( CallEventType.CALL_DETECT );
callEvent.setDetails( "NO TUNER AVAILABLE" );
String details = callEvent.getDetails();
if(details == null || details.isEmpty())
{
callEvent.setDetails(NO_TUNER_AVAILABLE);
}
else if(!details.contains(NO_TUNER_AVAILABLE))
{
callEvent.setDetails(new StringBuilder(NO_TUNER_AVAILABLE)
.append(" : ")
.append(callEvent.getDetails()).toString());
}
} }
} }
else else
{ {
callEvent.setCallEventType( CallEventType.CALL_DETECT ); callEvent.setCallEventType( CallEventType.CALL_DETECT );
callEvent.setDetails( "UNKNOWN FREQUENCY" );
String details = callEvent.getDetails();
if(details == null || details.isEmpty())
{
callEvent.setDetails(UNKNOWN_FREQUENCY);
}
else if(!details.contains(UNKNOWN_FREQUENCY))
{
callEvent.setDetails(new StringBuilder(UNKNOWN_FREQUENCY)
.append(" : ")
.append(callEvent.getDetails()).toString());
}
} }
final Listener<CallEvent> listener = mCallEventListener; final Listener<CallEvent> listener = mCallEventListener;