mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-17 02:57:35 -05:00
P25 Decoder Updates.
-Improved handling of channel grants and call event logging -Prevent traffic channels from changing to control channel state -Change text on PDU Alternate Multi-Block to reflect trunking message type -Added interface for Adjacent Site messages and improved logging
This commit is contained in:
@@ -271,7 +271,8 @@ public class DecoderFactory
|
|||||||
|
|
||||||
if( channelType == ChannelType.STANDARD )
|
if( channelType == ChannelType.STANDARD )
|
||||||
{
|
{
|
||||||
long timeout = p25Config.getCallTimeout() * 1000; //convert to milliseconds
|
//Set call timeout to 3 seconds for P25 traffic channels
|
||||||
|
long timeout = 3000;
|
||||||
|
|
||||||
modules.add( new TrafficChannelManager( resourceManager,
|
modules.add( new TrafficChannelManager( resourceManager,
|
||||||
decodeConfig, recordConfig, system, site,
|
decodeConfig, recordConfig, system, site,
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
package module.decode.p25;
|
package module.decode.p25;
|
||||||
|
|
||||||
import javax.xml.bind.annotation.XmlAttribute;
|
import javax.xml.bind.annotation.XmlAttribute;
|
||||||
|
import javax.xml.bind.annotation.XmlTransient;
|
||||||
|
|
||||||
import module.decode.DecoderType;
|
import module.decode.DecoderType;
|
||||||
import module.decode.config.DecodeConfiguration;
|
import module.decode.config.DecodeConfiguration;
|
||||||
@@ -27,7 +28,7 @@ public class DecodeConfigP25Phase1 extends DecodeConfiguration
|
|||||||
{
|
{
|
||||||
private P25_LSMDecoder.Modulation mModulation = Modulation.C4FM;
|
private P25_LSMDecoder.Modulation mModulation = Modulation.C4FM;
|
||||||
|
|
||||||
private int mCallTimeout = DEFAULT_CALL_TIMEOUT_SECONDS;
|
private int mCallTimeout = 1;
|
||||||
private int mTrafficChannelPoolSize = TRAFFIC_CHANNEL_LIMIT_DEFAULT;
|
private int mTrafficChannelPoolSize = TRAFFIC_CHANNEL_LIMIT_DEFAULT;
|
||||||
|
|
||||||
public DecodeConfigP25Phase1()
|
public DecodeConfigP25Phase1()
|
||||||
@@ -53,7 +54,12 @@ public class DecodeConfigP25Phase1 extends DecodeConfiguration
|
|||||||
mModulation = modulation;
|
mModulation = modulation;
|
||||||
}
|
}
|
||||||
|
|
||||||
@XmlAttribute( name="call_timeout" )
|
/**
|
||||||
|
* Note: this field is now deprecated.
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@XmlTransient
|
||||||
|
@Deprecated
|
||||||
public int getCallTimeout()
|
public int getCallTimeout()
|
||||||
{
|
{
|
||||||
return mCallTimeout;
|
return mCallTimeout;
|
||||||
@@ -63,16 +69,9 @@ public class DecodeConfigP25Phase1 extends DecodeConfiguration
|
|||||||
* Sets the call timeout value in seconds ( 10 - 600 );
|
* Sets the call timeout value in seconds ( 10 - 600 );
|
||||||
* @param timeout
|
* @param timeout
|
||||||
*/
|
*/
|
||||||
|
@Deprecated
|
||||||
public void setCallTimeout( int timeout )
|
public void setCallTimeout( int timeout )
|
||||||
{
|
{
|
||||||
if( CALL_TIMEOUT_MINIMUM <= timeout && timeout <= CALL_TIMEOUT_MAXIMUM )
|
|
||||||
{
|
|
||||||
mCallTimeout = timeout;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
mCallTimeout = DEFAULT_CALL_TIMEOUT_SECONDS;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -76,6 +76,22 @@ public class P25CallEvent extends CallEvent
|
|||||||
return mFrequency;
|
return mFrequency;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String toString()
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
|
||||||
|
sb.append( "P25 " );
|
||||||
|
sb.append( getCallEventType().name() );
|
||||||
|
sb.append( " CHAN[" );
|
||||||
|
sb.append( getChannel() );
|
||||||
|
sb.append( "] TO[" );
|
||||||
|
sb.append( getToID() );
|
||||||
|
sb.append( "] FROM[" );
|
||||||
|
sb.append( getFromID() );
|
||||||
|
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
public static class Builder
|
public static class Builder
|
||||||
{
|
{
|
||||||
/* Required parameters */
|
/* Required parameters */
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ import module.decode.DecoderType;
|
|||||||
import module.decode.event.CallEvent;
|
import module.decode.event.CallEvent;
|
||||||
import module.decode.event.CallEvent.CallEventType;
|
import module.decode.event.CallEvent.CallEventType;
|
||||||
import module.decode.p25.P25Decoder.Modulation;
|
import module.decode.p25.P25Decoder.Modulation;
|
||||||
|
import module.decode.p25.message.IAdjacentSite;
|
||||||
import module.decode.p25.message.IBandIdentifier;
|
import module.decode.p25.message.IBandIdentifier;
|
||||||
import module.decode.p25.message.P25Message;
|
import module.decode.p25.message.P25Message;
|
||||||
import module.decode.p25.message.hdu.HDUMessage;
|
import module.decode.p25.message.hdu.HDUMessage;
|
||||||
@@ -67,6 +68,7 @@ import module.decode.p25.message.pdu.osp.voice.UnitToUnitVoiceChannelGrantExtend
|
|||||||
import module.decode.p25.message.pdu.osp.voice.UnitToUnitVoiceChannelGrantUpdateExtended;
|
import module.decode.p25.message.pdu.osp.voice.UnitToUnitVoiceChannelGrantUpdateExtended;
|
||||||
import module.decode.p25.message.tdu.TDUMessage;
|
import module.decode.p25.message.tdu.TDUMessage;
|
||||||
import module.decode.p25.message.tdu.lc.AdjacentSiteStatusBroadcast;
|
import module.decode.p25.message.tdu.lc.AdjacentSiteStatusBroadcast;
|
||||||
|
import module.decode.p25.message.tdu.lc.AdjacentSiteStatusBroadcastExplicit;
|
||||||
import module.decode.p25.message.tdu.lc.GroupVoiceChannelUpdate;
|
import module.decode.p25.message.tdu.lc.GroupVoiceChannelUpdate;
|
||||||
import module.decode.p25.message.tdu.lc.GroupVoiceChannelUpdateExplicit;
|
import module.decode.p25.message.tdu.lc.GroupVoiceChannelUpdateExplicit;
|
||||||
import module.decode.p25.message.tdu.lc.NetworkStatusBroadcast;
|
import module.decode.p25.message.tdu.lc.NetworkStatusBroadcast;
|
||||||
@@ -146,16 +148,14 @@ public class P25DecoderState extends DecoderState
|
|||||||
private RFSSStatusBroadcast mRFSSStatusMessage;
|
private RFSSStatusBroadcast mRFSSStatusMessage;
|
||||||
private RFSSStatusBroadcastExtended mRFSSStatusMessageExtended;
|
private RFSSStatusBroadcastExtended mRFSSStatusMessageExtended;
|
||||||
private SNDCPDataChannelAnnouncementExplicit mSNDCPDataChannel;
|
private SNDCPDataChannelAnnouncementExplicit mSNDCPDataChannel;
|
||||||
private HashMap<String,AdjacentStatusBroadcast> mNeighborMap =
|
|
||||||
new HashMap<String,AdjacentStatusBroadcast>();
|
|
||||||
|
|
||||||
private Set<module.decode.p25.message.tsbk.osp.control.SecondaryControlChannelBroadcast> mSecondaryControlChannels =
|
private Set<module.decode.p25.message.tsbk.osp.control.SecondaryControlChannelBroadcast> mSecondaryControlChannels =
|
||||||
new TreeSet<>();
|
new TreeSet<>();
|
||||||
|
|
||||||
private HashMap<Integer,IdentifierUpdate> mBands =
|
private Map<Integer,IdentifierUpdate> mBands = new HashMap<>();
|
||||||
new HashMap<Integer,IdentifierUpdate>();
|
private Map<String,Long> mRegistrations = new HashMap<>();
|
||||||
|
private Map<String,IAdjacentSite> mNeighborMap = new HashMap<>();
|
||||||
|
|
||||||
private HashMap<String,Long> mRegistrations = new HashMap<String,Long>();
|
|
||||||
private String mLastCommandEventID;
|
private String mLastCommandEventID;
|
||||||
private String mLastPageEventID;
|
private String mLastPageEventID;
|
||||||
private String mLastQueryEventID;
|
private String mLastQueryEventID;
|
||||||
@@ -291,7 +291,7 @@ public class P25DecoderState extends DecoderState
|
|||||||
hasEvent = true;
|
hasEvent = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if( event.getFromID() == null )
|
else
|
||||||
{
|
{
|
||||||
hasEvent = true;
|
hasEvent = true;
|
||||||
}
|
}
|
||||||
@@ -390,15 +390,10 @@ public class P25DecoderState extends DecoderState
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Terminator Data Unit, or default message if the CRC failed for a longer
|
* Terminator Data Unit
|
||||||
* message. We process these as continuation events.
|
|
||||||
*/
|
*/
|
||||||
private void processTDU( TDUMessage tdu )
|
private void processTDU( TDUMessage tdu )
|
||||||
{
|
{
|
||||||
// if( mCurrentCallEvent == null )
|
|
||||||
// {
|
|
||||||
// broadcast( new DecoderStateEvent( this, Event.CONTINUATION, State.CONTROL ) );
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -457,10 +452,11 @@ public class P25DecoderState extends DecoderState
|
|||||||
case ADJACENT_SITE_STATUS_BROADCAST:
|
case ADJACENT_SITE_STATUS_BROADCAST:
|
||||||
if( tdulc instanceof AdjacentSiteStatusBroadcast )
|
if( tdulc instanceof AdjacentSiteStatusBroadcast )
|
||||||
{
|
{
|
||||||
AdjacentSiteStatusBroadcast assb =
|
IAdjacentSite ias = (IAdjacentSite)tdulc;
|
||||||
(AdjacentSiteStatusBroadcast)tdulc;
|
|
||||||
|
|
||||||
updateSystem( assb.getSystemID() );
|
mNeighborMap.put( ias.getUniqueID(), ias );
|
||||||
|
|
||||||
|
updateSystem( ias.getSystemID() );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -468,7 +464,14 @@ public class P25DecoderState extends DecoderState
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case ADJACENT_SITE_STATUS_BROADCAST_EXPLICIT:
|
case ADJACENT_SITE_STATUS_BROADCAST_EXPLICIT:
|
||||||
/* This message doesn't provide anything we need for channel state */
|
if( tdulc instanceof AdjacentSiteStatusBroadcastExplicit )
|
||||||
|
{
|
||||||
|
IAdjacentSite ias = (IAdjacentSite)tdulc;
|
||||||
|
|
||||||
|
mNeighborMap.put( ias.getUniqueID(), ias );
|
||||||
|
|
||||||
|
updateSystem( ias.getSystemID() );
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case CALL_ALERT:
|
case CALL_ALERT:
|
||||||
if( tdulc instanceof module.decode.p25.message.tdu.lc.CallAlert )
|
if( tdulc instanceof module.decode.p25.message.tdu.lc.CallAlert )
|
||||||
@@ -620,7 +623,8 @@ public class P25DecoderState extends DecoderState
|
|||||||
mCurrentCallEvent = new P25CallEvent.Builder( CallEventType.GROUP_CALL )
|
mCurrentCallEvent = new P25CallEvent.Builder( CallEventType.GROUP_CALL )
|
||||||
.aliasList( getAliasList() )
|
.aliasList( getAliasList() )
|
||||||
.channel( mCurrentChannel )
|
.channel( mCurrentChannel )
|
||||||
.details( ( gvcuser.isEncrypted() ? "ENCRYPTED " : "" ) +
|
.details( "TDULC GROUP VOICE CHANNEL USER" +
|
||||||
|
( gvcuser.isEncrypted() ? "ENCRYPTED " : "" ) +
|
||||||
( gvcuser.isEmergency() ? "EMERGENCY " : "") )
|
( gvcuser.isEmergency() ? "EMERGENCY " : "") )
|
||||||
.frequency( mCurrentChannelFrequency )
|
.frequency( mCurrentChannelFrequency )
|
||||||
.from( from )
|
.from( from )
|
||||||
@@ -1006,10 +1010,11 @@ public class P25DecoderState extends DecoderState
|
|||||||
case ADJACENT_SITE_STATUS_BROADCAST:
|
case ADJACENT_SITE_STATUS_BROADCAST:
|
||||||
if( ldu instanceof module.decode.p25.message.ldu.lc.AdjacentSiteStatusBroadcast )
|
if( ldu instanceof module.decode.p25.message.ldu.lc.AdjacentSiteStatusBroadcast )
|
||||||
{
|
{
|
||||||
module.decode.p25.message.ldu.lc.AdjacentSiteStatusBroadcast assb =
|
IAdjacentSite ias = (IAdjacentSite)ldu;
|
||||||
(module.decode.p25.message.ldu.lc.AdjacentSiteStatusBroadcast)ldu;
|
|
||||||
|
|
||||||
updateSystem( assb.getSystemID() );
|
mNeighborMap.put( ias.getUniqueID(), ias );
|
||||||
|
|
||||||
|
updateSystem( ias.getSystemID() );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1018,7 +1023,18 @@ public class P25DecoderState extends DecoderState
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
case ADJACENT_SITE_STATUS_BROADCAST_EXPLICIT:
|
case ADJACENT_SITE_STATUS_BROADCAST_EXPLICIT:
|
||||||
/* This message doesn't provide anything we need for channel state */
|
if( ldu instanceof module.decode.p25.message.ldu.lc.AdjacentSiteStatusBroadcastExplicit )
|
||||||
|
{
|
||||||
|
IAdjacentSite ias = (IAdjacentSite)ldu;
|
||||||
|
|
||||||
|
mNeighborMap.put( ias.getUniqueID(), ias );
|
||||||
|
|
||||||
|
updateSystem( ias.getSystemID() );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logAlternateVendorMessage( ldu );
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case CALL_ALERT:
|
case CALL_ALERT:
|
||||||
if( ldu instanceof module.decode.p25.message.ldu.lc.CallAlert )
|
if( ldu instanceof module.decode.p25.message.ldu.lc.CallAlert )
|
||||||
@@ -1509,10 +1525,14 @@ public class P25DecoderState extends DecoderState
|
|||||||
switch( tsbk.getOpcode() )
|
switch( tsbk.getOpcode() )
|
||||||
{
|
{
|
||||||
case ADJACENT_STATUS_BROADCAST:
|
case ADJACENT_STATUS_BROADCAST:
|
||||||
AdjacentStatusBroadcast neighborMessage =
|
if( tsbk instanceof AdjacentStatusBroadcast )
|
||||||
(AdjacentStatusBroadcast)tsbk;
|
{
|
||||||
|
IAdjacentSite ias = (IAdjacentSite)tsbk;
|
||||||
|
|
||||||
mNeighborMap.put( neighborMessage.getUniqueID(), neighborMessage );
|
mNeighborMap.put( ias.getUniqueID(), ias );
|
||||||
|
|
||||||
|
updateSystem( ias.getSystemID() );
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case ACKNOWLEDGE_RESPONSE:
|
case ACKNOWLEDGE_RESPONSE:
|
||||||
processTSBKResponse( tsbk );
|
processTSBKResponse( tsbk );
|
||||||
@@ -1627,24 +1647,10 @@ public class P25DecoderState extends DecoderState
|
|||||||
*/
|
*/
|
||||||
private void processPDU( PDUMessage pdu )
|
private void processPDU( PDUMessage pdu )
|
||||||
{
|
{
|
||||||
broadcast( new DecoderStateEvent( this, Event.CONTINUATION, State.DATA ) );
|
|
||||||
|
|
||||||
if( pdu instanceof NetworkStatusBroadcastExtended )
|
|
||||||
{
|
|
||||||
mNetworkStatusExtended = (NetworkStatusBroadcastExtended)pdu;
|
|
||||||
}
|
|
||||||
else if( pdu instanceof ProtectionParameterBroadcast )
|
|
||||||
{
|
|
||||||
mProtectionParameterBroadcast =
|
|
||||||
(ProtectionParameterBroadcast)pdu;
|
|
||||||
}
|
|
||||||
else if( pdu instanceof RFSSStatusBroadcastExtended )
|
|
||||||
{
|
|
||||||
mRFSSStatusMessageExtended = (RFSSStatusBroadcastExtended)pdu;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( pdu instanceof PDUConfirmedMessage )
|
if( pdu instanceof PDUConfirmedMessage )
|
||||||
{
|
{
|
||||||
|
broadcast( new DecoderStateEvent( this, Event.CONTINUATION, State.DATA ) );
|
||||||
|
|
||||||
PDUConfirmedMessage pduc = (PDUConfirmedMessage)pdu;
|
PDUConfirmedMessage pduc = (PDUConfirmedMessage)pdu;
|
||||||
|
|
||||||
switch( pduc.getPDUType() )
|
switch( pduc.getPDUType() )
|
||||||
@@ -1747,13 +1753,27 @@ public class P25DecoderState extends DecoderState
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* These are alternate trunking control blocks in PDU format */
|
/* These are alternate trunking control blocks in PDU format */
|
||||||
|
broadcast( new DecoderStateEvent( this, Event.CONTINUATION, State.CONTROL ) );
|
||||||
|
|
||||||
switch( pdu.getOpcode() )
|
switch( pdu.getOpcode() )
|
||||||
{
|
{
|
||||||
|
case GROUP_DATA_CHANNEL_GRANT:
|
||||||
|
case GROUP_VOICE_CHANNEL_GRANT:
|
||||||
|
case INDIVIDUAL_DATA_CHANNEL_GRANT:
|
||||||
|
case TELEPHONE_INTERCONNECT_VOICE_CHANNEL_GRANT:
|
||||||
|
case UNIT_TO_UNIT_VOICE_CHANNEL_GRANT:
|
||||||
|
case UNIT_TO_UNIT_VOICE_CHANNEL_GRANT_UPDATE:
|
||||||
|
processPDUChannelGrant( pdu );
|
||||||
|
break;
|
||||||
case ADJACENT_STATUS_BROADCAST:
|
case ADJACENT_STATUS_BROADCAST:
|
||||||
AdjacentStatusBroadcastExtended asbe =
|
if( pdu instanceof AdjacentStatusBroadcastExtended )
|
||||||
(AdjacentStatusBroadcastExtended)pdu;
|
{
|
||||||
|
IAdjacentSite ias = (IAdjacentSite)pdu;
|
||||||
|
|
||||||
updateSystem( asbe.getSystemID() );
|
mNeighborMap.put( ias.getUniqueID(), ias );
|
||||||
|
|
||||||
|
updateSystem( ias.getSystemID() );
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case CALL_ALERT:
|
case CALL_ALERT:
|
||||||
if( pdu instanceof CallAlertExtended )
|
if( pdu instanceof CallAlertExtended )
|
||||||
@@ -1823,77 +1843,6 @@ public class P25DecoderState extends DecoderState
|
|||||||
logAlternateVendorMessage( pdu );
|
logAlternateVendorMessage( pdu );
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case GROUP_DATA_CHANNEL_GRANT:
|
|
||||||
if( pdu instanceof GroupDataChannelGrantExtended )
|
|
||||||
{
|
|
||||||
GroupDataChannelGrantExtended gdcge =
|
|
||||||
(GroupDataChannelGrantExtended)pdu;
|
|
||||||
|
|
||||||
CallEvent callEvent = new P25CallEvent.Builder( CallEventType.DATA_CALL )
|
|
||||||
.aliasList( getAliasList() )
|
|
||||||
.channel( gdcge.getTransmitChannel() )
|
|
||||||
.details( ( gdcge.isEncrypted() ? "ENCRYPTED" : "" ) +
|
|
||||||
( gdcge.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( gdcge.getDownlinkFrequency() )
|
|
||||||
.from( gdcge.getSourceAddress() )
|
|
||||||
.to( gdcge.getGroupAddress() )
|
|
||||||
.build();
|
|
||||||
|
|
||||||
broadcast( new TrafficChannelAllocationEvent( this, callEvent ) );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
logAlternateVendorMessage( pdu );
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case GROUP_VOICE_CHANNEL_GRANT:
|
|
||||||
if( pdu instanceof GroupVoiceChannelGrantExplicit )
|
|
||||||
{
|
|
||||||
GroupVoiceChannelGrantExplicit gvcge =
|
|
||||||
(GroupVoiceChannelGrantExplicit)pdu;
|
|
||||||
|
|
||||||
CallEvent callEvent = new P25CallEvent.Builder( CallEventType.CALL )
|
|
||||||
.aliasList( getAliasList() )
|
|
||||||
.channel( gvcge.getTransmitChannel() )
|
|
||||||
.details( ( gvcge.isEncrypted() ? "ENCRYPTED" : "" ) +
|
|
||||||
( gvcge.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( gvcge.getDownlinkFrequency() )
|
|
||||||
.from( gvcge.getSourceAddress() )
|
|
||||||
.to( gvcge.getGroupAddress() )
|
|
||||||
.build();
|
|
||||||
|
|
||||||
broadcast( new TrafficChannelAllocationEvent( this, callEvent ) );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
logAlternateVendorMessage( pdu );
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case INDIVIDUAL_DATA_CHANNEL_GRANT:
|
|
||||||
if( pdu instanceof IndividualDataChannelGrantExtended )
|
|
||||||
{
|
|
||||||
IndividualDataChannelGrantExtended idcge =
|
|
||||||
(IndividualDataChannelGrantExtended)pdu;
|
|
||||||
|
|
||||||
CallEvent callEvent = new P25CallEvent.Builder( CallEventType.DATA_CALL )
|
|
||||||
.aliasList( getAliasList() )
|
|
||||||
.channel( idcge.getTransmitChannel() )
|
|
||||||
.details( ( idcge.isEncrypted() ? "ENCRYPTED" : "" ) +
|
|
||||||
( idcge.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( idcge.getDownlinkFrequency() )
|
|
||||||
.from( idcge.getSourceWACN() + "-" +
|
|
||||||
idcge.getSourceSystemID() + "-" +
|
|
||||||
idcge.getSourceAddress() )
|
|
||||||
.to( idcge.getTargetAddress() )
|
|
||||||
.build();
|
|
||||||
|
|
||||||
broadcast( new TrafficChannelAllocationEvent( this, callEvent ) );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
logAlternateVendorMessage( pdu );
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case MESSAGE_UPDATE:
|
case MESSAGE_UPDATE:
|
||||||
if( pdu instanceof MessageUpdateExtended )
|
if( pdu instanceof MessageUpdateExtended )
|
||||||
{
|
{
|
||||||
@@ -1912,14 +1861,36 @@ public class P25DecoderState extends DecoderState
|
|||||||
logAlternateVendorMessage( pdu );
|
logAlternateVendorMessage( pdu );
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case NETWORK_STATUS_BROADCAST:
|
||||||
|
if( pdu instanceof NetworkStatusBroadcastExtended )
|
||||||
|
{
|
||||||
|
mNetworkStatusExtended = (NetworkStatusBroadcastExtended)pdu;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logAlternateVendorMessage( pdu );
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case PROTECTION_PARAMETER_BROADCAST:
|
||||||
|
if( pdu instanceof ProtectionParameterBroadcast )
|
||||||
|
{
|
||||||
|
mProtectionParameterBroadcast =
|
||||||
|
(ProtectionParameterBroadcast)pdu;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logAlternateVendorMessage( pdu );
|
||||||
|
}
|
||||||
|
break;
|
||||||
case RFSS_STATUS_BROADCAST:
|
case RFSS_STATUS_BROADCAST:
|
||||||
if( pdu instanceof RFSSStatusBroadcastExtended )
|
if( pdu instanceof RFSSStatusBroadcastExtended )
|
||||||
{
|
{
|
||||||
RFSSStatusBroadcastExtended rsbe = (RFSSStatusBroadcastExtended)pdu;
|
mRFSSStatusMessageExtended = (RFSSStatusBroadcastExtended)pdu;
|
||||||
|
|
||||||
updateNAC( rsbe.getNAC() );
|
updateNAC( mRFSSStatusMessageExtended.getNAC() );
|
||||||
updateSystem( rsbe.getSystemID() );
|
updateSystem( mRFSSStatusMessageExtended.getSystemID() );
|
||||||
updateSite( rsbe.getRFSubsystemID() + "-" + rsbe.getSiteID() );
|
updateSite( mRFSSStatusMessageExtended.getRFSubsystemID() +
|
||||||
|
"-" + mRFSSStatusMessageExtended.getSiteID() );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -2019,22 +1990,6 @@ public class P25DecoderState extends DecoderState
|
|||||||
logAlternateVendorMessage( pdu );
|
logAlternateVendorMessage( pdu );
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case TELEPHONE_INTERCONNECT_VOICE_CHANNEL_GRANT:
|
|
||||||
TelephoneInterconnectChannelGrantExplicit ticge =
|
|
||||||
(TelephoneInterconnectChannelGrantExplicit)pdu;
|
|
||||||
|
|
||||||
CallEvent callEvent = new P25CallEvent.Builder( CallEventType.TELEPHONE_INTERCONNECT )
|
|
||||||
.aliasList( getAliasList() )
|
|
||||||
.channel( ticge.getTransmitChannel() )
|
|
||||||
.details( ( ticge.isEncrypted() ? "ENCRYPTED" : "" ) +
|
|
||||||
( ticge.isEmergency() ? " EMERGENCY" : "") +
|
|
||||||
" CALL TIMER:" + ticge.getCallTimer() )
|
|
||||||
.frequency( ticge.getDownlinkFrequency() )
|
|
||||||
.from( ticge.getAddress() )
|
|
||||||
.build();
|
|
||||||
|
|
||||||
broadcast( new TrafficChannelAllocationEvent( this, callEvent ) );
|
|
||||||
break;
|
|
||||||
case UNIT_REGISTRATION_RESPONSE:
|
case UNIT_REGISTRATION_RESPONSE:
|
||||||
if( pdu instanceof UnitRegistrationResponseExtended )
|
if( pdu instanceof UnitRegistrationResponseExtended )
|
||||||
{
|
{
|
||||||
@@ -2095,60 +2050,253 @@ public class P25DecoderState extends DecoderState
|
|||||||
logAlternateVendorMessage( pdu );
|
logAlternateVendorMessage( pdu );
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case UNIT_TO_UNIT_VOICE_CHANNEL_GRANT:
|
|
||||||
if( pdu instanceof UnitToUnitVoiceChannelGrantExtended )
|
|
||||||
{
|
|
||||||
UnitToUnitVoiceChannelGrantExtended uuvcge =
|
|
||||||
(UnitToUnitVoiceChannelGrantExtended)pdu;
|
|
||||||
|
|
||||||
CallEvent uuCallEvent = new P25CallEvent.Builder( CallEventType.UNIT_TO_UNIT_CALL )
|
|
||||||
.aliasList( getAliasList() )
|
|
||||||
.channel( uuvcge.getTransmitChannel() )
|
|
||||||
.details( ( uuvcge.isEncrypted() ? "ENCRYPTED" : "" ) +
|
|
||||||
( uuvcge.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( uuvcge.getDownlinkFrequency() )
|
|
||||||
.from( uuvcge.getSourceWACN() + "-" +
|
|
||||||
uuvcge.getSourceSystemID() + "-" +
|
|
||||||
uuvcge.getSourceID() )
|
|
||||||
.to( uuvcge.getTargetAddress() )
|
|
||||||
.build();
|
|
||||||
|
|
||||||
broadcast( new TrafficChannelAllocationEvent( this, uuCallEvent ) );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
logAlternateVendorMessage( pdu );
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case UNIT_TO_UNIT_VOICE_CHANNEL_GRANT_UPDATE:
|
|
||||||
if( pdu instanceof UnitToUnitVoiceChannelGrantUpdateExtended )
|
|
||||||
{
|
|
||||||
UnitToUnitVoiceChannelGrantUpdateExtended uuvcgue =
|
|
||||||
(UnitToUnitVoiceChannelGrantUpdateExtended)pdu;
|
|
||||||
|
|
||||||
broadcast( new P25CallEvent.Builder( CallEventType.UNIT_TO_UNIT_CALL )
|
|
||||||
.aliasList( getAliasList() )
|
|
||||||
.channel( uuvcgue.getTransmitChannel() )
|
|
||||||
.details( ( uuvcgue.isEncrypted() ? "ENCRYPTED" : "" ) +
|
|
||||||
( uuvcgue.isEmergency() ? " EMERGENCY" : "") )
|
|
||||||
.frequency( uuvcgue.getDownlinkFrequency() )
|
|
||||||
.from( uuvcgue.getSourceWACN() + "-" +
|
|
||||||
uuvcgue.getSourceSystemID() + "-" +
|
|
||||||
uuvcgue.getSourceID() )
|
|
||||||
.to( uuvcgue.getTargetAddress() )
|
|
||||||
.build() );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
logAlternateVendorMessage( pdu );
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void processPDUChannelGrant( PDUMessage pdu )
|
||||||
|
{
|
||||||
|
String channel = null;
|
||||||
|
String from = null;
|
||||||
|
String to = null;
|
||||||
|
|
||||||
|
switch( pdu.getOpcode() )
|
||||||
|
{
|
||||||
|
case GROUP_DATA_CHANNEL_GRANT:
|
||||||
|
if( pdu instanceof GroupDataChannelGrantExtended )
|
||||||
|
{
|
||||||
|
GroupDataChannelGrantExtended gdcge =
|
||||||
|
(GroupDataChannelGrantExtended)pdu;
|
||||||
|
|
||||||
|
channel = gdcge.getTransmitChannel();
|
||||||
|
from = gdcge.getSourceAddress();
|
||||||
|
to = gdcge.getGroupAddress();
|
||||||
|
|
||||||
|
if( hasCallEvent( channel, from, to ) )
|
||||||
|
{
|
||||||
|
updateCallEvent( channel, from, to );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
P25CallEvent callEvent = new P25CallEvent.Builder( CallEventType.DATA_CALL )
|
||||||
|
.aliasList( getAliasList() )
|
||||||
|
.channel( channel )
|
||||||
|
.details( ( gdcge.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
|
( gdcge.isEmergency() ? " EMERGENCY" : "") )
|
||||||
|
.frequency( gdcge.getDownlinkFrequency() )
|
||||||
|
.from( from )
|
||||||
|
.to( to )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
registerCallEvent( callEvent );
|
||||||
|
broadcast( callEvent );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logAlternateVendorMessage( pdu );
|
||||||
|
}
|
||||||
|
|
||||||
|
/* We don't allocate traffic channels for data */
|
||||||
|
break;
|
||||||
|
case GROUP_VOICE_CHANNEL_GRANT:
|
||||||
|
if( pdu instanceof GroupVoiceChannelGrantExplicit )
|
||||||
|
{
|
||||||
|
GroupVoiceChannelGrantExplicit gvcge =
|
||||||
|
(GroupVoiceChannelGrantExplicit)pdu;
|
||||||
|
|
||||||
|
channel = gvcge.getTransmitChannel();
|
||||||
|
from = gvcge.getSourceAddress();
|
||||||
|
to = gvcge.getGroupAddress();
|
||||||
|
|
||||||
|
if( hasCallEvent( channel, from, to ) )
|
||||||
|
{
|
||||||
|
updateCallEvent( channel, from, to );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
P25CallEvent callEvent = new P25CallEvent.Builder( CallEventType.GROUP_CALL )
|
||||||
|
.aliasList( getAliasList() )
|
||||||
|
.channel( channel )
|
||||||
|
.details( ( gvcge.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
|
( gvcge.isEmergency() ? " EMERGENCY" : "") )
|
||||||
|
.frequency( gvcge.getDownlinkFrequency() )
|
||||||
|
.from( from )
|
||||||
|
.to( to )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
registerCallEvent( callEvent );
|
||||||
|
broadcast( callEvent );
|
||||||
|
}
|
||||||
|
|
||||||
|
broadcast( new TrafficChannelAllocationEvent( this,
|
||||||
|
mChannelCallMap.get( channel ) ) );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logAlternateVendorMessage( pdu );
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case INDIVIDUAL_DATA_CHANNEL_GRANT:
|
||||||
|
if( pdu instanceof IndividualDataChannelGrantExtended )
|
||||||
|
{
|
||||||
|
IndividualDataChannelGrantExtended idcge =
|
||||||
|
(IndividualDataChannelGrantExtended)pdu;
|
||||||
|
|
||||||
|
channel = idcge.getTransmitChannel();
|
||||||
|
from = idcge.getSourceWACN() + "-" +
|
||||||
|
idcge.getSourceSystemID() + "-" +
|
||||||
|
idcge.getSourceAddress();
|
||||||
|
to = idcge.getTargetAddress();
|
||||||
|
|
||||||
|
if( hasCallEvent( channel, from, to ) )
|
||||||
|
{
|
||||||
|
updateCallEvent( channel, from, to );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
P25CallEvent callEvent = new P25CallEvent.Builder( CallEventType.DATA_CALL )
|
||||||
|
.aliasList( getAliasList() )
|
||||||
|
.channel( channel )
|
||||||
|
.details( ( idcge.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
|
( idcge.isEmergency() ? " EMERGENCY" : "") )
|
||||||
|
.frequency( idcge.getDownlinkFrequency() )
|
||||||
|
.from( from )
|
||||||
|
.to( to )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
registerCallEvent( callEvent );
|
||||||
|
broadcast( callEvent );
|
||||||
|
}
|
||||||
|
|
||||||
|
//We don't allocate traffic channels for data
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logAlternateVendorMessage( pdu );
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case TELEPHONE_INTERCONNECT_VOICE_CHANNEL_GRANT:
|
||||||
|
TelephoneInterconnectChannelGrantExplicit ticge =
|
||||||
|
(TelephoneInterconnectChannelGrantExplicit)pdu;
|
||||||
|
|
||||||
|
channel = ticge.getTransmitChannel();
|
||||||
|
|
||||||
|
//We don't know if the subscriber is calling or being called, so
|
||||||
|
//we use the same address in both from/to fields
|
||||||
|
from = ticge.getAddress();
|
||||||
|
to = ticge.getAddress();
|
||||||
|
|
||||||
|
if( hasCallEvent( channel, from, to ) )
|
||||||
|
{
|
||||||
|
updateCallEvent( channel, from, to );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
P25CallEvent callEvent = new P25CallEvent.Builder( CallEventType.TELEPHONE_INTERCONNECT )
|
||||||
|
.aliasList( getAliasList() )
|
||||||
|
.channel( channel )
|
||||||
|
.details( ( ticge.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
|
( ticge.isEmergency() ? " EMERGENCY" : "") +
|
||||||
|
" CALL TIMER:" + ticge.getCallTimer() )
|
||||||
|
.frequency( ticge.getDownlinkFrequency() )
|
||||||
|
.from( from )
|
||||||
|
.to( to )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
registerCallEvent( callEvent );
|
||||||
|
broadcast( callEvent );
|
||||||
|
}
|
||||||
|
|
||||||
|
broadcast( new TrafficChannelAllocationEvent( this,
|
||||||
|
mChannelCallMap.get( channel ) ) );
|
||||||
|
break;
|
||||||
|
case UNIT_TO_UNIT_VOICE_CHANNEL_GRANT:
|
||||||
|
if( pdu instanceof UnitToUnitVoiceChannelGrantExtended )
|
||||||
|
{
|
||||||
|
UnitToUnitVoiceChannelGrantExtended uuvcge =
|
||||||
|
(UnitToUnitVoiceChannelGrantExtended)pdu;
|
||||||
|
|
||||||
|
channel = uuvcge.getTransmitChannel();
|
||||||
|
from = uuvcge.getSourceWACN() + "-" +
|
||||||
|
uuvcge.getSourceSystemID() + "-" +
|
||||||
|
uuvcge.getSourceID();
|
||||||
|
to = uuvcge.getTargetAddress();
|
||||||
|
|
||||||
|
if( hasCallEvent( channel, from, to ) )
|
||||||
|
{
|
||||||
|
updateCallEvent( channel, from, to );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
P25CallEvent callEvent = new P25CallEvent.Builder( CallEventType.UNIT_TO_UNIT_CALL )
|
||||||
|
.aliasList( getAliasList() )
|
||||||
|
.channel( channel )
|
||||||
|
.details( ( uuvcge.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
|
( uuvcge.isEmergency() ? " EMERGENCY" : "") )
|
||||||
|
.frequency( uuvcge.getDownlinkFrequency() )
|
||||||
|
.from( from )
|
||||||
|
.to( to )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
registerCallEvent( callEvent );
|
||||||
|
broadcast( callEvent );
|
||||||
|
}
|
||||||
|
|
||||||
|
broadcast( new TrafficChannelAllocationEvent( this,
|
||||||
|
mChannelCallMap.get( channel ) ) );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logAlternateVendorMessage( pdu );
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case UNIT_TO_UNIT_VOICE_CHANNEL_GRANT_UPDATE:
|
||||||
|
if( pdu instanceof UnitToUnitVoiceChannelGrantUpdateExtended )
|
||||||
|
{
|
||||||
|
UnitToUnitVoiceChannelGrantUpdateExtended uuvcgue =
|
||||||
|
(UnitToUnitVoiceChannelGrantUpdateExtended)pdu;
|
||||||
|
|
||||||
|
channel = uuvcgue.getTransmitChannel();
|
||||||
|
from = uuvcgue.getSourceWACN() + "-" +
|
||||||
|
uuvcgue.getSourceSystemID() + "-" +
|
||||||
|
uuvcgue.getSourceID();
|
||||||
|
to = uuvcgue.getTargetAddress();
|
||||||
|
|
||||||
|
if( hasCallEvent( channel, from, to ) )
|
||||||
|
{
|
||||||
|
updateCallEvent( channel, from, to );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
P25CallEvent callEvent = new P25CallEvent.Builder( CallEventType.UNIT_TO_UNIT_CALL )
|
||||||
|
.aliasList( getAliasList() )
|
||||||
|
.channel( channel )
|
||||||
|
.details( ( uuvcgue.isEncrypted() ? "ENCRYPTED" : "" ) +
|
||||||
|
( uuvcgue.isEmergency() ? " EMERGENCY" : "") )
|
||||||
|
.frequency( uuvcgue.getDownlinkFrequency() )
|
||||||
|
.from( from )
|
||||||
|
.to( to )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
registerCallEvent( callEvent );
|
||||||
|
broadcast( callEvent );
|
||||||
|
}
|
||||||
|
|
||||||
|
broadcast( new TrafficChannelAllocationEvent( this,
|
||||||
|
mChannelCallMap.get( channel ) ) );
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logAlternateVendorMessage( pdu );
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void processTSBKCommand( TSBKMessage message )
|
private void processTSBKCommand( TSBKMessage message )
|
||||||
{
|
{
|
||||||
switch( message.getOpcode() )
|
switch( message.getOpcode() )
|
||||||
@@ -3277,11 +3425,11 @@ public class P25DecoderState extends DecoderState
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
for( AdjacentStatusBroadcast neighbor: mNeighborMap.values() )
|
for( IAdjacentSite neighbor: mNeighborMap.values() )
|
||||||
{
|
{
|
||||||
sb.append( "\nNAC:\t" + neighbor.getNAC() );
|
sb.append( "\nNAC:\t" + ((P25Message)neighbor).getNAC() );
|
||||||
sb.append( "\nSYSTEM:\t" + neighbor.getSystemID() );
|
sb.append( "\nSYSTEM:\t" + neighbor.getSystemID() );
|
||||||
sb.append( "\nLRA:\t" + neighbor.getLocationRegistrationArea() );
|
sb.append( "\nLRA:\t" + neighbor.getLRA() );
|
||||||
|
|
||||||
String neighborID = neighbor.getRFSS() + "-" + neighbor.getSiteID();
|
String neighborID = neighbor.getRFSS() + "-" + neighbor.getSiteID();
|
||||||
sb.append( "\nRFSS-SITE:\t" + neighborID );
|
sb.append( "\nRFSS-SITE:\t" + neighborID );
|
||||||
@@ -3298,10 +3446,11 @@ public class P25DecoderState extends DecoderState
|
|||||||
|
|
||||||
sb.append( "\nPCCH:\tDNLINK " + mFrequencyFormatter.format(
|
sb.append( "\nPCCH:\tDNLINK " + mFrequencyFormatter.format(
|
||||||
(double)neighbor.getDownlinkFrequency() / 1E6d ) +
|
(double)neighbor.getDownlinkFrequency() / 1E6d ) +
|
||||||
" [" + neighbor.getIdentifier() + "-" + neighbor.getChannel() + "]" );
|
" [" + neighbor.getDownlinkChannel() + "]" );
|
||||||
sb.append( "\n\tUPLINK:" + mFrequencyFormatter.format(
|
sb.append( "\n\tUPLINK:" + mFrequencyFormatter.format(
|
||||||
(double)neighbor.getUplinkFrequency() / 1E6d ) + "\n" );
|
(double)neighbor.getUplinkFrequency() / 1E6d ) +
|
||||||
sb.append( "\nSERVICES:\t" + Service.getServices( neighbor.getSystemServiceClass() ) );
|
" [" + neighbor.getDownlinkChannel() + "]\n" );
|
||||||
|
sb.append( "\nSERVICES:\t" + neighbor.getSystemServiceClass() );
|
||||||
sb.append( "\n----------------------------------------------------" );
|
sb.append( "\n----------------------------------------------------" );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3368,6 +3517,8 @@ public class P25DecoderState extends DecoderState
|
|||||||
TrafficChannelAllocationEvent allocationEvent =
|
TrafficChannelAllocationEvent allocationEvent =
|
||||||
(TrafficChannelAllocationEvent)event;
|
(TrafficChannelAllocationEvent)event;
|
||||||
|
|
||||||
|
mCurrentCallEvent = (P25CallEvent)allocationEvent.getCallEvent();
|
||||||
|
|
||||||
mCurrentChannel = allocationEvent.getCallEvent().getChannel();
|
mCurrentChannel = allocationEvent.getCallEvent().getChannel();
|
||||||
broadcast( ChangedAttribute.CHANNEL_NUMBER );
|
broadcast( ChangedAttribute.CHANNEL_NUMBER );
|
||||||
|
|
||||||
|
|||||||
@@ -43,8 +43,6 @@ public class P25Editor extends DecodeEditor
|
|||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
private JComboBox<P25_LSMDecoder.Modulation> mComboModulation;
|
private JComboBox<P25_LSMDecoder.Modulation> mComboModulation;
|
||||||
private JLabel mCallTimeoutLabel;
|
|
||||||
private JSlider mCallTimeout;
|
|
||||||
private JLabel mTrafficChannelPoolSizeLabel;
|
private JLabel mTrafficChannelPoolSizeLabel;
|
||||||
private JSlider mTrafficChannelPoolSize;
|
private JSlider mTrafficChannelPoolSize;
|
||||||
|
|
||||||
@@ -67,32 +65,6 @@ public class P25Editor extends DecodeEditor
|
|||||||
add( new JLabel( "Modulation:" ) );
|
add( new JLabel( "Modulation:" ) );
|
||||||
add( mComboModulation, "wrap" );
|
add( mComboModulation, "wrap" );
|
||||||
|
|
||||||
mCallTimeout = new JSlider( JSlider.HORIZONTAL,
|
|
||||||
DecodeConfiguration.CALL_TIMEOUT_MINIMUM,
|
|
||||||
DecodeConfiguration.CALL_TIMEOUT_MAXIMUM,
|
|
||||||
DecodeConfiguration.DEFAULT_CALL_TIMEOUT_SECONDS );
|
|
||||||
|
|
||||||
mCallTimeout.setMajorTickSpacing( 90 );
|
|
||||||
mCallTimeout.setMinorTickSpacing( 10 );
|
|
||||||
mCallTimeout.setPaintTicks( true );
|
|
||||||
|
|
||||||
mCallTimeout.setLabelTable( mCallTimeout.createStandardLabels( 100, 100 ) );
|
|
||||||
mCallTimeout.setPaintLabels( true );
|
|
||||||
|
|
||||||
mCallTimeoutLabel = new JLabel( "Call Timeout: " + mCallTimeout.getValue() + " " );
|
|
||||||
|
|
||||||
mCallTimeout.addChangeListener( new ChangeListener()
|
|
||||||
{
|
|
||||||
@Override
|
|
||||||
public void stateChanged( ChangeEvent e )
|
|
||||||
{
|
|
||||||
mCallTimeoutLabel.setText( "Call Timeout: " + mCallTimeout.getValue() );
|
|
||||||
}
|
|
||||||
} );
|
|
||||||
|
|
||||||
add( mCallTimeoutLabel );
|
|
||||||
add( mCallTimeout, "wrap,grow" );
|
|
||||||
|
|
||||||
mTrafficChannelPoolSize = new JSlider( JSlider.HORIZONTAL,
|
mTrafficChannelPoolSize = new JSlider( JSlider.HORIZONTAL,
|
||||||
DecodeConfiguration.TRAFFIC_CHANNEL_LIMIT_MINIMUM,
|
DecodeConfiguration.TRAFFIC_CHANNEL_LIMIT_MINIMUM,
|
||||||
DecodeConfiguration.TRAFFIC_CHANNEL_LIMIT_MAXIMUM,
|
DecodeConfiguration.TRAFFIC_CHANNEL_LIMIT_MAXIMUM,
|
||||||
@@ -150,8 +122,6 @@ public class P25Editor extends DecodeEditor
|
|||||||
|
|
||||||
config.setModulation( (Modulation)mComboModulation.getSelectedItem() );
|
config.setModulation( (Modulation)mComboModulation.getSelectedItem() );
|
||||||
|
|
||||||
config.setCallTimeout( mCallTimeout.getValue() );
|
|
||||||
|
|
||||||
config.setTrafficChannelPoolSize( mTrafficChannelPoolSize.getValue() );
|
config.setTrafficChannelPoolSize( mTrafficChannelPoolSize.getValue() );
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -162,8 +132,6 @@ public class P25Editor extends DecodeEditor
|
|||||||
|
|
||||||
mComboModulation.setSelectedItem( config.getModulation() );
|
mComboModulation.setSelectedItem( config.getModulation() );
|
||||||
|
|
||||||
mCallTimeout.setValue( config.getCallTimeout() );
|
|
||||||
|
|
||||||
mTrafficChannelPoolSize.setValue( config.getTrafficChannelPoolSize() );
|
mTrafficChannelPoolSize.setValue( config.getTrafficChannelPoolSize() );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
20
src/module/decode/p25/message/IAdjacentSite.java
Normal file
20
src/module/decode/p25/message/IAdjacentSite.java
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
package module.decode.p25.message;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Interface for adjacent site (ie neighbor) messages
|
||||||
|
*/
|
||||||
|
public interface IAdjacentSite
|
||||||
|
{
|
||||||
|
public String getUniqueID();
|
||||||
|
public String getRFSS();
|
||||||
|
public String getSystemID();
|
||||||
|
public String getSiteID();
|
||||||
|
public String getLRA();
|
||||||
|
public String getSystemServiceClass();
|
||||||
|
|
||||||
|
public String getDownlinkChannel();
|
||||||
|
public long getDownlinkFrequency();
|
||||||
|
|
||||||
|
public String getUplinkChannel();
|
||||||
|
public long getUplinkFrequency();
|
||||||
|
}
|
||||||
@@ -1,16 +1,17 @@
|
|||||||
package module.decode.p25.message.ldu.lc;
|
package module.decode.p25.message.ldu.lc;
|
||||||
|
|
||||||
|
import module.decode.p25.message.IAdjacentSite;
|
||||||
import module.decode.p25.message.IBandIdentifier;
|
import module.decode.p25.message.IBandIdentifier;
|
||||||
import module.decode.p25.message.IdentifierReceiver;
|
import module.decode.p25.message.IdentifierReceiver;
|
||||||
import module.decode.p25.message.ldu.LDU1Message;
|
import module.decode.p25.message.ldu.LDU1Message;
|
||||||
|
import module.decode.p25.message.tsbk.osp.control.SystemService;
|
||||||
import module.decode.p25.reference.LinkControlOpcode;
|
import module.decode.p25.reference.LinkControlOpcode;
|
||||||
import module.decode.p25.reference.Service;
|
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
public class AdjacentSiteStatusBroadcast extends LDU1Message
|
public class AdjacentSiteStatusBroadcast extends LDU1Message
|
||||||
implements IdentifierReceiver
|
implements IdentifierReceiver, IAdjacentSite
|
||||||
{
|
{
|
||||||
private final static Logger mLog =
|
private final static Logger mLog =
|
||||||
LoggerFactory.getLogger( AdjacentSiteStatusBroadcast.class );
|
LoggerFactory.getLogger( AdjacentSiteStatusBroadcast.class );
|
||||||
@@ -46,20 +47,33 @@ public class AdjacentSiteStatusBroadcast extends LDU1Message
|
|||||||
|
|
||||||
sb.append( getMessageStub() );
|
sb.append( getMessageStub() );
|
||||||
|
|
||||||
sb.append( " LRA:" + getLocationRegistrationArea() );
|
sb.append( " LRA:" + getLRA() );
|
||||||
|
|
||||||
sb.append( " SYS:" + getSystemID() );
|
sb.append( " SYS:" + getSystemID() );
|
||||||
|
|
||||||
sb.append( " SITE:" + getRFSubsystemID() + "-" + getSiteID() );
|
sb.append( " SITE:" + getRFSS() + "-" + getSiteID() );
|
||||||
|
|
||||||
sb.append( " CHAN:" + getChannel() );
|
sb.append( " CHAN:" + getChannel() );
|
||||||
|
|
||||||
sb.append( " " + Service.getServices( getSystemServiceClass() ).toString() );
|
sb.append( " " + getSystemServiceClass() );
|
||||||
|
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getLocationRegistrationArea()
|
public String getUniqueID()
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
|
||||||
|
sb.append( getSystemID() );
|
||||||
|
sb.append( ":" );
|
||||||
|
sb.append( getRFSS() );
|
||||||
|
sb.append( ":" );
|
||||||
|
sb.append( getSiteID() );
|
||||||
|
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getLRA()
|
||||||
{
|
{
|
||||||
return mMessage.getHex( LRA, 2 );
|
return mMessage.getHex( LRA, 2 );
|
||||||
}
|
}
|
||||||
@@ -69,7 +83,7 @@ public class AdjacentSiteStatusBroadcast extends LDU1Message
|
|||||||
return mMessage.getHex( SYSTEM_ID, 3 );
|
return mMessage.getHex( SYSTEM_ID, 3 );
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getRFSubsystemID()
|
public String getRFSS()
|
||||||
{
|
{
|
||||||
return mMessage.getHex( RFSS_ID, 2 );
|
return mMessage.getHex( RFSS_ID, 2 );
|
||||||
}
|
}
|
||||||
@@ -94,9 +108,9 @@ public class AdjacentSiteStatusBroadcast extends LDU1Message
|
|||||||
return mMessage.getInt( CHANNEL );
|
return mMessage.getInt( CHANNEL );
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getSystemServiceClass()
|
public String getSystemServiceClass()
|
||||||
{
|
{
|
||||||
return mMessage.getInt( SYSTEM_SERVICE_CLASS );
|
return SystemService.toString( mMessage.getInt( SYSTEM_SERVICE_CLASS ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -115,12 +129,25 @@ public class AdjacentSiteStatusBroadcast extends LDU1Message
|
|||||||
return identifiers;
|
return identifiers;
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getDownlinkFrequency()
|
|
||||||
|
@Override
|
||||||
|
public String getDownlinkChannel()
|
||||||
|
{
|
||||||
|
return getChannel();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getUplinkChannel()
|
||||||
|
{
|
||||||
|
return getChannel();
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getDownlinkFrequency()
|
||||||
{
|
{
|
||||||
return calculateDownlink( mIdentifierUpdate, getChannelNumber() );
|
return calculateDownlink( mIdentifierUpdate, getChannelNumber() );
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getUplinkFrequencyB()
|
public long getUplinkFrequency()
|
||||||
{
|
{
|
||||||
return calculateUplink( mIdentifierUpdate, getChannelNumber() );
|
return calculateUplink( mIdentifierUpdate, getChannelNumber() );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
package module.decode.p25.message.ldu.lc;
|
package module.decode.p25.message.ldu.lc;
|
||||||
|
|
||||||
|
import module.decode.p25.message.IAdjacentSite;
|
||||||
|
import module.decode.p25.message.IBandIdentifier;
|
||||||
|
import module.decode.p25.message.IdentifierReceiver;
|
||||||
import module.decode.p25.message.ldu.LDU1Message;
|
import module.decode.p25.message.ldu.LDU1Message;
|
||||||
import module.decode.p25.reference.LinkControlOpcode;
|
import module.decode.p25.reference.LinkControlOpcode;
|
||||||
|
|
||||||
@@ -7,6 +10,7 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
public class AdjacentSiteStatusBroadcastExplicit extends LDU1Message
|
public class AdjacentSiteStatusBroadcastExplicit extends LDU1Message
|
||||||
|
implements IdentifierReceiver, IAdjacentSite
|
||||||
{
|
{
|
||||||
private final static Logger mLog =
|
private final static Logger mLog =
|
||||||
LoggerFactory.getLogger( AdjacentSiteStatusBroadcastExplicit.class );
|
LoggerFactory.getLogger( AdjacentSiteStatusBroadcastExplicit.class );
|
||||||
@@ -22,6 +26,9 @@ public class AdjacentSiteStatusBroadcastExplicit extends LDU1Message
|
|||||||
public static final int[] RECEIVE_CHANNEL = { 724,725,730,731,732,733,734,
|
public static final int[] RECEIVE_CHANNEL = { 724,725,730,731,732,733,734,
|
||||||
735,740,741,742,743 };
|
735,740,741,742,743 };
|
||||||
|
|
||||||
|
private IBandIdentifier mTransmitBand;
|
||||||
|
private IBandIdentifier mReceiveBand;
|
||||||
|
|
||||||
public AdjacentSiteStatusBroadcastExplicit( LDU1Message message )
|
public AdjacentSiteStatusBroadcastExplicit( LDU1Message message )
|
||||||
{
|
{
|
||||||
super( message );
|
super( message );
|
||||||
@@ -40,27 +47,45 @@ public class AdjacentSiteStatusBroadcastExplicit extends LDU1Message
|
|||||||
|
|
||||||
sb.append( getMessageStub() );
|
sb.append( getMessageStub() );
|
||||||
|
|
||||||
sb.append( " LRA:" + getLocationRegistrationArea() );
|
sb.append( " LRA:" + getLRA() );
|
||||||
|
|
||||||
sb.append( " SITE:" + getRFSubsystemID() + "-" + getSiteID() );
|
sb.append( " SITE:" + getRFSS() + "-" + getSiteID() );
|
||||||
|
|
||||||
sb.append( " DNLINK:" + getTransmitChannelNumber() );
|
sb.append( " DNLINK:" + getDownlinkChannel() );
|
||||||
|
|
||||||
sb.append( " UPLINK:" + getReceiveChannelNumber() );
|
sb.append( " UPLINK:" + getUplinkChannel() );
|
||||||
|
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getLocationRegistrationArea()
|
public String getUniqueID()
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
|
||||||
|
sb.append( getSystemID() );
|
||||||
|
sb.append( ":" );
|
||||||
|
sb.append( getRFSS() );
|
||||||
|
sb.append( ":" );
|
||||||
|
sb.append( getSiteID() );
|
||||||
|
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getLRA()
|
||||||
{
|
{
|
||||||
return mMessage.getHex( LRA, 2 );
|
return mMessage.getHex( LRA, 2 );
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getRFSubsystemID()
|
public String getRFSS()
|
||||||
{
|
{
|
||||||
return mMessage.getHex( RFSS_ID, 2 );
|
return mMessage.getHex( RFSS_ID, 2 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getSystemID()
|
||||||
|
{
|
||||||
|
return "***";
|
||||||
|
}
|
||||||
|
|
||||||
public String getSiteID()
|
public String getSiteID()
|
||||||
{
|
{
|
||||||
return mMessage.getHex( SITE_ID, 2 );
|
return mMessage.getHex( SITE_ID, 2 );
|
||||||
@@ -76,7 +101,7 @@ public class AdjacentSiteStatusBroadcastExplicit extends LDU1Message
|
|||||||
return mMessage.getInt( TRANSMIT_CHANNEL );
|
return mMessage.getInt( TRANSMIT_CHANNEL );
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getTransmitChannelNumber()
|
public String getDownlinkChannel()
|
||||||
{
|
{
|
||||||
return getTransmitIdentifier() + "-" + getTransmitChannel();
|
return getTransmitIdentifier() + "-" + getTransmitChannel();
|
||||||
}
|
}
|
||||||
@@ -91,8 +116,50 @@ public class AdjacentSiteStatusBroadcastExplicit extends LDU1Message
|
|||||||
return mMessage.getInt( RECEIVE_CHANNEL );
|
return mMessage.getInt( RECEIVE_CHANNEL );
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getReceiveChannelNumber()
|
public String getUplinkChannel()
|
||||||
{
|
{
|
||||||
return getReceiveIdentifier() + "-" + getReceiveChannel();
|
return getReceiveIdentifier() + "-" + getReceiveChannel();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getSystemServiceClass()
|
||||||
|
{
|
||||||
|
return "[]";
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getDownlinkFrequency()
|
||||||
|
{
|
||||||
|
return calculateDownlink( mTransmitBand, getTransmitChannel() );
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getUplinkFrequency()
|
||||||
|
{
|
||||||
|
return calculateUplink( mReceiveBand, getReceiveChannel() );
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setIdentifierMessage( int identifier, IBandIdentifier message )
|
||||||
|
{
|
||||||
|
if( identifier == getTransmitIdentifier() )
|
||||||
|
{
|
||||||
|
mTransmitBand = message;
|
||||||
|
}
|
||||||
|
|
||||||
|
if( identifier == getReceiveIdentifier() )
|
||||||
|
{
|
||||||
|
mReceiveBand = message;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int[] getIdentifiers()
|
||||||
|
{
|
||||||
|
int[] identifiers = new int[ 2 ];
|
||||||
|
|
||||||
|
identifiers[ 0 ] = getTransmitIdentifier();
|
||||||
|
identifiers[ 1 ] = getReceiveIdentifier();
|
||||||
|
|
||||||
|
return identifiers;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,7 +45,19 @@ public class PDUMessage extends P25Message
|
|||||||
sb.append( "NAC:" );
|
sb.append( "NAC:" );
|
||||||
sb.append( getNAC() );
|
sb.append( getNAC() );
|
||||||
sb.append( " " );
|
sb.append( " " );
|
||||||
sb.append( getDUID().getLabel() );
|
|
||||||
|
switch( getFormat() )
|
||||||
|
{
|
||||||
|
case ALTERNATE_MULTI_BLOCK_TRUNKING_CONTROL:
|
||||||
|
sb.append( "ATSBK" );
|
||||||
|
break;
|
||||||
|
case UNCONFIRMED_MULTI_BLOCK_TRUNKING_CONTROL:
|
||||||
|
sb.append( "**** UNCONFIRMED MULTI-BLOCK TRUNKING CONTROL" );
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
sb.append( getDUID().getLabel() );
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
if( vendor == Vendor.STANDARD )
|
if( vendor == Vendor.STANDARD )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -66,6 +66,7 @@ public class PDUMessageFactory
|
|||||||
return new GroupDataChannelGrantExtended(
|
return new GroupDataChannelGrantExtended(
|
||||||
message, duid, aliasList );
|
message, duid, aliasList );
|
||||||
case GROUP_VOICE_CHANNEL_GRANT:
|
case GROUP_VOICE_CHANNEL_GRANT:
|
||||||
|
|
||||||
return new GroupVoiceChannelGrantExplicit(
|
return new GroupVoiceChannelGrantExplicit(
|
||||||
message, duid, aliasList );
|
message, duid, aliasList );
|
||||||
case INDIVIDUAL_DATA_CHANNEL_GRANT:
|
case INDIVIDUAL_DATA_CHANNEL_GRANT:
|
||||||
@@ -123,7 +124,6 @@ public class PDUMessageFactory
|
|||||||
|
|
||||||
case UNCONFIRMED_MULTI_BLOCK_TRUNKING_CONTROL:
|
case UNCONFIRMED_MULTI_BLOCK_TRUNKING_CONTROL:
|
||||||
return new PDUMessage( message, duid, aliasList );
|
return new PDUMessage( message, duid, aliasList );
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return new PDUMessage( message, duid, aliasList );
|
return new PDUMessage( message, duid, aliasList );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package module.decode.p25.message.pdu.osp.control;
|
package module.decode.p25.message.pdu.osp.control;
|
||||||
|
|
||||||
|
import module.decode.p25.message.IAdjacentSite;
|
||||||
import module.decode.p25.message.IBandIdentifier;
|
import module.decode.p25.message.IBandIdentifier;
|
||||||
import module.decode.p25.message.IdentifierReceiver;
|
import module.decode.p25.message.IdentifierReceiver;
|
||||||
import module.decode.p25.message.pdu.PDUMessage;
|
import module.decode.p25.message.pdu.PDUMessage;
|
||||||
@@ -11,7 +12,7 @@ import bits.BinaryMessage;
|
|||||||
import edac.CRCP25;
|
import edac.CRCP25;
|
||||||
|
|
||||||
public class AdjacentStatusBroadcastExtended extends PDUMessage
|
public class AdjacentStatusBroadcastExtended extends PDUMessage
|
||||||
implements IdentifierReceiver
|
implements IdentifierReceiver, IAdjacentSite
|
||||||
{
|
{
|
||||||
public static final int[] LRA = { 88,89,90,91,92,93,94,95 };
|
public static final int[] LRA = { 88,89,90,91,92,93,94,95 };
|
||||||
public static final int[] SYSTEM_ID = { 100,101,102,103,104,105,106,107,108,
|
public static final int[] SYSTEM_ID = { 100,101,102,103,104,105,106,107,108,
|
||||||
@@ -57,11 +58,11 @@ public class AdjacentStatusBroadcastExtended extends PDUMessage
|
|||||||
|
|
||||||
sb.append( getMessageStub() );
|
sb.append( getMessageStub() );
|
||||||
|
|
||||||
sb.append( " LRA:" + getLocationRegistrationArea() );
|
sb.append( " LRA:" + getLRA() );
|
||||||
|
|
||||||
sb.append( " SYS:" + getSystemID() );
|
sb.append( " SYS:" + getSystemID() );
|
||||||
|
|
||||||
sb.append( " RFSS:" + getRFSubsystemID() );
|
sb.append( " RFSS:" + getRFSS() );
|
||||||
|
|
||||||
sb.append( " SITE:" + getSiteID() );
|
sb.append( " SITE:" + getSiteID() );
|
||||||
|
|
||||||
@@ -73,28 +74,29 @@ public class AdjacentStatusBroadcastExtended extends PDUMessage
|
|||||||
|
|
||||||
sb.append( " UP:" + getUplinkFrequency() );
|
sb.append( " UP:" + getUplinkFrequency() );
|
||||||
|
|
||||||
sb.append( " SYS SVC CLASS:" +
|
sb.append( " SYS SVC CLASS:" + getSystemServiceClass() );
|
||||||
SystemService.toString( getSystemServiceClass() ) );
|
|
||||||
|
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getUniqueID()
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
|
||||||
public String getLocationRegistrationArea()
|
sb.append( getSystemID() );
|
||||||
{
|
sb.append( ":" );
|
||||||
return mMessage.getHex( LRA, 2 );
|
sb.append( getRFSS() );
|
||||||
}
|
sb.append( ":" );
|
||||||
|
sb.append( getSiteID() );
|
||||||
|
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
public String getSystemID()
|
public String getSystemID()
|
||||||
{
|
{
|
||||||
return mMessage.getHex( SYSTEM_ID, 3 );
|
return mMessage.getHex( SYSTEM_ID, 3 );
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getRFSubsystemID()
|
|
||||||
{
|
|
||||||
return mMessage.getHex( RF_SUBSYSTEM_ID, 2 );
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getSiteID()
|
public String getSiteID()
|
||||||
{
|
{
|
||||||
return mMessage.getHex( SITE_ID, 2 );
|
return mMessage.getHex( SITE_ID, 2 );
|
||||||
@@ -120,11 +122,6 @@ public class AdjacentStatusBroadcastExtended extends PDUMessage
|
|||||||
return mMessage.getInt( RECEIVE_CHANNEL );
|
return mMessage.getInt( RECEIVE_CHANNEL );
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getSystemServiceClass()
|
|
||||||
{
|
|
||||||
return mMessage.getInt( SYSTEM_SERVICE_CLASS );
|
|
||||||
}
|
|
||||||
|
|
||||||
public long getDownlinkFrequency()
|
public long getDownlinkFrequency()
|
||||||
{
|
{
|
||||||
return calculateDownlink( mTransmitIdentifierProvider, getTransmitChannel() );
|
return calculateDownlink( mTransmitIdentifierProvider, getTransmitChannel() );
|
||||||
@@ -158,4 +155,34 @@ public class AdjacentStatusBroadcastExtended extends PDUMessage
|
|||||||
|
|
||||||
return idens;
|
return idens;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getRFSS()
|
||||||
|
{
|
||||||
|
return mMessage.getHex( RF_SUBSYSTEM_ID, 2 );
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getLRA()
|
||||||
|
{
|
||||||
|
return mMessage.getHex( LRA, 2 );
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getSystemServiceClass()
|
||||||
|
{
|
||||||
|
return SystemService.toString( mMessage.getInt( SYSTEM_SERVICE_CLASS ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getDownlinkChannel()
|
||||||
|
{
|
||||||
|
return getTransmitIdentifier() + "-" + getTransmitChannel();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getUplinkChannel()
|
||||||
|
{
|
||||||
|
return getReceiveIdentifier() + "-" + getReceiveChannel();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -77,6 +77,9 @@ public class GroupVoiceChannelGrantExplicit extends PDUMessage
|
|||||||
sb.append( " CHAN UP:" + getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber() );
|
sb.append( " CHAN UP:" + getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber() );
|
||||||
sb.append( " " + getUplinkFrequency() );
|
sb.append( " " + getUplinkFrequency() );
|
||||||
|
|
||||||
|
sb.append( " " );
|
||||||
|
sb.append( mMessage.toString() );
|
||||||
|
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
package module.decode.p25.message.tdu.lc;
|
package module.decode.p25.message.tdu.lc;
|
||||||
|
|
||||||
|
import module.decode.p25.message.IAdjacentSite;
|
||||||
import module.decode.p25.message.IBandIdentifier;
|
import module.decode.p25.message.IBandIdentifier;
|
||||||
import module.decode.p25.message.IdentifierReceiver;
|
import module.decode.p25.message.IdentifierReceiver;
|
||||||
|
import module.decode.p25.message.tsbk.osp.control.SystemService;
|
||||||
import module.decode.p25.reference.LinkControlOpcode;
|
import module.decode.p25.reference.LinkControlOpcode;
|
||||||
import module.decode.p25.reference.Service;
|
import module.decode.p25.reference.Service;
|
||||||
|
|
||||||
@@ -9,7 +11,7 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
public class AdjacentSiteStatusBroadcast extends TDULinkControlMessage
|
public class AdjacentSiteStatusBroadcast extends TDULinkControlMessage
|
||||||
implements IdentifierReceiver
|
implements IdentifierReceiver, IAdjacentSite
|
||||||
{
|
{
|
||||||
private final static Logger mLog =
|
private final static Logger mLog =
|
||||||
LoggerFactory.getLogger( AdjacentSiteStatusBroadcast.class );
|
LoggerFactory.getLogger( AdjacentSiteStatusBroadcast.class );
|
||||||
@@ -45,20 +47,33 @@ public class AdjacentSiteStatusBroadcast extends TDULinkControlMessage
|
|||||||
|
|
||||||
sb.append( getMessageStub() );
|
sb.append( getMessageStub() );
|
||||||
|
|
||||||
sb.append( " LRA:" + getLocationRegistrationArea() );
|
sb.append( " LRA:" + getLRA() );
|
||||||
|
|
||||||
sb.append( " SYS:" + getSystemID() );
|
sb.append( " SYS:" + getSystemID() );
|
||||||
|
|
||||||
sb.append( " SITE:" + getRFSubsystemID() + "-" + getSiteID() );
|
sb.append( " SITE:" + getRFSS() + "-" + getSiteID() );
|
||||||
|
|
||||||
sb.append( " CHAN:" + getChannel() );
|
sb.append( " CHAN:" + getChannel() );
|
||||||
|
|
||||||
sb.append( " " + Service.getServices( getSystemServiceClass() ).toString() );
|
sb.append( " " + getSystemServiceClass() );
|
||||||
|
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getLocationRegistrationArea()
|
public String getUniqueID()
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
|
||||||
|
sb.append( getSystemID() );
|
||||||
|
sb.append( ":" );
|
||||||
|
sb.append( getRFSS() );
|
||||||
|
sb.append( ":" );
|
||||||
|
sb.append( getSiteID() );
|
||||||
|
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getLRA()
|
||||||
{
|
{
|
||||||
return mMessage.getHex( LRA, 2 );
|
return mMessage.getHex( LRA, 2 );
|
||||||
}
|
}
|
||||||
@@ -68,7 +83,7 @@ public class AdjacentSiteStatusBroadcast extends TDULinkControlMessage
|
|||||||
return mMessage.getHex( SYSTEM_ID, 3 );
|
return mMessage.getHex( SYSTEM_ID, 3 );
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getRFSubsystemID()
|
public String getRFSS()
|
||||||
{
|
{
|
||||||
return mMessage.getHex( RFSS_ID, 2 );
|
return mMessage.getHex( RFSS_ID, 2 );
|
||||||
}
|
}
|
||||||
@@ -88,14 +103,26 @@ public class AdjacentSiteStatusBroadcast extends TDULinkControlMessage
|
|||||||
return getIdentifier() + "-" + getChannelNumber();
|
return getIdentifier() + "-" + getChannelNumber();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getDownlinkChannel()
|
||||||
|
{
|
||||||
|
return getChannel();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getUplinkChannel()
|
||||||
|
{
|
||||||
|
return getChannel();
|
||||||
|
}
|
||||||
|
|
||||||
public int getChannelNumber()
|
public int getChannelNumber()
|
||||||
{
|
{
|
||||||
return mMessage.getInt( CHANNEL );
|
return mMessage.getInt( CHANNEL );
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getSystemServiceClass()
|
public String getSystemServiceClass()
|
||||||
{
|
{
|
||||||
return mMessage.getInt( SYSTEM_SERVICE_CLASS );
|
return SystemService.toString( mMessage.getInt( SYSTEM_SERVICE_CLASS ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -119,7 +146,7 @@ public class AdjacentSiteStatusBroadcast extends TDULinkControlMessage
|
|||||||
return calculateDownlink( mIdentifierUpdate, getChannelNumber() );
|
return calculateDownlink( mIdentifierUpdate, getChannelNumber() );
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getUplinkFrequencyB()
|
public long getUplinkFrequency()
|
||||||
{
|
{
|
||||||
return calculateUplink( mIdentifierUpdate, getChannelNumber() );
|
return calculateUplink( mIdentifierUpdate, getChannelNumber() );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,15 @@
|
|||||||
package module.decode.p25.message.tdu.lc;
|
package module.decode.p25.message.tdu.lc;
|
||||||
|
|
||||||
|
import module.decode.p25.message.IAdjacentSite;
|
||||||
|
import module.decode.p25.message.IBandIdentifier;
|
||||||
|
import module.decode.p25.message.IdentifierReceiver;
|
||||||
import module.decode.p25.reference.LinkControlOpcode;
|
import module.decode.p25.reference.LinkControlOpcode;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
public class AdjacentSiteStatusBroadcastExplicit extends TDULinkControlMessage
|
public class AdjacentSiteStatusBroadcastExplicit extends TDULinkControlMessage
|
||||||
|
implements IdentifierReceiver, IAdjacentSite
|
||||||
{
|
{
|
||||||
private final static Logger mLog =
|
private final static Logger mLog =
|
||||||
LoggerFactory.getLogger( AdjacentSiteStatusBroadcastExplicit.class );
|
LoggerFactory.getLogger( AdjacentSiteStatusBroadcastExplicit.class );
|
||||||
@@ -21,6 +25,9 @@ public class AdjacentSiteStatusBroadcastExplicit extends TDULinkControlMessage
|
|||||||
public static final int[] RECEIVE_CHANNEL = { 164,165,166,167,168,169,170,
|
public static final int[] RECEIVE_CHANNEL = { 164,165,166,167,168,169,170,
|
||||||
171,184,185,186,187 };
|
171,184,185,186,187 };
|
||||||
|
|
||||||
|
private IBandIdentifier mTransmitBand;
|
||||||
|
private IBandIdentifier mReceiveBand;
|
||||||
|
|
||||||
public AdjacentSiteStatusBroadcastExplicit( TDULinkControlMessage source )
|
public AdjacentSiteStatusBroadcastExplicit( TDULinkControlMessage source )
|
||||||
{
|
{
|
||||||
super( source );
|
super( source );
|
||||||
@@ -39,32 +46,56 @@ public class AdjacentSiteStatusBroadcastExplicit extends TDULinkControlMessage
|
|||||||
|
|
||||||
sb.append( getMessageStub() );
|
sb.append( getMessageStub() );
|
||||||
|
|
||||||
sb.append( " LRA:" + getLocationRegistrationArea() );
|
sb.append( " LRA:" + getLRA() );
|
||||||
|
|
||||||
sb.append( " SITE:" + getRFSubsystemID() + "-" + getSiteID() );
|
sb.append( " SITE:" + getRFSS() + "-" + getSiteID() );
|
||||||
|
|
||||||
sb.append( " DNLINK:" + getTransmitChannelNumber() );
|
sb.append( " DNLINK:" + getDownlinkChannel() );
|
||||||
|
|
||||||
sb.append( " UPLINK:" + getReceiveChannelNumber() );
|
sb.append( " UPLINK:" + getUplinkChannel() );
|
||||||
|
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getLocationRegistrationArea()
|
public String getUniqueID()
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
|
||||||
|
sb.append( getSystemID() );
|
||||||
|
sb.append( ":" );
|
||||||
|
sb.append( getRFSS() );
|
||||||
|
sb.append( ":" );
|
||||||
|
sb.append( getSiteID() );
|
||||||
|
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getLRA()
|
||||||
{
|
{
|
||||||
return mMessage.getHex( LRA, 2 );
|
return mMessage.getHex( LRA, 2 );
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getRFSubsystemID()
|
public String getRFSS()
|
||||||
{
|
{
|
||||||
return mMessage.getHex( RFSS_ID, 2 );
|
return mMessage.getHex( RFSS_ID, 2 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getSystemID()
|
||||||
|
{
|
||||||
|
return "***";
|
||||||
|
}
|
||||||
|
|
||||||
public String getSiteID()
|
public String getSiteID()
|
||||||
{
|
{
|
||||||
return mMessage.getHex( SITE_ID, 2 );
|
return mMessage.getHex( SITE_ID, 2 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getSystemServiceClass()
|
||||||
|
{
|
||||||
|
return "[]";
|
||||||
|
}
|
||||||
|
|
||||||
public int getTransmitIdentifier()
|
public int getTransmitIdentifier()
|
||||||
{
|
{
|
||||||
return mMessage.getInt( TRANSMIT_IDENTIFIER );
|
return mMessage.getInt( TRANSMIT_IDENTIFIER );
|
||||||
@@ -75,7 +106,7 @@ public class AdjacentSiteStatusBroadcastExplicit extends TDULinkControlMessage
|
|||||||
return mMessage.getInt( TRANSMIT_CHANNEL );
|
return mMessage.getInt( TRANSMIT_CHANNEL );
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getTransmitChannelNumber()
|
public String getDownlinkChannel()
|
||||||
{
|
{
|
||||||
return getTransmitIdentifier() + "-" + getTransmitChannel();
|
return getTransmitIdentifier() + "-" + getTransmitChannel();
|
||||||
}
|
}
|
||||||
@@ -90,8 +121,43 @@ public class AdjacentSiteStatusBroadcastExplicit extends TDULinkControlMessage
|
|||||||
return mMessage.getInt( RECEIVE_CHANNEL );
|
return mMessage.getInt( RECEIVE_CHANNEL );
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getReceiveChannelNumber()
|
public String getUplinkChannel()
|
||||||
{
|
{
|
||||||
return getReceiveIdentifier() + "-" + getReceiveChannel();
|
return getReceiveIdentifier() + "-" + getReceiveChannel();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public long getDownlinkFrequency()
|
||||||
|
{
|
||||||
|
return calculateDownlink( mTransmitBand, getTransmitChannel() );
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getUplinkFrequency()
|
||||||
|
{
|
||||||
|
return calculateUplink( mReceiveBand, getReceiveChannel() );
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setIdentifierMessage( int identifier, IBandIdentifier message )
|
||||||
|
{
|
||||||
|
if( identifier == getTransmitIdentifier() )
|
||||||
|
{
|
||||||
|
mTransmitBand = message;
|
||||||
|
}
|
||||||
|
|
||||||
|
if( identifier == getReceiveIdentifier() )
|
||||||
|
{
|
||||||
|
mReceiveBand = message;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int[] getIdentifiers()
|
||||||
|
{
|
||||||
|
int[] identifiers = new int[ 2 ];
|
||||||
|
|
||||||
|
identifiers[ 0 ] = getTransmitIdentifier();
|
||||||
|
identifiers[ 1 ] = getReceiveIdentifier();
|
||||||
|
|
||||||
|
return identifiers;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package module.decode.p25.message.tsbk.osp.control;
|
package module.decode.p25.message.tsbk.osp.control;
|
||||||
|
|
||||||
|
import module.decode.p25.message.IAdjacentSite;
|
||||||
import module.decode.p25.message.IBandIdentifier;
|
import module.decode.p25.message.IBandIdentifier;
|
||||||
import module.decode.p25.message.IdentifierReceiver;
|
import module.decode.p25.message.IdentifierReceiver;
|
||||||
import module.decode.p25.message.tsbk.TSBKMessage;
|
import module.decode.p25.message.tsbk.TSBKMessage;
|
||||||
@@ -8,7 +9,8 @@ import module.decode.p25.reference.Opcode;
|
|||||||
import alias.AliasList;
|
import alias.AliasList;
|
||||||
import bits.BinaryMessage;
|
import bits.BinaryMessage;
|
||||||
|
|
||||||
public class AdjacentStatusBroadcast extends TSBKMessage implements IdentifierReceiver
|
public class AdjacentStatusBroadcast extends TSBKMessage
|
||||||
|
implements IdentifierReceiver, IAdjacentSite
|
||||||
{
|
{
|
||||||
public static final int[] LOCATION_REGISTRATION_AREA = { 80,81,82,83,84,85,
|
public static final int[] LOCATION_REGISTRATION_AREA = { 80,81,82,83,84,85,
|
||||||
86,87 };
|
86,87 };
|
||||||
@@ -47,7 +49,7 @@ public class AdjacentStatusBroadcast extends TSBKMessage implements IdentifierRe
|
|||||||
|
|
||||||
sb.append( getMessageStub() );
|
sb.append( getMessageStub() );
|
||||||
|
|
||||||
sb.append( " LRA:" + getLocationRegistrationArea() );
|
sb.append( " LRA:" + getLRA() );
|
||||||
|
|
||||||
sb.append( " SYS:" + getSystemID() );
|
sb.append( " SYS:" + getSystemID() );
|
||||||
|
|
||||||
@@ -79,12 +81,24 @@ public class AdjacentStatusBroadcast extends TSBKMessage implements IdentifierRe
|
|||||||
sb.append( " ACTIVE-NETWORK-CONN" );
|
sb.append( " ACTIVE-NETWORK-CONN" );
|
||||||
}
|
}
|
||||||
|
|
||||||
sb.append( SystemService.toString( getSystemServiceClass() ) );
|
sb.append( getSystemServiceClass() );
|
||||||
|
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getLocationRegistrationArea()
|
@Override
|
||||||
|
public String getDownlinkChannel()
|
||||||
|
{
|
||||||
|
return getIdentifier() + "-" + getChannel();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getUplinkChannel()
|
||||||
|
{
|
||||||
|
return getIdentifier() + "-" + getChannel();
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getLRA()
|
||||||
{
|
{
|
||||||
return mMessage.getHex( LOCATION_REGISTRATION_AREA, 2 );
|
return mMessage.getHex( LOCATION_REGISTRATION_AREA, 2 );
|
||||||
}
|
}
|
||||||
@@ -147,9 +161,9 @@ public class AdjacentStatusBroadcast extends TSBKMessage implements IdentifierRe
|
|||||||
return mMessage.getInt( IDENTIFIER );
|
return mMessage.getInt( IDENTIFIER );
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getSystemServiceClass()
|
public String getSystemServiceClass()
|
||||||
{
|
{
|
||||||
return mMessage.getInt( SYSTEM_SERVICE_CLASS );
|
return SystemService.toString( mMessage.getInt( SYSTEM_SERVICE_CLASS ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getDownlinkFrequency()
|
public long getDownlinkFrequency()
|
||||||
@@ -162,6 +176,7 @@ public class AdjacentStatusBroadcast extends TSBKMessage implements IdentifierRe
|
|||||||
return calculateUplink( mIdentifierUpdate, getChannel() );
|
return calculateUplink( mIdentifierUpdate, getChannel() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setIdentifierMessage( int identifier, IBandIdentifier message )
|
public void setIdentifierMessage( int identifier, IBandIdentifier message )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -309,26 +309,45 @@ public class ChannelState extends Module implements ICallEventProvider,
|
|||||||
switch( state )
|
switch( state )
|
||||||
{
|
{
|
||||||
case CONTROL:
|
case CONTROL:
|
||||||
|
//Don't allow traffic channels to be control channels,
|
||||||
|
//otherwise they won't get call tear down
|
||||||
|
if( mChannelType != ChannelType.TRAFFIC )
|
||||||
|
{
|
||||||
|
broadcast( SquelchState.SQUELCH );
|
||||||
|
updateFadeTimeout();
|
||||||
|
startMonitor();
|
||||||
|
mState = state;
|
||||||
|
broadcast( ChangedAttribute.CHANNEL_STATE );
|
||||||
|
}
|
||||||
|
break;
|
||||||
case DATA:
|
case DATA:
|
||||||
case ENCRYPTED:
|
case ENCRYPTED:
|
||||||
broadcast( SquelchState.SQUELCH );
|
broadcast( SquelchState.SQUELCH );
|
||||||
updateFadeTimeout();
|
updateFadeTimeout();
|
||||||
startMonitor();
|
startMonitor();
|
||||||
|
mState = state;
|
||||||
|
broadcast( ChangedAttribute.CHANNEL_STATE );
|
||||||
break;
|
break;
|
||||||
case CALL:
|
case CALL:
|
||||||
broadcast( SquelchState.UNSQUELCH );
|
broadcast( SquelchState.UNSQUELCH );
|
||||||
updateFadeTimeout();
|
updateFadeTimeout();
|
||||||
startMonitor();
|
startMonitor();
|
||||||
|
mState = state;
|
||||||
|
broadcast( ChangedAttribute.CHANNEL_STATE );
|
||||||
break;
|
break;
|
||||||
case FADE:
|
case FADE:
|
||||||
broadcast( SquelchState.SQUELCH );
|
broadcast( SquelchState.SQUELCH );
|
||||||
updateResetTimeout();
|
updateResetTimeout();
|
||||||
startMonitor();
|
startMonitor();
|
||||||
|
mState = state;
|
||||||
|
broadcast( ChangedAttribute.CHANNEL_STATE );
|
||||||
break;
|
break;
|
||||||
case END:
|
case END:
|
||||||
broadcast( SquelchState.SQUELCH );
|
broadcast( SquelchState.SQUELCH );
|
||||||
broadcast( new DecoderStateEvent( this, Event.RESET, State.IDLE ) );
|
broadcast( new DecoderStateEvent( this, Event.RESET, State.IDLE ) );
|
||||||
broadcast( new MetadataReset() );
|
broadcast( new MetadataReset() );
|
||||||
|
mState = state;
|
||||||
|
broadcast( ChangedAttribute.CHANNEL_STATE );
|
||||||
break;
|
break;
|
||||||
case IDLE:
|
case IDLE:
|
||||||
broadcast( SquelchState.SQUELCH );
|
broadcast( SquelchState.SQUELCH );
|
||||||
@@ -350,14 +369,13 @@ public class ChannelState extends Module implements ICallEventProvider,
|
|||||||
mTrafficChannelCallEvent = null;
|
mTrafficChannelCallEvent = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mState = state;
|
||||||
|
broadcast( ChangedAttribute.CHANNEL_STATE );
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
mState = state;
|
|
||||||
|
|
||||||
broadcast( ChangedAttribute.CHANNEL_STATE );
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user