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

src/module/decode/p25/message/IAdjacentSite.java

@@ -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();
+}

src/module/decode/p25/message/ldu/lc/AdjacentSiteStatusBroadcast.java

@@ -1,16 +1,17 @@
 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.tsbk.osp.control.SystemService;
 import module.decode.p25.reference.LinkControlOpcode;
-import module.decode.p25.reference.Service;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class AdjacentSiteStatusBroadcast extends LDU1Message
-										 implements IdentifierReceiver
+					 implements IdentifierReceiver, IAdjacentSite
 {
 	private final static Logger mLog = 
 			LoggerFactory.getLogger( AdjacentSiteStatusBroadcast.class );
@@ -46,20 +47,33 @@ public class AdjacentSiteStatusBroadcast extends LDU1Message
 		
 		sb.append( getMessageStub() );
 		
-		sb.append( " LRA:" + getLocationRegistrationArea() );
+		sb.append( " LRA:" + getLRA() );
 
 		sb.append( " SYS:" + getSystemID() );
 		
-		sb.append( " SITE:" + getRFSubsystemID() + "-" + getSiteID() );
+		sb.append( " SITE:" + getRFSS() + "-" + getSiteID() );
 		
 		sb.append( " CHAN:" + getChannel() );
 
-		sb.append( " " + Service.getServices( getSystemServiceClass() ).toString() );
+		sb.append( " " + getSystemServiceClass() );
 		
 		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 );
 	}
@@ -69,7 +83,7 @@ public class AdjacentSiteStatusBroadcast extends LDU1Message
 		return mMessage.getHex( SYSTEM_ID, 3 );
 	}
 	
-	public String getRFSubsystemID()
+	public String getRFSS()
 	{
 		return mMessage.getHex( RFSS_ID, 2 );
 	}
@@ -94,9 +108,9 @@ public class AdjacentSiteStatusBroadcast extends LDU1Message
 		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
@@ -114,13 +128,26 @@ public class AdjacentSiteStatusBroadcast extends LDU1Message
 	    
 	    return identifiers;
     }
+
 	
-    public long getDownlinkFrequency()
+    @Override
+	public String getDownlinkChannel()
+	{
+		return getChannel();
+	}
+
+	@Override
+	public String getUplinkChannel()
+	{
+		return getChannel();
+	}
+
+	public long getDownlinkFrequency()
     {
     	return calculateDownlink( mIdentifierUpdate, getChannelNumber() );
     }
     
-    public long getUplinkFrequencyB()
+    public long getUplinkFrequency()
     {
     	return calculateUplink( mIdentifierUpdate, getChannelNumber() );
     }

src/module/decode/p25/message/ldu/lc/AdjacentSiteStatusBroadcastExplicit.java

@@ -1,5 +1,8 @@
 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.reference.LinkControlOpcode;
 
@@ -7,6 +10,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class AdjacentSiteStatusBroadcastExplicit extends LDU1Message
+					implements IdentifierReceiver, IAdjacentSite
 {
 	private final static Logger mLog = 
 			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,
 		735,740,741,742,743 };
 	
+	private IBandIdentifier mTransmitBand;
+	private IBandIdentifier mReceiveBand;
+	
 	public AdjacentSiteStatusBroadcastExplicit( LDU1Message message )
 	{
 		super( message );
@@ -40,27 +47,45 @@ public class AdjacentSiteStatusBroadcastExplicit extends LDU1Message
 		
 		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();
 	}
 	
-	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 );
 	}
 	
-	public String getRFSubsystemID()
+	public String getRFSS()
 	{
 		return mMessage.getHex( RFSS_ID, 2 );
 	}
 	
+	public String getSystemID()
+	{
+		return "***";
+	}
+	
 	public String getSiteID()
 	{
 		return mMessage.getHex( SITE_ID, 2 );
@@ -76,7 +101,7 @@ public class AdjacentSiteStatusBroadcastExplicit extends LDU1Message
 		return mMessage.getInt( TRANSMIT_CHANNEL );
 	}
 	
-	public String getTransmitChannelNumber()
+	public String getDownlinkChannel()
 	{
 		return getTransmitIdentifier() + "-" + getTransmitChannel();
 	}
@@ -91,8 +116,50 @@ public class AdjacentSiteStatusBroadcastExplicit extends LDU1Message
 		return mMessage.getInt( RECEIVE_CHANNEL );
 	}
 	
-	public String getReceiveChannelNumber()
+	public String getUplinkChannel()
 	{
 		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;
+	}
+	
 }

src/module/decode/p25/message/pdu/PDUMessage.java

