Update weupnp lib (that add support for linux-igd), also code formatting and Javadoc fixes.

This commit is contained in:
seb 2011-04-19 08:41:48 +00:00
parent 9f872e3c27
commit 7dccafc489
15 changed files with 285 additions and 140 deletions

Binary file not shown.

View File

@ -36,6 +36,11 @@ import org.ice4j.*;
public class ChangeRequestAttribute public class ChangeRequestAttribute
extends org.ice4j.attribute.Attribute extends org.ice4j.attribute.Attribute
{ {
/**
* Attribute name.
*/
public static final String NAME = "CHANGE-REQUEST";
/** /**
* This is the "change IP" flag. If true, it requests the server * This is the "change IP" flag. If true, it requests the server
* to send the Binding Response with a different IP address than the * to send the Binding Response with a different IP address than the
@ -75,8 +80,6 @@ public class ChangeRequestAttribute
return NAME; return NAME;
} }
public static final String NAME = "CHANGE-REQUEST";
/** /**
* Compares two STUN Attributes. Attributes are considered equal when their * Compares two STUN Attributes. Attributes are considered equal when their
* type, length, and all data are the same. * type, length, and all data are the same.

View File

@ -20,6 +20,9 @@ package org.ice4j.attribute;
public class ChangedAddressAttribute extends AddressAttribute public class ChangedAddressAttribute extends AddressAttribute
{ {
/**
* Attribute name.
*/
public static final String NAME = "CHANGED-ADDRESS"; public static final String NAME = "CHANGED-ADDRESS";
/** /**

View File

@ -73,18 +73,61 @@ package org.ice4j.attribute;
*/ */
public class ErrorCodeAttribute extends Attribute public class ErrorCodeAttribute extends Attribute
{ {
// Common error codes /**
public static final char BAD_REQUEST = 400; * Attribute's name.
public static final char UNAUTHORIZED = 401; */
public static final char UNKNOWN_ATTRIBUTE = 420; public static final String NAME = "ERROR-CODE";
public static final char STALE_CREDENTIALS = 430;
public static final char INTEGRITY_CHECK_FAILURE = 431;
public static final char MISSING_USERNAME = 432;
public static final char USE_TLS = 433;
public static final char ROLE_CONFLICT = 487;
public static final char SERVER_ERROR = 500;
public static final char GLOBAL_FAILURE = 600;
// Common error codes
/**
* Bad request error code.
*/
public static final char BAD_REQUEST = 400;
/**
* Unauthorized error code.
*/
public static final char UNAUTHORIZED = 401;
/**
* Unknown attribute error code.
*/
public static final char UNKNOWN_ATTRIBUTE = 420;
/**
* Stale credentials error code.
*/
public static final char STALE_CREDENTIALS = 430;
/**
* Integrity check failure error code.
*/
public static final char INTEGRITY_CHECK_FAILURE = 431;
/**
* Missing username error code.
*/
public static final char MISSING_USERNAME = 432;
/**
* Use TLS error code.
*/
public static final char USE_TLS = 433;
/**
* Role conflict error code.
*/
public static final char ROLE_CONFLICT = 487;
/**
* Server error code.
*/
public static final char SERVER_ERROR = 500;
/**
* Global failure error code.
*/
public static final char GLOBAL_FAILURE = 600;
/** /**
* The class represents the hundreds digit of the response code. The * The class represents the hundreds digit of the response code. The
@ -263,8 +306,6 @@ public class ErrorCodeAttribute extends Attribute
return NAME; return NAME;
} }
public static final String NAME = "ERROR-CODE";
/** /**
* Returns the length of this attribute's body. * Returns the length of this attribute's body.
* @return the length of this attribute's value. * @return the length of this attribute's value.

View File

@ -30,6 +30,9 @@ package org.ice4j.attribute;
public class MappedAddressAttribute extends AddressAttribute public class MappedAddressAttribute extends AddressAttribute
{ {
/**
* Attribute name.
*/
public static final String NAME = "MAPPED-ADDRESS"; public static final String NAME = "MAPPED-ADDRESS";
MappedAddressAttribute() MappedAddressAttribute()

View File

@ -21,7 +21,9 @@ package org.ice4j.attribute;
public class ReflectedFromAttribute extends AddressAttribute public class ReflectedFromAttribute extends AddressAttribute
{ {
/**
* Attribute name.
*/
public static final String NAME = "REFLECTED-FROM"; public static final String NAME = "REFLECTED-FROM";
/** /**

View File

@ -16,6 +16,9 @@ package org.ice4j.attribute;
public class ResponseAddressAttribute extends AddressAttribute public class ResponseAddressAttribute extends AddressAttribute
{ {
/**
* Attribute name.
*/
public static final String NAME = "RESPONSE-ADDRESS"; public static final String NAME = "RESPONSE-ADDRESS";
/** /**

View File

@ -16,6 +16,9 @@ package org.ice4j.attribute;
public class SourceAddressAttribute extends AddressAttribute public class SourceAddressAttribute extends AddressAttribute
{ {
/**
* Attribute name.
*/
public static final String NAME = "SOURCE-ADDRESS"; public static final String NAME = "SOURCE-ADDRESS";
/** /**

View File

@ -33,12 +33,19 @@ import org.ice4j.*;
*/ */
public class UnknownAttributesAttribute extends Attribute public class UnknownAttributesAttribute extends Attribute
{ {
/**
* Attribute name.
*/
public static String NAME = "UNKNOWN-ATTRIBUTES";
/** /**
* A list of attribute types that were not understood by the server. * A list of attribute types that were not understood by the server.
*/ */
private ArrayList<Character> unknownAttributes = new ArrayList<Character>(); private ArrayList<Character> unknownAttributes = new ArrayList<Character>();
/**
* Constructor.
*/
UnknownAttributesAttribute() UnknownAttributesAttribute()
{ {
super(UNKNOWN_ATTRIBUTES); super(UNKNOWN_ATTRIBUTES);
@ -55,8 +62,6 @@ public class UnknownAttributesAttribute extends Attribute
return NAME; return NAME;
} }
public static String NAME = "UNKNOWN-ATTRIBUTES";
/** /**
* Returns the length (in bytes) of this attribute's body. * Returns the length (in bytes) of this attribute's body.
* If the number of unknown attributes is an odd number, one of the * If the number of unknown attributes is an odd number, one of the

View File

@ -362,10 +362,10 @@ class ConnectivityCheckServer
} }
/** /**
* Implements the {@link CredentialsAuthority#getRemoteKey(String)} method * Implements the {@link CredentialsAuthority#getRemoteKey(String, String)}
* in a way that would return this handler's parent agent remote password if * method in a way that would return this handler's parent agent remote
* <tt>username</tt> is either the remote ufrag or the username that we * password if <tt>username</tt> is either the remote ufrag or the username
* are expected to use when querying the remote peer. * that we are expected to use when querying the remote peer.
* *
* @param username the remote ufrag that we should return a password for. * @param username the remote ufrag that we should return a password for.
* @param media the media name that we want to get remote key. * @param media the media name that we want to get remote key.

View File

@ -100,7 +100,7 @@ public class CandidateHarvesterSet
/** /**
* Represents a task to be executed by the specified executorService and * Represents a task to be executed by the specified executorService and
* to call {@link CandidateHarvester#harvestComponent)} on the specified * to call {@link CandidateHarvester#harvestComponent} on the specified
* harvesters. * harvesters.
*/ */
class CandidateHarvesterSetTask class CandidateHarvesterSetTask

View File

@ -87,6 +87,11 @@ public class ChannelData
return this.data; return this.data;
} }
/**
* Get the data length.
*
* @return data length
*/
public char getDataLength() public char getDataLength()
{ {
char length = 0; char length = 0;

View File

@ -14,7 +14,7 @@ import org.ice4j.attribute.*;
import org.ice4j.stack.*; import org.ice4j.stack.*;
/** /**
* This class represents a STUN message. STUN messages are TLV (type-length-value) * This class represents a STUN message. Messages are TLV (type-length-value)
* encoded using big endian (network ordered) binary. All STUN messages start * encoded using big endian (network ordered) binary. All STUN messages start
* with a STUN header, followed by a STUN payload. The payload is a series of * with a STUN header, followed by a STUN payload. The payload is a series of
* STUN attributes, the set of which depends on the message type. The STUN * STUN attributes, the set of which depends on the message type. The STUN
@ -41,10 +41,12 @@ public abstract class Message
/* STUN methods */ /* STUN methods */
public static final char STUN_METHOD_BINDING = 0x0001; public static final char STUN_METHOD_BINDING = 0x0001;
public static final char BINDING_REQUEST =
public static final char BINDING_REQUEST = (STUN_METHOD_BINDING | STUN_REQUEST); (STUN_METHOD_BINDING | STUN_REQUEST);
public static final char BINDING_SUCCESS_RESPONSE = (STUN_METHOD_BINDING | STUN_SUCCESS_RESP); public static final char BINDING_SUCCESS_RESPONSE =
public static final char BINDING_ERROR_RESPONSE = (STUN_METHOD_BINDING | STUN_ERROR_RESP); (STUN_METHOD_BINDING | STUN_SUCCESS_RESP);
public static final char BINDING_ERROR_RESPONSE =
(STUN_METHOD_BINDING | STUN_ERROR_RESP);
public static final char SHARED_SECRET_REQUEST = 0x0002; public static final char SHARED_SECRET_REQUEST = 0x0002;
public static final char SHARED_SECRET_RESPONSE = 0x0102; public static final char SHARED_SECRET_RESPONSE = 0x0102;
public static final char SHARED_SECRET_ERROR_RESPONSE = 0x0112; public static final char SHARED_SECRET_ERROR_RESPONSE = 0x0112;
@ -57,20 +59,34 @@ public abstract class Message
public static final char TURN_METHOD_CREATEPERMISSION = 0x0008; public static final char TURN_METHOD_CREATEPERMISSION = 0x0008;
public static final char TURN_METHOD_CHANNELBIND = 0x0009; public static final char TURN_METHOD_CHANNELBIND = 0x0009;
public static final char ALLOCATE_REQUEST = (TURN_METHOD_ALLOCATE | STUN_REQUEST); public static final char ALLOCATE_REQUEST =
public static final char ALLOCATE_RESPONSE = (TURN_METHOD_ALLOCATE | STUN_SUCCESS_RESP); (TURN_METHOD_ALLOCATE | STUN_REQUEST);
public static final char ALLOCATE_ERROR_RESPONSE = (TURN_METHOD_ALLOCATE | STUN_ERROR_RESP); public static final char ALLOCATE_RESPONSE =
public static final char REFRESH_REQUEST = (TURN_METHOD_REFRESH | STUN_REQUEST); (TURN_METHOD_ALLOCATE | STUN_SUCCESS_RESP);
public static final char REFRESH_RESPONSE = (TURN_METHOD_REFRESH | STUN_SUCCESS_RESP); public static final char ALLOCATE_ERROR_RESPONSE =
public static final char REFRESH_ERROR_RESPONSE = (TURN_METHOD_REFRESH | STUN_ERROR_RESP); (TURN_METHOD_ALLOCATE | STUN_ERROR_RESP);
public static final char CHANNELBIND_REQUEST = (TURN_METHOD_CHANNELBIND | STUN_REQUEST); public static final char REFRESH_REQUEST =
public static final char CHANNELBIND_RESPONSE = (TURN_METHOD_CHANNELBIND | STUN_SUCCESS_RESP); (TURN_METHOD_REFRESH | STUN_REQUEST);
public static final char CHANNELBIND_ERROR_RESPONSE = (TURN_METHOD_CHANNELBIND | STUN_ERROR_RESP); public static final char REFRESH_RESPONSE =
public static final char CREATEPERMISSION_REQUEST = (TURN_METHOD_CREATEPERMISSION | STUN_REQUEST); (TURN_METHOD_REFRESH | STUN_SUCCESS_RESP);
public static final char CREATEPERMISSION_RESPONSE = (TURN_METHOD_CREATEPERMISSION | STUN_SUCCESS_RESP); public static final char REFRESH_ERROR_RESPONSE =
public static final char CREATEPERMISSION_ERROR_RESPONSE = (TURN_METHOD_CREATEPERMISSION | STUN_ERROR_RESP); (TURN_METHOD_REFRESH | STUN_ERROR_RESP);
public static final char SEND_INDICATION = (TURN_METHOD_SEND | STUN_INDICATION); public static final char CHANNELBIND_REQUEST =
public static final char DATA_INDICATION = (TURN_METHOD_DATA | STUN_INDICATION); (TURN_METHOD_CHANNELBIND | STUN_REQUEST);
public static final char CHANNELBIND_RESPONSE =
(TURN_METHOD_CHANNELBIND | STUN_SUCCESS_RESP);
public static final char CHANNELBIND_ERROR_RESPONSE =
(TURN_METHOD_CHANNELBIND | STUN_ERROR_RESP);
public static final char CREATEPERMISSION_REQUEST =
(TURN_METHOD_CREATEPERMISSION | STUN_REQUEST);
public static final char CREATEPERMISSION_RESPONSE =
(TURN_METHOD_CREATEPERMISSION | STUN_SUCCESS_RESP);
public static final char CREATEPERMISSION_ERROR_RESPONSE =
(TURN_METHOD_CREATEPERMISSION | STUN_ERROR_RESP);
public static final char SEND_INDICATION =
(TURN_METHOD_SEND | STUN_INDICATION);
public static final char DATA_INDICATION =
(TURN_METHOD_DATA | STUN_INDICATION);
//Message fields //Message fields
/** /**
@ -111,7 +127,6 @@ public abstract class Message
protected LinkedHashMap<Character, Attribute> attributes protected LinkedHashMap<Character, Attribute> attributes
= new LinkedHashMap<Character, Attribute>(); = new LinkedHashMap<Character, Attribute>();
/** /**
* Attribute presentity is a thing of RFC 3489 and no longer exists in * Attribute presentity is a thing of RFC 3489 and no longer exists in
* 5389. we are not using it any longer and if at some point we decide we * 5389. we are not using it any longer and if at some point we decide we
@ -157,58 +172,60 @@ public abstract class Message
public static final byte M = 3; public static final byte M = 3;
//Message indices //Message indices
protected static final byte BINDING_REQUEST_PRESENTITY_INDEX = 0; protected static final byte BINDING_REQUEST_PRESENTITY_INDEX = 0;
protected static final byte BINDING_RESPONSE_PRESENTITY_INDEX = 1; protected static final byte BINDING_RESPONSE_PRESENTITY_INDEX = 1;
protected static final byte BINDING_ERROR_RESPONSE_PRESENTITY_INDEX = 2; protected static final byte BINDING_ERROR_RESPONSE_PRESENTITY_INDEX = 2;
protected static final byte SHARED_SECRET_REQUEST_PRESENTITY_INDEX = 3; protected static final byte SHARED_SECRET_REQUEST_PRESENTITY_INDEX = 3;
protected static final byte SHARED_SECRET_RESPONSE_PRESENTITY_INDEX = 4; protected static final byte SHARED_SECRET_RESPONSE_PRESENTITY_INDEX = 4;
protected static final byte SHARED_SECRET_ERROR_RESPONSE_PRESENTITY_INDEX = 5; protected static final byte SHARED_SECRET_ERROR_RESPONSE_PRESENTITY_INDEX =
protected static final byte ALLOCATE_REQUEST_PRESENTITY_INDEX = 6; 5;
protected static final byte ALLOCATE_RESPONSE_PRESENTITY_INDEX = 7; protected static final byte ALLOCATE_REQUEST_PRESENTITY_INDEX = 6;
protected static final byte REFRESH_REQUEST_PRESENTITY_INDEX = 8; protected static final byte ALLOCATE_RESPONSE_PRESENTITY_INDEX = 7;
protected static final byte REFRESH_RESPONSE_PRESENTITY_INDEX = 9; protected static final byte REFRESH_REQUEST_PRESENTITY_INDEX = 8;
protected static final byte CHANNELBIND_REQUEST_PRESENTITY_INDEX = 10; protected static final byte REFRESH_RESPONSE_PRESENTITY_INDEX = 9;
protected static final byte CHANNELBIND_RESPONSE_PRESENTITY_INDEX = 11; protected static final byte CHANNELBIND_REQUEST_PRESENTITY_INDEX = 10;
protected static final byte SEND_INDICATION_PRESENTITY_INDEX = 12; protected static final byte CHANNELBIND_RESPONSE_PRESENTITY_INDEX = 11;
protected static final byte DATA_INDICATION_PRESENTITY_INDEX = 13; protected static final byte SEND_INDICATION_PRESENTITY_INDEX = 12;
protected static final byte DATA_INDICATION_PRESENTITY_INDEX = 13;
//Attribute indices //Attribute indices
protected static final byte MAPPED_ADDRESS_PRESENTITY_INDEX = 0; protected static final byte MAPPED_ADDRESS_PRESENTITY_INDEX = 0;
protected static final byte RESPONSE_ADDRESS_PRESENTITY_INDEX = 1; protected static final byte RESPONSE_ADDRESS_PRESENTITY_INDEX = 1;
protected static final byte CHANGE_REQUEST_PRESENTITY_INDEX = 2; protected static final byte CHANGE_REQUEST_PRESENTITY_INDEX = 2;
protected static final byte SOURCE_ADDRESS_PRESENTITY_INDEX = 3; protected static final byte SOURCE_ADDRESS_PRESENTITY_INDEX = 3;
protected static final byte CHANGED_ADDRESS_PRESENTITY_INDEX = 4; protected static final byte CHANGED_ADDRESS_PRESENTITY_INDEX = 4;
protected static final byte USERNAME_PRESENTITY_INDEX = 5; protected static final byte USERNAME_PRESENTITY_INDEX = 5;
protected static final byte PASSWORD_PRESENTITY_INDEX = 6; protected static final byte PASSWORD_PRESENTITY_INDEX = 6;
protected static final byte MESSAGE_INTEGRITY_PRESENTITY_INDEX = 7; protected static final byte MESSAGE_INTEGRITY_PRESENTITY_INDEX = 7;
protected static final byte ERROR_CODE_PRESENTITY_INDEX = 8; protected static final byte ERROR_CODE_PRESENTITY_INDEX = 8;
protected static final byte UNKNOWN_ATTRIBUTES_PRESENTITY_INDEX = 9; protected static final byte UNKNOWN_ATTRIBUTES_PRESENTITY_INDEX = 9;
protected static final byte REFLECTED_FROM_PRESENTITY_INDEX = 10; protected static final byte REFLECTED_FROM_PRESENTITY_INDEX = 10;
protected static final byte XOR_MAPPED_ADDRESS_PRESENTITY_INDEX = 11; protected static final byte XOR_MAPPED_ADDRESS_PRESENTITY_INDEX = 11;
protected static final byte XOR_ONLY_PRESENTITY_INDEX = 12; protected static final byte XOR_ONLY_PRESENTITY_INDEX = 12;
protected static final byte SOFTWARE_PRESENTITY_INDEX = 13; protected static final byte SOFTWARE_PRESENTITY_INDEX = 13;
protected static final byte UNKNOWN_OPTIONAL_ATTRIBUTES_PRESENTITY_INDEX = 14; protected static final byte UNKNOWN_OPTIONAL_ATTRIBUTES_PRESENTITY_INDEX =
protected static final byte ALTERNATE_SERVER_PRESENTITY_INDEX = 15; 14;
protected static final byte REALM_PRESENTITY_INDEX = 16; protected static final byte ALTERNATE_SERVER_PRESENTITY_INDEX = 15;
protected static final byte NONCE_PRESENTITY_INDEX = 17; protected static final byte REALM_PRESENTITY_INDEX = 16;
protected static final byte FINGERPRINT_PRESENTITY_INDEX = 18; protected static final byte NONCE_PRESENTITY_INDEX = 17;
protected static final byte FINGERPRINT_PRESENTITY_INDEX = 18;
/* TURN attributes */ /* TURN attributes */
protected static final byte CHANNEL_NUMBER_PRESENTITY_INDEX = 19; protected static final byte CHANNEL_NUMBER_PRESENTITY_INDEX = 19;
protected static final byte LIFETIME_PRESENTITY_INDEX = 20; protected static final byte LIFETIME_PRESENTITY_INDEX = 20;
protected static final byte XOR_PEER_ADDRESS_PRESENTITY_INDEX = 21; protected static final byte XOR_PEER_ADDRESS_PRESENTITY_INDEX = 21;
protected static final byte DATA_PRESENTITY_INDEX = 22; protected static final byte DATA_PRESENTITY_INDEX = 22;
protected static final byte XOR_RELAYED_ADDRESS_PRESENTITY_INDEX = 23; protected static final byte XOR_RELAYED_ADDRESS_PRESENTITY_INDEX = 23;
protected static final byte EVEN_PORT_PRESENTITY_INDEX = 24; protected static final byte EVEN_PORT_PRESENTITY_INDEX = 24;
protected static final byte REQUESTED_TRANSPORT_PRESENTITY_INDEX = 25; protected static final byte REQUESTED_TRANSPORT_PRESENTITY_INDEX = 25;
protected static final byte DONT_FRAGMENT_PRESENTITY_INDEX = 26; protected static final byte DONT_FRAGMENT_PRESENTITY_INDEX = 26;
protected static final byte RESERVATION_TOKEN_PRESENTITY_INDEX = 27; protected static final byte RESERVATION_TOKEN_PRESENTITY_INDEX = 27;
/* ICE attributes */ /* ICE attributes */
protected static final byte PRIORITY_PRESENTITY_INDEX = 28; protected static final byte PRIORITY_PRESENTITY_INDEX = 28;
protected static final byte ICE_CONTROLLING_PRESENTITY_INDEX = 29; protected static final byte ICE_CONTROLLING_PRESENTITY_INDEX = 29;
protected static final byte ICE_CONTROLLED_PRESENTITY_INDEX = 30; protected static final byte ICE_CONTROLLED_PRESENTITY_INDEX = 30;
protected static final byte USE_CANDIDATE_PRESENTITY_INDEX = 31; protected static final byte USE_CANDIDATE_PRESENTITY_INDEX = 31;
protected final static byte attributePresentities[][] = new byte[][]{ protected final static byte attributePresentities[][] = new byte[][]{
// Binding Shared Shared Shared Alloc Alloc Rfrsh Rfrsh ChnlBnd ChnlBnd Send Data // Binding Shared Shared Shared Alloc Alloc Rfrsh Rfrsh ChnlBnd ChnlBnd Send Data
@ -270,7 +287,7 @@ public abstract class Message
int attLen = att.getDataLength() + Attribute.HEADER_LENGTH; int attLen = att.getDataLength() + Attribute.HEADER_LENGTH;
//take attribute padding into account: //take attribute padding into account:
attLen += (4 - attLen%4)%4; attLen += (4 - (attLen % 4)) % 4;
length += attLen; length += attLen;
} }
@ -320,8 +337,8 @@ public abstract class Message
* attribute exists. * attribute exists.
* *
* @param attributeType the type of the attribute * @param attributeType the type of the attribute
* @return the attribute with the specified type or null if no such attribute * @return the attribute with the specified type or null if no such
* exists * attribute exists
*/ */
public Attribute getAttribute(char attributeType) public Attribute getAttribute(char attributeType)
{ {
@ -390,7 +407,8 @@ public abstract class Message
* *
* @param tranID the transaction id to set in this message. * @param tranID the transaction id to set in this message.
* *
* @throws StunException ILLEGAL_ARGUMENT if the transaction id is not valid. * @throws StunException ILLEGAL_ARGUMENT if the transaction id is not
* valid.
*/ */
public void setTransactionID(byte[] tranID) public void setTransactionID(byte[] tranID)
throws StunException throws StunException
@ -434,24 +452,35 @@ public abstract class Message
switch (messageType) switch (messageType)
{ {
case BINDING_REQUEST: msgIndex = BINDING_REQUEST_PRESENTITY_INDEX; break; case BINDING_REQUEST:
case BINDING_SUCCESS_RESPONSE: msgIndex = BINDING_RESPONSE_PRESENTITY_INDEX; break; msgIndex = BINDING_REQUEST_PRESENTITY_INDEX; break;
case BINDING_ERROR_RESPONSE: msgIndex = BINDING_ERROR_RESPONSE_PRESENTITY_INDEX; break; case BINDING_SUCCESS_RESPONSE:
case SHARED_SECRET_REQUEST: msgIndex = SHARED_SECRET_REQUEST_PRESENTITY_INDEX; break; msgIndex = BINDING_RESPONSE_PRESENTITY_INDEX; break;
case SHARED_SECRET_RESPONSE: msgIndex = SHARED_SECRET_RESPONSE_PRESENTITY_INDEX; break; case BINDING_ERROR_RESPONSE:
case SHARED_SECRET_ERROR_RESPONSE: msgIndex = SHARED_SECRET_ERROR_RESPONSE_PRESENTITY_INDEX; break; msgIndex = BINDING_ERROR_RESPONSE_PRESENTITY_INDEX; break;
case ALLOCATE_REQUEST: msgIndex = ALLOCATE_REQUEST_PRESENTITY_INDEX; break; case SHARED_SECRET_REQUEST:
case REFRESH_REQUEST: msgIndex = REFRESH_REQUEST_PRESENTITY_INDEX; break; msgIndex = SHARED_SECRET_REQUEST_PRESENTITY_INDEX; break;
case CHANNELBIND_REQUEST: msgIndex = CHANNELBIND_REQUEST_PRESENTITY_INDEX; break; case SHARED_SECRET_RESPONSE:
case SEND_INDICATION: msgIndex = SEND_INDICATION_PRESENTITY_INDEX; break; msgIndex = SHARED_SECRET_RESPONSE_PRESENTITY_INDEX; break;
case DATA_INDICATION: msgIndex = DATA_INDICATION_PRESENTITY_INDEX; break; case SHARED_SECRET_ERROR_RESPONSE:
msgIndex = SHARED_SECRET_ERROR_RESPONSE_PRESENTITY_INDEX; break;
case ALLOCATE_REQUEST:
msgIndex = ALLOCATE_REQUEST_PRESENTITY_INDEX; break;
case REFRESH_REQUEST:
msgIndex = REFRESH_REQUEST_PRESENTITY_INDEX; break;
case CHANNELBIND_REQUEST:
msgIndex = CHANNELBIND_REQUEST_PRESENTITY_INDEX; break;
case SEND_INDICATION:
msgIndex = SEND_INDICATION_PRESENTITY_INDEX; break;
case DATA_INDICATION:
msgIndex = DATA_INDICATION_PRESENTITY_INDEX; break;
default: default:
if (logger.isLoggable(Level.FINE)) if (logger.isLoggable(Level.FINE))
{ {
logger.log( logger.log(
Level.FINE, Level.FINE,
"Attribute presentity not defined for STUN message type: " "Attribute presentity not defined for STUN " +
+ ((int) messageType) "message type: " + ((int) messageType)
+ ". Will assume optional."); + ". Will assume optional.");
} }
return O; return O;
@ -459,34 +488,63 @@ public abstract class Message
switch (attributeType) switch (attributeType)
{ {
case Attribute.MAPPED_ADDRESS: attributeIndex = MAPPED_ADDRESS_PRESENTITY_INDEX; break; case Attribute.MAPPED_ADDRESS:
case Attribute.RESPONSE_ADDRESS: attributeIndex = RESPONSE_ADDRESS_PRESENTITY_INDEX; break; attributeIndex = MAPPED_ADDRESS_PRESENTITY_INDEX; break;
case Attribute.CHANGE_REQUEST: attributeIndex = CHANGE_REQUEST_PRESENTITY_INDEX; break; case Attribute.RESPONSE_ADDRESS:
case Attribute.SOURCE_ADDRESS: attributeIndex = SOURCE_ADDRESS_PRESENTITY_INDEX; break; attributeIndex = RESPONSE_ADDRESS_PRESENTITY_INDEX; break;
case Attribute.CHANGED_ADDRESS: attributeIndex = CHANGED_ADDRESS_PRESENTITY_INDEX; break; case Attribute.CHANGE_REQUEST:
case Attribute.USERNAME: attributeIndex = USERNAME_PRESENTITY_INDEX; break; attributeIndex = CHANGE_REQUEST_PRESENTITY_INDEX; break;
case Attribute.PASSWORD: attributeIndex = PASSWORD_PRESENTITY_INDEX; break; case Attribute.SOURCE_ADDRESS:
case Attribute.MESSAGE_INTEGRITY: attributeIndex = MESSAGE_INTEGRITY_PRESENTITY_INDEX; break; attributeIndex = SOURCE_ADDRESS_PRESENTITY_INDEX; break;
case Attribute.ERROR_CODE: attributeIndex = ERROR_CODE_PRESENTITY_INDEX; break; case Attribute.CHANGED_ADDRESS:
case Attribute.UNKNOWN_ATTRIBUTES: attributeIndex = UNKNOWN_ATTRIBUTES_PRESENTITY_INDEX; break; attributeIndex = CHANGED_ADDRESS_PRESENTITY_INDEX; break;
case Attribute.REFLECTED_FROM: attributeIndex = REFLECTED_FROM_PRESENTITY_INDEX; break; case Attribute.USERNAME:
case Attribute.XOR_MAPPED_ADDRESS: attributeIndex = XOR_MAPPED_ADDRESS_PRESENTITY_INDEX; break; attributeIndex = USERNAME_PRESENTITY_INDEX; break;
case Attribute.XOR_ONLY: attributeIndex = XOR_ONLY_PRESENTITY_INDEX; break; case Attribute.PASSWORD:
case Attribute.SOFTWARE: attributeIndex = SOFTWARE_PRESENTITY_INDEX; break; attributeIndex = PASSWORD_PRESENTITY_INDEX; break;
case Attribute.ALTERNATE_SERVER: attributeIndex = ALTERNATE_SERVER_PRESENTITY_INDEX; break; case Attribute.MESSAGE_INTEGRITY:
case Attribute.REALM: attributeIndex = REALM_PRESENTITY_INDEX; break; attributeIndex = MESSAGE_INTEGRITY_PRESENTITY_INDEX; break;
case Attribute.NONCE: attributeIndex = NONCE_PRESENTITY_INDEX; break; case Attribute.ERROR_CODE:
case Attribute.FINGERPRINT: attributeIndex = FINGERPRINT_PRESENTITY_INDEX; break; attributeIndex = ERROR_CODE_PRESENTITY_INDEX; break;
case Attribute.CHANNEL_NUMBER: attributeIndex = CHANNEL_NUMBER_PRESENTITY_INDEX; break; case Attribute.UNKNOWN_ATTRIBUTES:
case Attribute.LIFETIME: attributeIndex = LIFETIME_PRESENTITY_INDEX; break; attributeIndex = UNKNOWN_ATTRIBUTES_PRESENTITY_INDEX; break;
case Attribute.XOR_PEER_ADDRESS: attributeIndex = XOR_PEER_ADDRESS_PRESENTITY_INDEX; break; case Attribute.REFLECTED_FROM:
case Attribute.DATA: attributeIndex = DATA_PRESENTITY_INDEX; break; attributeIndex = REFLECTED_FROM_PRESENTITY_INDEX; break;
case Attribute.XOR_RELAYED_ADDRESS:attributeIndex = XOR_RELAYED_ADDRESS_PRESENTITY_INDEX; break; case Attribute.XOR_MAPPED_ADDRESS:
case Attribute.EVEN_PORT: attributeIndex = EVEN_PORT_PRESENTITY_INDEX; break; attributeIndex = XOR_MAPPED_ADDRESS_PRESENTITY_INDEX; break;
case Attribute.REQUESTED_TRANSPORT:attributeIndex = REQUESTED_TRANSPORT_PRESENTITY_INDEX; break; case Attribute.XOR_ONLY:
case Attribute.DONT_FRAGMENT: attributeIndex = DONT_FRAGMENT_PRESENTITY_INDEX; break; attributeIndex = XOR_ONLY_PRESENTITY_INDEX; break;
case Attribute.RESERVATION_TOKEN: attributeIndex = RESERVATION_TOKEN_PRESENTITY_INDEX; break; case Attribute.SOFTWARE:
default: attributeIndex = UNKNOWN_OPTIONAL_ATTRIBUTES_PRESENTITY_INDEX; break; attributeIndex = SOFTWARE_PRESENTITY_INDEX; break;
case Attribute.ALTERNATE_SERVER:
attributeIndex = ALTERNATE_SERVER_PRESENTITY_INDEX; break;
case Attribute.REALM:
attributeIndex = REALM_PRESENTITY_INDEX; break;
case Attribute.NONCE:
attributeIndex = NONCE_PRESENTITY_INDEX; break;
case Attribute.FINGERPRINT:
attributeIndex = FINGERPRINT_PRESENTITY_INDEX; break;
case Attribute.CHANNEL_NUMBER:
attributeIndex = CHANNEL_NUMBER_PRESENTITY_INDEX; break;
case Attribute.LIFETIME:
attributeIndex = LIFETIME_PRESENTITY_INDEX; break;
case Attribute.XOR_PEER_ADDRESS:
attributeIndex = XOR_PEER_ADDRESS_PRESENTITY_INDEX; break;
case Attribute.DATA:
attributeIndex = DATA_PRESENTITY_INDEX; break;
case Attribute.XOR_RELAYED_ADDRESS:
attributeIndex = XOR_RELAYED_ADDRESS_PRESENTITY_INDEX; break;
case Attribute.EVEN_PORT:
attributeIndex = EVEN_PORT_PRESENTITY_INDEX; break;
case Attribute.REQUESTED_TRANSPORT:
attributeIndex = REQUESTED_TRANSPORT_PRESENTITY_INDEX; break;
case Attribute.DONT_FRAGMENT:
attributeIndex = DONT_FRAGMENT_PRESENTITY_INDEX; break;
case Attribute.RESERVATION_TOKEN:
attributeIndex = RESERVATION_TOKEN_PRESENTITY_INDEX; break;
default:
attributeIndex = UNKNOWN_OPTIONAL_ATTRIBUTES_PRESENTITY_INDEX;
break;
} }
return attributePresentities[ attributeIndex ][ msgIndex ]; return attributePresentities[ attributeIndex ][ msgIndex ];
@ -520,7 +578,8 @@ public abstract class Message
case SEND_INDICATION: return "SEND-INDICATION"; case SEND_INDICATION: return "SEND-INDICATION";
case SHARED_SECRET_REQUEST: return "SHARED-SECRET-REQUEST"; case SHARED_SECRET_REQUEST: return "SHARED-SECRET-REQUEST";
case SHARED_SECRET_RESPONSE: return "SHARED-SECRET-RESPONSE"; case SHARED_SECRET_RESPONSE: return "SHARED-SECRET-RESPONSE";
case SHARED_SECRET_ERROR_RESPONSE: return "SHARED-SECRET-ERROR-RESPONSE"; case SHARED_SECRET_ERROR_RESPONSE:
return "SHARED-SECRET-ERROR-RESPONSE";
default: return "UNKNOWN-MESSAGE"; default: return "UNKNOWN-MESSAGE";
} }
} }
@ -874,7 +933,7 @@ public abstract class Message
if(! rfc3489CompatibilityMode ) if(! rfc3489CompatibilityMode )
return; return;
for(char i = Attribute.MAPPED_ADDRESS; i < Attribute.REFLECTED_FROM; i++) for(char i = Attribute.MAPPED_ADDRESS; i < Attribute.REFLECTED_FROM;i++)
if(getAttributePresentity(i) == M && getAttribute(i) == null) if(getAttributePresentity(i) == M && getAttribute(i) == null)
throw new IllegalStateException( throw new IllegalStateException(
"A mandatory attribute (type=" +(int)i + ") is missing!"); "A mandatory attribute (type=" +(int)i + ") is missing!");

View File

@ -603,18 +603,36 @@ public class MessageFactory
} }
// ======================== NOT CURRENTLY SUPPORTED // ======================== NOT CURRENTLY SUPPORTED
public static Request createShareSecretRequest() /**
* Create a shared secret request.
* WARNING: This is not currently supported.
*
* @return request
*/
public static Request createSharedSecretRequest()
{ {
throw new UnsupportedOperationException( throw new UnsupportedOperationException(
"Shared Secret Support is not currently implemented"); "Shared Secret Support is not currently implemented");
} }
/**
* Create a shared secret response.
* WARNING: This is not currently supported.
*
* @return response
*/
public static Response createSharedSecretResponse() public static Response createSharedSecretResponse()
{ {
throw new UnsupportedOperationException( throw new UnsupportedOperationException(
"Shared Secret Support is not currently implemented"); "Shared Secret Support is not currently implemented");
} }
/**
* Create a shared secret error response.
* WARNING: This is not currently supported.
*
* @return error response
*/
public static Response createSharedSecretErrorResponse() public static Response createSharedSecretErrorResponse()
{ {
throw new UnsupportedOperationException( throw new UnsupportedOperationException(

View File

@ -200,7 +200,7 @@ public class LongTermCredentialSession
* username or user frag, an empty array if there was no password for * username or user frag, an empty array if there was no password for
* that username or <tt>null</tt> if the username is not a remote user * that username or <tt>null</tt> if the username is not a remote user
* name recognized by this <tt>CredentialsAuthority</tt> * name recognized by this <tt>CredentialsAuthority</tt>
* @see CredentialsAuthority#getRemoteKey(String) * @see CredentialsAuthority#getRemoteKey(String, String)
*/ */
public byte[] getRemoteKey(String username, String media) public byte[] getRemoteKey(String username, String media)
{ {