P25 work in progress

src/decode/p25/message/ldu/LDU1Message.java

@@ -2,25 +2,95 @@ package decode.p25.message.ldu;
 
 import alias.AliasList;
 import bits.BitSetBuffer;
-import crc.CRC;
-import decode.p25.message.P25Message;
+import decode.p25.P25Interleave;
 import decode.p25.reference.DataUnitID;
+import decode.p25.reference.LinkControlOpcode;
+import decode.p25.reference.Vendor;
+import decode.p25.reference.VendorLinkControlOpcode;
+import edac.CRC;
 
-public class LDU1Message extends P25Message
+public class LDU1Message extends LDUMessage
 {
+	public static final int IMBE_1 = 64;
+	public static final int IMBE_2 = 208;
+	public static final int IMBE_3 = 392;
+	public static final int IMBE_4 = 576;
+	public static final int IMBE_5 = 760;
+	public static final int IMBE_6 = 944;
+	public static final int IMBE_7 = 1128;
+	public static final int IMBE_8 = 1312;
+	public static final int IMBE_9 = 1488;
+
+	public static final int ENCRYPTION_FLAG = 352;
+	public static final int IMPLICIT_VENDOR_FLAG = 353;
+	public static final int[] OPCODE = { 354,355,356,357,362,363 };
+	public static final int[] VENDOR = { 364,365,366,367,372,373,374,375 };
+	
+	public static final int[] OCTET_1 = { 364,365,366,367,372,373,374,375 };
+	public static final int[] OCTET_2 = { 376,377,382,383,384,385,386,387 };
+	public static final int[] OCTET_3 = { 536,537,538,539,540,541,546,547 };
+	public static final int[] OCTET_4 = { 548,549,550,551,556,557,558,559 };
+	public static final int[] OCTET_5 = { 560,561,566,567,568,569,570,571 };
+	public static final int[] OCTET_6 = { 720,721,722,723,724,725,730,731 };
+	public static final int[] OCTET_7 = { 732,733,734,735,740,741,742,743 };
+	public static final int[] OCTET_8 = { 744,745,750,751,752,753,754,755 };
+	
 	public LDU1Message( BitSetBuffer message, DataUnitID duid,
             AliasList aliasList )
     {
 	    super( message, duid, aliasList );
 
+	    deinterleaveVoiceFrames();
+	    
 	    /* NID CRC is checked in the message framer, thus a constructed message
 	     * means it passed the CRC */
 	    mCRC = new CRC[ 2 ];
 	    mCRC[ 0 ] = CRC.PASSED;
+	    
+	    checkCRC();
     }
+
+	/**
+	 * Subclass constructor from an existing LDU1Message
+	 */
+	protected LDU1Message( LDU1Message message )
+	{
+		super( message.getSourceMessage(), DataUnitID.LDU1, message.getAliasList() );
+		
+		mCRC = message.mCRC;
+	}
+	
+	private void deinterleaveVoiceFrames()
+	{
+		P25Interleave.deinterleaveVoice( mMessage, IMBE_1, IMBE_1 + 144 );
+		P25Interleave.deinterleaveVoice( mMessage, IMBE_2, IMBE_2 + 144 );
+		P25Interleave.deinterleaveVoice( mMessage, IMBE_3, IMBE_3 + 144 );
+		P25Interleave.deinterleaveVoice( mMessage, IMBE_4, IMBE_4 + 144 );
+		P25Interleave.deinterleaveVoice( mMessage, IMBE_5, IMBE_5 + 144 );
+		P25Interleave.deinterleaveVoice( mMessage, IMBE_6, IMBE_6 + 144 );
+		P25Interleave.deinterleaveVoice( mMessage, IMBE_7, IMBE_7 + 144 );
+		P25Interleave.deinterleaveVoice( mMessage, IMBE_8, IMBE_8 + 144 );
+		P25Interleave.deinterleaveVoice( mMessage, IMBE_9, IMBE_9 + 144 );
+	}
+	
+	private void checkCRC()
+	{
+		
+	}
 	
 	@Override
-    public String getMessage()
+	public String getMessage()
+	{
+		StringBuilder sb = new StringBuilder();
+		
+		sb.append( getMessageStub() );
+		sb.append( " " );
+		sb.append( mMessage.toString() );
+		
+		return sb.toString();
+	}
+	
+    public String getMessageStub()
     {
 		StringBuilder sb = new StringBuilder();
 		
@@ -30,10 +100,55 @@ public class LDU1Message extends P25Message
 		sb.append( getDUID().getLabel() );
 		sb.append( " " );
 		
-		sb.append( mMessage.toString() );
-		
+		if( isEncrypted() )
+		{
+			sb.append( "ENCRYPTED" );
+		}
+		else
+		{
+			if( isImplicitFormat() || getVendor() == Vendor.STANDARD )
+			{
+				sb.append( getOpcode().getLabel() );
+			}
+			else
+			{
+				sb.append( "VENDOR:" + getVendor().getLabel() + " " );
+				sb.append( getVendorOpcode().getLabel() );
+			}
+		}
+
 	    return sb.toString();
     }
+
+	public boolean isEncrypted()
+	{
+		return mMessage.get( ENCRYPTION_FLAG );
+	}
+	
+	public boolean isImplicitFormat()
+	{
+		return mMessage.get( IMPLICIT_VENDOR_FLAG );
+	}
+	
+	public LinkControlOpcode getOpcode()
+	{
+		return LinkControlOpcode.fromValue( mMessage.getInt( OPCODE ) );
+	}
+
+	public VendorLinkControlOpcode getVendorOpcode()
+	{
+		return VendorLinkControlOpcode.fromValue( mMessage.getInt( OPCODE ) );
+	}
+	
+	public Vendor getVendor()
+	{
+		if( isImplicitFormat() )
+		{
+			return Vendor.STANDARD;
+		}
+		
+		return Vendor.fromValue( mMessage.getInt( VENDOR ) );
+	}
 	
 	/* Temporary override */
 	public boolean isValid()

src/decode/p25/message/ldu/LDU2Message.java

@@ -2,11 +2,11 @@ package decode.p25.message.ldu;
 
 import alias.AliasList;
 import bits.BitSetBuffer;
-import crc.CRC;
 import decode.p25.message.P25Message;
 import decode.p25.reference.DataUnitID;
+import edac.CRC;
 
-public class LDU2Message extends P25Message
+public class LDU2Message extends LDUMessage
 {
 	public LDU2Message( BitSetBuffer message, DataUnitID duid,
             AliasList aliasList )

src/decode/p25/message/ldu/LDUMessage.java

@@ -0,0 +1,44 @@
+package decode.p25.message.ldu;
+
+import alias.AliasList;
+import bits.BitSetBuffer;
+import decode.p25.message.P25Message;
+import decode.p25.reference.DataUnitID;
+import edac.CRC;
+
+public class LDUMessage extends P25Message
+{
+	public LDUMessage( BitSetBuffer message, DataUnitID duid,
+            AliasList aliasList )
+    {
+	    super( message, duid, aliasList );
+
+	    /* NID CRC is checked in the message framer, thus a constructed message
+	     * means it passed the CRC */
+	    mCRC = new CRC[ 2 ];
+	    mCRC[ 0 ] = CRC.PASSED;
+    }
+	
+	@Override
+    public String getMessage()
+    {
+		StringBuilder sb = new StringBuilder();
+		
+		sb.append( "NAC:" );
+		sb.append( getNAC() );
+		sb.append( " " );
+		sb.append( getDUID().getLabel() );
+		sb.append( " " );
+		
+		sb.append( mMessage.toString() );
+		
+	    return sb.toString();
+    }
+	
+	/* Temporary override */
+	public boolean isValid()
+	{
+		return true;
+	}
+
+}

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

@@ -0,0 +1,127 @@
+package decode.p25.message.ldu.lc;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import decode.p25.message.IdentifierProvider;
+import decode.p25.message.ldu.LDU1Message;
+import decode.p25.message.tsbk.osp.control.IdentifierProviderReceiver;
+import decode.p25.reference.LinkControlOpcode;
+import decode.p25.reference.Service;
+
+public class AdjacentSiteStatusBroadcast extends LDU1Message
+										 implements IdentifierProviderReceiver
+{
+	private final static Logger mLog = 
+			LoggerFactory.getLogger( AdjacentSiteStatusBroadcast.class );
+
+	public static final int[] LRA = { 364,365,366,367,372,373,374,375 };
+	public static final int[] SYSTEM_ID = { 384,385,386,387,536,537,538,539,540,
+		541,546,547 };
+	public static final int[] RFSS_ID = { 548,549,550,551,556,557,558,559 };
+	public static final int[] SITE_ID = { 560,561,566,567,568,569,570,571 };
+	public static final int[] IDENTIFIER = { 720,721,722,723 };
+	public static final int[] CHANNEL = { 724,725,730,731,732,733,734,735,740,
+		741,742,743 };
+	public static final int[] SYSTEM_SERVICE_CLASS = { 744,745,750,751,752,753,
+		754,755 };
+	
+	private IdentifierProvider mIdentifierUpdate;
+	
+	public AdjacentSiteStatusBroadcast( LDU1Message message )
+	{
+		super( message );
+	}
+	
+    @Override
+    public String getEventType()
+    {
+        return LinkControlOpcode.ADJACENT_SITE_STATUS_BROADCAST.getDescription();
+    }
+
+	@Override
+	public String getMessage()
+	{
+		StringBuilder sb = new StringBuilder();
+		
+		sb.append( getMessageStub() );
+		
+		sb.append( " LRA:" + getLocationRegistrationArea() );
+
+		sb.append( " SYS:" + getSystemID() );
+		
+		sb.append( " SITE:" + getRFSubsystemID() + "-" + getSiteID() );
+		
+		sb.append( " CHAN:" + getChannel() );
+
+		sb.append( " " + Service.getServices( getSystemServiceClass() ).toString() );
+		
+		return sb.toString();
+	}
+	
+	public String getLocationRegistrationArea()
+	{
+		return mMessage.getHex( LRA, 2 );
+	}
+	
+	public String getSystemID()
+	{
+		return mMessage.getHex( SYSTEM_ID, 3 );
+	}
+	
+	public String getRFSubsystemID()
+	{
+		return mMessage.getHex( RFSS_ID, 2 );
+	}
+	
+	public String getSiteID()
+	{
+		return mMessage.getHex( SITE_ID, 2 );
+	}
+	
+	public int getIdentifier()
+	{
+		return mMessage.getInt( IDENTIFIER );
+	}
+	
+	public String getChannel()
+	{
+		return getIdentifier() + "-" + getChannelNumber();
+	}
+	
+	public int getChannelNumber()
+	{
+		return mMessage.getInt( CHANNEL );
+	}
+	
+	public int getSystemServiceClass()
+	{
+		return mMessage.getInt( SYSTEM_SERVICE_CLASS );
+	}
+
+	@Override
+    public void setIdentifierMessage( int identifier, IdentifierProvider message )
+    {
+		mIdentifierUpdate = message;
+    }
+
+	@Override
+    public int[] getIdentifiers()
+    {
+	    int[] identifiers = new int[ 1 ];
+	    
+	    identifiers[ 0 ] = getIdentifier();
+	    
+	    return identifiers;
+    }
+	
+    public long getDownlinkFrequency()
+    {
+    	return calculateDownlink( mIdentifierUpdate, getChannelNumber() );
+    }
+    
+    public long getUplinkFrequencyB()
+    {
+    	return calculateUplink( mIdentifierUpdate, getChannelNumber() );
+    }
+}

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

@@ -0,0 +1,98 @@
+package decode.p25.message.ldu.lc;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import decode.p25.message.ldu.LDU1Message;
+import decode.p25.reference.LinkControlOpcode;
+
+public class AdjacentSiteStatusBroadcastExplicit extends LDU1Message
+{
+	private final static Logger mLog = 
+			LoggerFactory.getLogger( AdjacentSiteStatusBroadcastExplicit.class );
+
+	public static final int[] LRA = { 364,365,366,367,372,373,374,375 };
+	public static final int[] TRANSMIT_IDENTIFIER = { 376,377,382,383 };
+	public static final int[] TRANSMIT_CHANNEL = { 384,385,386,387,536,537,538,
+		539,540,541,546,547 };
+	public static final int[] RFSS_ID = { 548,549,550,551,556,557,558,559 };
+	public static final int[] SITE_ID = { 560,561,566,567,568,569,570,571 };
+	
+	public static final int[] RECEIVE_IDENTIFIER = { 720,721,722,723 };
+	public static final int[] RECEIVE_CHANNEL = { 724,725,730,731,732,733,734,
+		735,740,741,742,743 };
+	
+	public AdjacentSiteStatusBroadcastExplicit( LDU1Message message )
+	{
+		super( message );
+	}
+	
+    @Override
+    public String getEventType()
+    {
+        return LinkControlOpcode.ADJACENT_SITE_STATUS_BROADCAST_EXPLICIT.getDescription();
+    }
+
+	@Override
+	public String getMessage()
+	{
+		StringBuilder sb = new StringBuilder();
+		
+		sb.append( getMessageStub() );
+		
+		sb.append( " LRA:" + getLocationRegistrationArea() );
+		
+		sb.append( " SITE:" + getRFSubsystemID() + "-" + getSiteID() );
+		
+		sb.append( " DNLINK:" + getTransmitChannelNumber() );
+		
+		sb.append( " UPLINK:" + getReceiveChannelNumber() );
+		
+		return sb.toString();
+	}
+	
+	public String getLocationRegistrationArea()
+	{
+		return mMessage.getHex( LRA, 2 );
+	}
+	
+	public String getRFSubsystemID()
+	{
+		return mMessage.getHex( RFSS_ID, 2 );
+	}
+	
+	public String getSiteID()
+	{
+		return mMessage.getHex( SITE_ID, 2 );
+	}
+	
+	public int getTransmitIdentifier()
+	{
+		return mMessage.getInt( TRANSMIT_IDENTIFIER );
+	}
+	
+	public int getTransmitChannel()
+	{
+		return mMessage.getInt( TRANSMIT_CHANNEL );
+	}
+	
+	public String getTransmitChannelNumber()
+	{
+		return getTransmitIdentifier() + "-" + getTransmitChannel();
+	}
+	
+	public int getReceiveIdentifier()
+	{
+		return mMessage.getInt( RECEIVE_IDENTIFIER );
+	}
+	
+	public int getReceiveChannel()
+	{
+		return mMessage.getInt( RECEIVE_CHANNEL );
+	}
+	
+	public String getReceiveChannelNumber()
+	{
+		return getReceiveIdentifier() + "-" + getReceiveChannel();
+	}
+}

src/decode/p25/message/ldu/lc/CallAlert.java

@@ -0,0 +1,50 @@
+package decode.p25.message.ldu.lc;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import decode.p25.message.ldu.LDU1Message;
+import decode.p25.reference.LinkControlOpcode;
+
+public class CallAlert extends LDU1Message
+{
+	private final static Logger mLog = 
+			LoggerFactory.getLogger( CallAlert.class );
+    public static final int[] TARGET_ADDRESS = { 536,537,538,539,540,541,546,
+    	547,548,549,550,551,556,557,558,559,560,561,566,567,568,569,570,571 };
+    public static final int[] SOURCE_ADDRESS = { 720,721,722,723,724,725,730,
+    	731,732,733,734,735,740,741,742,743,744,745,750,751,752,753,754,755 };
+	
+	public CallAlert( LDU1Message message )
+	{
+		super( message );
+	}
+	
+    @Override
+    public String getEventType()
+    {
+        return LinkControlOpcode.CALL_ALERT.getDescription();
+    }
+
+    public String getMessage()
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( getMessageStub() );
+
+        sb.append( " SRC ADDR: " + getSourceAddress() );
+        sb.append( " TGT ADDR: " + getTargetAddress() );
+        
+        return sb.toString();
+    }
+    
+    public String getTargetAddress()
+    {
+    	return mMessage.getHex( TARGET_ADDRESS, 6 );
+    }
+    
+    public String getSourceAddress()
+    {
+    	return mMessage.getHex( SOURCE_ADDRESS, 6 );
+    }
+}

src/decode/p25/message/ldu/lc/CallTermination.java

@@ -0,0 +1,43 @@
+package decode.p25.message.ldu.lc;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import decode.p25.message.ldu.LDU1Message;
+import decode.p25.reference.LinkControlOpcode;
+
+public class CallTermination extends LDU1Message
+{
+	private final static Logger mLog = LoggerFactory.getLogger( CallTermination.class );
+
+	public static final int[] SOURCE_ADDRESS = { 720,721,722,723,724,725,730,
+		731,732,733,734,735,740,741,742,743,744,745,750,751,752,753,754,755 };
+	
+	public CallTermination( LDU1Message message )
+	{
+		super( message );
+	}
+	
+    @Override
+    public String getEventType()
+    {
+        return LinkControlOpcode.CALL_TERMINATION_OR_CANCELLATION.getDescription();
+    }
+
+	@Override
+	public String getMessage()
+	{
+		StringBuilder sb = new StringBuilder();
+		
+		sb.append( getMessageStub() );
+		
+		sb.append( " FROM:" + getSourceAddress() );
+		
+		return sb.toString();
+	}
+
+    public String getSourceAddress()
+    {
+    	return mMessage.getHex( SOURCE_ADDRESS, 6 );
+    }
+}

src/decode/p25/message/ldu/lc/ChannelIdentifierUpdate.java

@@ -0,0 +1,89 @@
+package decode.p25.message.ldu.lc;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import decode.p25.message.IdentifierProvider;
+import decode.p25.message.ldu.LDU1Message;
+import decode.p25.reference.LinkControlOpcode;
+
+public class ChannelIdentifierUpdate extends LDU1Message
+									 implements IdentifierProvider
+{
+	private final static Logger mLog = 
+			LoggerFactory.getLogger( ChannelIdentifierUpdate.class );
+
+	public static final int[] IDENTIFIER = { 364,365,366,367 };
+	public static final int[] BANDWIDTH = { 372,373,374,375,376,377,382,383,384 };
+	public static final int[] TRANSMIT_OFFSET = { 385,386,387,536,537,538,539,
+		540,541 };
+	public static final int[] CHANNEL_SPACING = { 546,547,548,549,550,551,556,
+		557,558,559 };
+	public static final int[] BASE_FREQUENCY = { 560,561,566,567,568,569,570,
+		571,720,721,722,723,724,725,730,731,732,733,734,735,740,741,742,743,744,
+		745,750,751,752,753,754,755 };
+
+	public ChannelIdentifierUpdate( LDU1Message message )
+	{
+		super( message );
+	}
+	
+    @Override
+    public String getEventType()
+    {
+        return LinkControlOpcode.CHANNEL_IDENTIFIER_UPDATE.getDescription();
+    }
+
+	@Override
+	public String getMessage()
+	{
+		StringBuilder sb = new StringBuilder();
+		
+		sb.append( getMessageStub() );
+		
+        sb.append( " IDEN:" + getIdentifier() );
+
+        sb.append( " BASE:" + getBaseFrequency() );
+        
+        sb.append( " BW:" + getBandwidth() );
+        
+        sb.append( " SPACING:" + getChannelSpacing() );
+        
+        sb.append( " OFFSET:" + getTransmitOffset() );
+        
+		return sb.toString();
+	}
+
+	@Override
+	public int getIdentifier()
+	{
+		return mMessage.getInt( IDENTIFIER );
+	}
+
+	/**
+     * Channel bandwidth in hertz
+     */
+    @Override
+    public int getBandwidth()
+    {
+    	return mMessage.getInt( BANDWIDTH ) * 125;
+    }
+	
+    @Override
+    public long getChannelSpacing()
+    {
+    	return mMessage.getLong( CHANNEL_SPACING ) * 125l;
+    }
+
+    @Override
+    public long getBaseFrequency()
+    {
+        return mMessage.getLong( BASE_FREQUENCY ) * 5l;
+    }
+
+	@Override
+    public long getTransmitOffset()
+    {
+		return  -1 * mMessage.getLong( TRANSMIT_OFFSET ) * 250000l;
+    }
+}

src/decode/p25/message/ldu/lc/GroupVoiceChannelUser.java

@@ -0,0 +1,87 @@
+package decode.p25.message.ldu.lc;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import decode.p25.message.ldu.LDU1Message;
+import decode.p25.reference.LinkControlOpcode;
+
+public class GroupVoiceChannelUser extends LDU1Message
+{
+	private final static Logger mLog = 
+			LoggerFactory.getLogger( GroupVoiceChannelUser.class );
+    /* Service Options */
+    public static final int EMERGENCY_FLAG = 376;
+    public static final int ENCRYPTED_CHANNEL_FLAG = 377;
+    public static final int DUPLEX_MODE = 378;
+    public static final int SESSION_MODE = 379;
+	public static final int[] GROUP_ADDRESS = { 548,549,550,551,556,557,558,559,
+		560,561,566,567,568,569,570,571 };
+	public static final int[] SOURCE_ADDRESS = { 720,721,722,723,724,725,730,
+		731,732,733,734,735,740,741,742,743,744,745,750,751,752,753,754,755 };
+	
+	public GroupVoiceChannelUser( LDU1Message message )
+	{
+		super( message );
+	}
+	
+    @Override
+    public String getEventType()
+    {
+        return LinkControlOpcode.GROUP_VOICE_CHANNEL_USER.getDescription();
+    }
+
+	@Override
+	public String getMessage()
+	{
+		StringBuilder sb = new StringBuilder();
+		
+		sb.append( getMessageStub() );
+		
+		if( isEmergency() )
+		{
+			sb.append( " EMERGENCY" );
+		}
+		if( isEncryptedChannel() )
+		{
+			sb.append( " ENCRYPTED CHANNEL" );
+		}
+
+		sb.append( " FROM:" + getSourceAddress() );
+		
+		sb.append( " TO:" + getGroupAddress() );
+		
+		return sb.toString();
+	}
+
+    public boolean isEmergency()
+    {
+        return mMessage.get( EMERGENCY_FLAG );
+    }
+    
+    public boolean isEncryptedChannel()
+    {
+        return mMessage.get( ENCRYPTED_CHANNEL_FLAG );
+    }
+    
+    public DuplexMode getDuplexMode()
+    {
+        return mMessage.get( DUPLEX_MODE ) ? DuplexMode.FULL : DuplexMode.HALF;
+    }
+
+    public SessionMode getSessionMode()
+    {
+        return mMessage.get( SESSION_MODE ) ? 
+                SessionMode.CIRCUIT : SessionMode.PACKET;
+    }
+    
+    public String getGroupAddress()
+    {
+    	return mMessage.getHex( GROUP_ADDRESS, 4 );
+    }
+    
+    public String getSourceAddress()
+    {
+    	return mMessage.getHex( SOURCE_ADDRESS, 6 );
+    }
+}

src/decode/p25/message/ldu/lc/LDULCMessageFactory.java

@@ -0,0 +1,52 @@
+package decode.p25.message.ldu.lc;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import decode.p25.message.ldu.LDU1Message;
+import decode.p25.reference.Vendor;
+
+
+public class LDULCMessageFactory
+{
+	private final static Logger mLog = 
+			LoggerFactory.getLogger( LDULCMessageFactory.class );
+
+	/**
+	 * Constructs a new sub-class of the TDULC message if the opcode is recognized
+	 * or returns the original message.
+	 */
+	public static LDU1Message getMessage( LDU1Message message )
+	{
+		if( message.isImplicitFormat() || message.getVendor() == Vendor.STANDARD )
+		{
+			switch( message.getOpcode() )
+			{
+				case ADJACENT_SITE_STATUS_BROADCAST:
+					return new AdjacentSiteStatusBroadcast( message );
+				case ADJACENT_SITE_STATUS_BROADCAST_EXPLICIT:
+					return new AdjacentSiteStatusBroadcastExplicit( message );
+				case CALL_ALERT:
+					return new CallAlert( message );
+				case CALL_TERMINATION_OR_CANCELLATION:
+					return new CallTermination( message );
+				case CHANNEL_IDENTIFIER_UPDATE:
+					return new ChannelIdentifierUpdate( message );
+				case GROUP_VOICE_CHANNEL_USER:
+					return new GroupVoiceChannelUser( message );
+			    default:
+			    	break;
+			}
+		}
+		else
+		{
+			switch( message.getVendor() )
+			{
+				default:
+					break;
+			}
+		}
+		
+		return message;
+	}
+}