@@ -45,7 +45,19 @@ public class PDUMessage extends P25Message
 		sb.append( "NAC:" );
 		sb.append( getNAC() );
 		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 )
 		{

src/module/decode/p25/message/pdu/PDUMessageFactory.java

@@ -66,6 +66,7 @@ public class PDUMessageFactory
 								return new GroupDataChannelGrantExtended( 
 										message, duid, aliasList );
 							case GROUP_VOICE_CHANNEL_GRANT:
+								
 								return new GroupVoiceChannelGrantExplicit( 
 										message, duid, aliasList );
 							case INDIVIDUAL_DATA_CHANNEL_GRANT:
@@ -123,7 +124,6 @@ public class PDUMessageFactory
 				
 			case UNCONFIRMED_MULTI_BLOCK_TRUNKING_CONTROL:
 				return new PDUMessage( message, duid, aliasList );
-				
 			default:
 				return new PDUMessage( message, duid, aliasList );
 		}

src/module/decode/p25/message/pdu/osp/control/AdjacentStatusBroadcastExtended.java

@@ -1,5 +1,6 @@
 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.IdentifierReceiver;
 import module.decode.p25.message.pdu.PDUMessage;
@@ -11,7 +12,7 @@ import bits.BinaryMessage;
 import edac.CRCP25;
 
 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[] 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( " LRA:" + getLocationRegistrationArea() );
+        sb.append( " LRA:" + getLRA() );
         
         sb.append( " SYS:" + getSystemID() );
         
-        sb.append( " RFSS:" + getRFSubsystemID() );
+        sb.append( " RFSS:" + getRFSS() );
         
         sb.append( " SITE:" + getSiteID() );
         
@@ -73,28 +74,29 @@ public class AdjacentStatusBroadcastExtended extends PDUMessage
         
         sb.append( " UP:" + getUplinkFrequency() );
         
-        sb.append( " SYS SVC CLASS:" + 
-                SystemService.toString( getSystemServiceClass() ) );
+        sb.append( " SYS SVC CLASS:" + getSystemServiceClass() );
         
         return sb.toString();
     }
     
-	
-	public String getLocationRegistrationArea()
-	{
-		return mMessage.getHex( LRA, 2 );
-	}
-	
+    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 getSystemID()
 	{
 		return mMessage.getHex( SYSTEM_ID, 3 );
 	}
 	
-	public String getRFSubsystemID()
-	{
-		return mMessage.getHex( RF_SUBSYSTEM_ID, 2 );
-	}
-	
 	public String getSiteID()
 	{
 		return mMessage.getHex( SITE_ID, 2 );
@@ -120,11 +122,6 @@ public class AdjacentStatusBroadcastExtended extends PDUMessage
 		return mMessage.getInt( RECEIVE_CHANNEL );
 	}
 	
-    public int getSystemServiceClass()
-    {
-        return mMessage.getInt( SYSTEM_SERVICE_CLASS );
-    }
-    
     public long getDownlinkFrequency()
     {
     	return calculateDownlink( mTransmitIdentifierProvider, getTransmitChannel() );
@@ -158,4 +155,34 @@ public class AdjacentStatusBroadcastExtended extends PDUMessage
 		
 		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();
+	}
 }

src/module/decode/p25/message/pdu/osp/voice/GroupVoiceChannelGrantExplicit.java

@@ -77,6 +77,9 @@ public class GroupVoiceChannelGrantExplicit extends PDUMessage
         sb.append( " CHAN UP:" + getReceiveChannelIdentifier() + "-" + getReceiveChannelNumber() );
         sb.append( " " + getUplinkFrequency() );
         
+        sb.append( " " );
+        sb.append( mMessage.toString() );
+        
         return sb.toString();
     }
     

src/module/decode/p25/message/tdu/lc/AdjacentSiteStatusBroadcast.java

@@ -1,7 +1,9 @@
 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.message.tsbk.osp.control.SystemService;
 import module.decode.p25.reference.LinkControlOpcode;
 import module.decode.p25.reference.Service;
 
@@ -9,7 +11,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class AdjacentSiteStatusBroadcast extends TDULinkControlMessage
-										 implements IdentifierReceiver
+					 implements IdentifierReceiver, IAdjacentSite
 {
 	private final static Logger mLog = 
 			LoggerFactory.getLogger( AdjacentSiteStatusBroadcast.class );
@@ -45,20 +47,33 @@ public class AdjacentSiteStatusBroadcast extends TDULinkControlMessage
 		
 		sb.append( getMessageStub() );
 		
-		sb.append( " LRA:" + getLocationRegistrationArea() );
+		sb.append( " LRA:" + getLRA() );
 
 		sb.append( " SYS:" + getSystemID() );
 		
-		sb.append( " SITE:" + getRFSubsystemID() + "-" + getSiteID() );
+		sb.append( " SITE:" + getRFSS() + "-" + getSiteID() );
 		
 		sb.append( " CHAN:" + getChannel() );
 
-		sb.append( " " + Service.getServices( getSystemServiceClass() ).toString() );
+		sb.append( " " + getSystemServiceClass() );
 		
 		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 );
 	}
@@ -68,7 +83,7 @@ public class AdjacentSiteStatusBroadcast extends TDULinkControlMessage
 		return mMessage.getHex( SYSTEM_ID, 3 );
 	}
 	
-	public String getRFSubsystemID()
+	public String getRFSS()
 	{
 		return mMessage.getHex( RFSS_ID, 2 );
 	}
@@ -88,14 +103,26 @@ public class AdjacentSiteStatusBroadcast extends TDULinkControlMessage
 		return getIdentifier() + "-" + getChannelNumber();
 	}
 	
+	@Override
+	public String getDownlinkChannel()
+	{
+		return getChannel();
+	}
+
+	@Override
+	public String getUplinkChannel()
+	{
+		return getChannel();
+	}
+
 	public int getChannelNumber()
 	{
 		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
@@ -119,7 +146,7 @@ public class AdjacentSiteStatusBroadcast extends TDULinkControlMessage
     	return calculateDownlink( mIdentifierUpdate, getChannelNumber() );
     }
     
-    public long getUplinkFrequencyB()
+    public long getUplinkFrequency()
     {
     	return calculateUplink( mIdentifierUpdate, getChannelNumber() );
     }

src/module/decode/p25/message/tdu/lc/AdjacentSiteStatusBroadcastExplicit.java

@@ -1,11 +1,15 @@
 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 org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class AdjacentSiteStatusBroadcastExplicit extends TDULinkControlMessage
+			implements IdentifierReceiver, IAdjacentSite
 {
 	private final static Logger mLog = 
 			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,
 		171,184,185,186,187 };
 	
+	private IBandIdentifier mTransmitBand;
+	private IBandIdentifier mReceiveBand;
+
 	public AdjacentSiteStatusBroadcastExplicit( TDULinkControlMessage source )
 	{
 		super( source );
@@ -39,32 +46,56 @@ public class AdjacentSiteStatusBroadcastExplicit extends TDULinkControlMessage
 		
 		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();
 	}
 	
-	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 );
 	}
 	
-	public String getRFSubsystemID()
+	public String getRFSS()
 	{
 		return mMessage.getHex( RFSS_ID, 2 );
 	}
 	
+	public String getSystemID()
+	{
+		return "***";
+	}
+	
 	public String getSiteID()
 	{
 		return mMessage.getHex( SITE_ID, 2 );
 	}
 	
+	@Override
+	public String getSystemServiceClass()
+	{
+		return "[]";
+	}
+
 	public int getTransmitIdentifier()
 	{
 		return mMessage.getInt( TRANSMIT_IDENTIFIER );
@@ -75,7 +106,7 @@ public class AdjacentSiteStatusBroadcastExplicit extends TDULinkControlMessage
 		return mMessage.getInt( TRANSMIT_CHANNEL );
 	}
 	
-	public String getTransmitChannelNumber()
+	public String getDownlinkChannel()
 	{
 		return getTransmitIdentifier() + "-" + getTransmitChannel();
 	}
@@ -90,8 +121,43 @@ public class AdjacentSiteStatusBroadcastExplicit extends TDULinkControlMessage
 		return mMessage.getInt( RECEIVE_CHANNEL );
 	}
 	
-	public String getReceiveChannelNumber()
+	public String getUplinkChannel()
 	{
 		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;
+	}
 }

src/module/decode/p25/message/tsbk/osp/control/AdjacentStatusBroadcast.java

@@ -1,5 +1,6 @@
 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.IdentifierReceiver;
 import module.decode.p25.message.tsbk.TSBKMessage;
@@ -8,7 +9,8 @@ import module.decode.p25.reference.Opcode;
 import alias.AliasList;
 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,
         86,87 };
@@ -47,7 +49,7 @@ public class AdjacentStatusBroadcast extends TSBKMessage implements IdentifierRe
         
         sb.append( getMessageStub() );
         
-        sb.append( " LRA:" + getLocationRegistrationArea() );
+        sb.append( " LRA:" + getLRA() );
 
         sb.append( " SYS:" + getSystemID() );
 
@@ -79,12 +81,24 @@ public class AdjacentStatusBroadcast extends TSBKMessage implements IdentifierRe
             sb.append( " ACTIVE-NETWORK-CONN" );
         }
         
-        sb.append( SystemService.toString( getSystemServiceClass() ) );
+        sb.append( getSystemServiceClass() );
         
         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 );
     }
@@ -147,9 +161,9 @@ public class AdjacentStatusBroadcast extends TSBKMessage implements IdentifierRe
     	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()
@@ -161,6 +175,7 @@ public class AdjacentStatusBroadcast extends TSBKMessage implements IdentifierRe
     {
     	return calculateUplink( mIdentifierUpdate, getChannel() );
     }
+    
 
 	@Override
     public void setIdentifierMessage( int identifier, IBandIdentifier message )