From 7dccafc489e3553242b61d05b4d504cf279c6b07 Mon Sep 17 00:00:00 2001 From: seb Date: Tue, 19 Apr 2011 08:41:48 +0000 Subject: [PATCH] Update weupnp lib (that add support for linux-igd), also code formatting and Javadoc fixes. --- lib/weupnp-0.1.2-SNAPSHOT.jar | Bin 26147 -> 25946 bytes .../attribute/ChangeRequestAttribute.java | 7 +- .../attribute/ChangedAddressAttribute.java | 3 + .../ice4j/attribute/ErrorCodeAttribute.java | 67 +++- .../attribute/MappedAddressAttribute.java | 3 + .../attribute/ReflectedFromAttribute.java | 4 +- .../attribute/ResponseAddressAttribute.java | 3 + .../attribute/SourceAddressAttribute.java | 3 + .../attribute/UnknownAttributesAttribute.java | 11 +- .../ice4j/ice/ConnectivityCheckServer.java | 8 +- .../ice/harvest/CandidateHarvesterSet.java | 2 +- src/org/ice4j/message/ChannelData.java | 5 + src/org/ice4j/message/Message.java | 285 +++++++++++------- src/org/ice4j/message/MessageFactory.java | 22 +- .../security/LongTermCredentialSession.java | 2 +- 15 files changed, 285 insertions(+), 140 deletions(-) diff --git a/lib/weupnp-0.1.2-SNAPSHOT.jar b/lib/weupnp-0.1.2-SNAPSHOT.jar index d404133682fc118687b314ab11502354e8c62fe4..e1938287019c012099adbd74045cfe32954261f2 100644 GIT binary patch delta 9906 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 delta 10064 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 b{#~MfD)ir@B!tQQpTs})N{X~={s;UYokxB| diff --git a/src/org/ice4j/attribute/ChangeRequestAttribute.java b/src/org/ice4j/attribute/ChangeRequestAttribute.java index c82ade3..b92e0db 100644 --- a/src/org/ice4j/attribute/ChangeRequestAttribute.java +++ b/src/org/ice4j/attribute/ChangeRequestAttribute.java @@ -36,6 +36,11 @@ import org.ice4j.*; public class ChangeRequestAttribute 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 * to send the Binding Response with a different IP address than the @@ -75,8 +80,6 @@ public class ChangeRequestAttribute return NAME; } - public static final String NAME = "CHANGE-REQUEST"; - /** * Compares two STUN Attributes. Attributes are considered equal when their * type, length, and all data are the same. diff --git a/src/org/ice4j/attribute/ChangedAddressAttribute.java b/src/org/ice4j/attribute/ChangedAddressAttribute.java index 004c35e..a7c81ea 100644 --- a/src/org/ice4j/attribute/ChangedAddressAttribute.java +++ b/src/org/ice4j/attribute/ChangedAddressAttribute.java @@ -20,6 +20,9 @@ package org.ice4j.attribute; public class ChangedAddressAttribute extends AddressAttribute { + /** + * Attribute name. + */ public static final String NAME = "CHANGED-ADDRESS"; /** diff --git a/src/org/ice4j/attribute/ErrorCodeAttribute.java b/src/org/ice4j/attribute/ErrorCodeAttribute.java index 59a38d2..b62c5dd 100644 --- a/src/org/ice4j/attribute/ErrorCodeAttribute.java +++ b/src/org/ice4j/attribute/ErrorCodeAttribute.java @@ -73,18 +73,61 @@ package org.ice4j.attribute; */ public class ErrorCodeAttribute extends Attribute { - // Common error codes - public static final char BAD_REQUEST = 400; - public static final char UNAUTHORIZED = 401; - public static final char UNKNOWN_ATTRIBUTE = 420; - 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; + /** + * Attribute's name. + */ + public static final String NAME = "ERROR-CODE"; + // 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 @@ -263,8 +306,6 @@ public class ErrorCodeAttribute extends Attribute return NAME; } - public static final String NAME = "ERROR-CODE"; - /** * Returns the length of this attribute's body. * @return the length of this attribute's value. diff --git a/src/org/ice4j/attribute/MappedAddressAttribute.java b/src/org/ice4j/attribute/MappedAddressAttribute.java index 38b7a98..d78517f 100644 --- a/src/org/ice4j/attribute/MappedAddressAttribute.java +++ b/src/org/ice4j/attribute/MappedAddressAttribute.java @@ -30,6 +30,9 @@ package org.ice4j.attribute; public class MappedAddressAttribute extends AddressAttribute { + /** + * Attribute name. + */ public static final String NAME = "MAPPED-ADDRESS"; MappedAddressAttribute() diff --git a/src/org/ice4j/attribute/ReflectedFromAttribute.java b/src/org/ice4j/attribute/ReflectedFromAttribute.java index acd6215..ea929dd 100644 --- a/src/org/ice4j/attribute/ReflectedFromAttribute.java +++ b/src/org/ice4j/attribute/ReflectedFromAttribute.java @@ -21,7 +21,9 @@ package org.ice4j.attribute; public class ReflectedFromAttribute extends AddressAttribute { - + /** + * Attribute name. + */ public static final String NAME = "REFLECTED-FROM"; /** diff --git a/src/org/ice4j/attribute/ResponseAddressAttribute.java b/src/org/ice4j/attribute/ResponseAddressAttribute.java index 557919c..7aaeb4d 100644 --- a/src/org/ice4j/attribute/ResponseAddressAttribute.java +++ b/src/org/ice4j/attribute/ResponseAddressAttribute.java @@ -16,6 +16,9 @@ package org.ice4j.attribute; public class ResponseAddressAttribute extends AddressAttribute { + /** + * Attribute name. + */ public static final String NAME = "RESPONSE-ADDRESS"; /** diff --git a/src/org/ice4j/attribute/SourceAddressAttribute.java b/src/org/ice4j/attribute/SourceAddressAttribute.java index 4222e99..a7528e5 100644 --- a/src/org/ice4j/attribute/SourceAddressAttribute.java +++ b/src/org/ice4j/attribute/SourceAddressAttribute.java @@ -16,6 +16,9 @@ package org.ice4j.attribute; public class SourceAddressAttribute extends AddressAttribute { + /** + * Attribute name. + */ public static final String NAME = "SOURCE-ADDRESS"; /** diff --git a/src/org/ice4j/attribute/UnknownAttributesAttribute.java b/src/org/ice4j/attribute/UnknownAttributesAttribute.java index f48d701..6ec9f09 100644 --- a/src/org/ice4j/attribute/UnknownAttributesAttribute.java +++ b/src/org/ice4j/attribute/UnknownAttributesAttribute.java @@ -33,12 +33,19 @@ import org.ice4j.*; */ 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. */ private ArrayList unknownAttributes = new ArrayList(); - + /** + * Constructor. + */ UnknownAttributesAttribute() { super(UNKNOWN_ATTRIBUTES); @@ -55,8 +62,6 @@ public class UnknownAttributesAttribute extends Attribute return NAME; } - public static String NAME = "UNKNOWN-ATTRIBUTES"; - /** * Returns the length (in bytes) of this attribute's body. * If the number of unknown attributes is an odd number, one of the diff --git a/src/org/ice4j/ice/ConnectivityCheckServer.java b/src/org/ice4j/ice/ConnectivityCheckServer.java index 40e1c4e..6ef668d 100644 --- a/src/org/ice4j/ice/ConnectivityCheckServer.java +++ b/src/org/ice4j/ice/ConnectivityCheckServer.java @@ -362,10 +362,10 @@ class ConnectivityCheckServer } /** - * Implements the {@link CredentialsAuthority#getRemoteKey(String)} method - * in a way that would return this handler's parent agent remote password if - * username is either the remote ufrag or the username that we - * are expected to use when querying the remote peer. + * Implements the {@link CredentialsAuthority#getRemoteKey(String, String)} + * method in a way that would return this handler's parent agent remote + * password if username is either the remote ufrag or the username + * that we are expected to use when querying the remote peer. * * @param username the remote ufrag that we should return a password for. * @param media the media name that we want to get remote key. diff --git a/src/org/ice4j/ice/harvest/CandidateHarvesterSet.java b/src/org/ice4j/ice/harvest/CandidateHarvesterSet.java index 6f450a5..40cb0d8 100644 --- a/src/org/ice4j/ice/harvest/CandidateHarvesterSet.java +++ b/src/org/ice4j/ice/harvest/CandidateHarvesterSet.java @@ -100,7 +100,7 @@ public class CandidateHarvesterSet /** * 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. */ class CandidateHarvesterSetTask diff --git a/src/org/ice4j/message/ChannelData.java b/src/org/ice4j/message/ChannelData.java index f9a5b01..d736cea 100644 --- a/src/org/ice4j/message/ChannelData.java +++ b/src/org/ice4j/message/ChannelData.java @@ -87,6 +87,11 @@ public class ChannelData return this.data; } + /** + * Get the data length. + * + * @return data length + */ public char getDataLength() { char length = 0; diff --git a/src/org/ice4j/message/Message.java b/src/org/ice4j/message/Message.java index 6b5e2c5..9a5f32b 100644 --- a/src/org/ice4j/message/Message.java +++ b/src/org/ice4j/message/Message.java @@ -14,7 +14,7 @@ import org.ice4j.attribute.*; 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 * 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 @@ -41,10 +41,12 @@ public abstract class Message /* STUN methods */ public static final char STUN_METHOD_BINDING = 0x0001; - - public static final char BINDING_REQUEST = (STUN_METHOD_BINDING | STUN_REQUEST); - public static final char BINDING_SUCCESS_RESPONSE = (STUN_METHOD_BINDING | STUN_SUCCESS_RESP); - public static final char BINDING_ERROR_RESPONSE = (STUN_METHOD_BINDING | STUN_ERROR_RESP); + public static final char BINDING_REQUEST = + (STUN_METHOD_BINDING | STUN_REQUEST); + public static final char BINDING_SUCCESS_RESPONSE = + (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_RESPONSE = 0x0102; 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_CHANNELBIND = 0x0009; - public static final char ALLOCATE_REQUEST = (TURN_METHOD_ALLOCATE | STUN_REQUEST); - public static final char ALLOCATE_RESPONSE = (TURN_METHOD_ALLOCATE | STUN_SUCCESS_RESP); - public static final char ALLOCATE_ERROR_RESPONSE = (TURN_METHOD_ALLOCATE | STUN_ERROR_RESP); - public static final char REFRESH_REQUEST = (TURN_METHOD_REFRESH | STUN_REQUEST); - public static final char REFRESH_RESPONSE = (TURN_METHOD_REFRESH | STUN_SUCCESS_RESP); - public static final char REFRESH_ERROR_RESPONSE = (TURN_METHOD_REFRESH | STUN_ERROR_RESP); - public static final char CHANNELBIND_REQUEST = (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); + public static final char ALLOCATE_REQUEST = + (TURN_METHOD_ALLOCATE | STUN_REQUEST); + public static final char ALLOCATE_RESPONSE = + (TURN_METHOD_ALLOCATE | STUN_SUCCESS_RESP); + public static final char ALLOCATE_ERROR_RESPONSE = + (TURN_METHOD_ALLOCATE | STUN_ERROR_RESP); + public static final char REFRESH_REQUEST = + (TURN_METHOD_REFRESH | STUN_REQUEST); + public static final char REFRESH_RESPONSE = + (TURN_METHOD_REFRESH | STUN_SUCCESS_RESP); + public static final char REFRESH_ERROR_RESPONSE = + (TURN_METHOD_REFRESH | STUN_ERROR_RESP); + public static final char CHANNELBIND_REQUEST = + (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 /** @@ -111,7 +127,6 @@ public abstract class Message protected LinkedHashMap attributes = new LinkedHashMap(); - /** * 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 @@ -157,58 +172,60 @@ public abstract class Message public static final byte M = 3; //Message indices - protected static final byte BINDING_REQUEST_PRESENTITY_INDEX = 0; - protected static final byte BINDING_RESPONSE_PRESENTITY_INDEX = 1; - 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_RESPONSE_PRESENTITY_INDEX = 4; - protected static final byte SHARED_SECRET_ERROR_RESPONSE_PRESENTITY_INDEX = 5; - protected static final byte ALLOCATE_REQUEST_PRESENTITY_INDEX = 6; - protected static final byte ALLOCATE_RESPONSE_PRESENTITY_INDEX = 7; - protected static final byte REFRESH_REQUEST_PRESENTITY_INDEX = 8; - protected static final byte REFRESH_RESPONSE_PRESENTITY_INDEX = 9; - protected static final byte CHANNELBIND_REQUEST_PRESENTITY_INDEX = 10; - protected static final byte CHANNELBIND_RESPONSE_PRESENTITY_INDEX = 11; - protected static final byte SEND_INDICATION_PRESENTITY_INDEX = 12; - protected static final byte DATA_INDICATION_PRESENTITY_INDEX = 13; + protected static final byte BINDING_REQUEST_PRESENTITY_INDEX = 0; + protected static final byte BINDING_RESPONSE_PRESENTITY_INDEX = 1; + 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_RESPONSE_PRESENTITY_INDEX = 4; + protected static final byte SHARED_SECRET_ERROR_RESPONSE_PRESENTITY_INDEX = + 5; + protected static final byte ALLOCATE_REQUEST_PRESENTITY_INDEX = 6; + protected static final byte ALLOCATE_RESPONSE_PRESENTITY_INDEX = 7; + protected static final byte REFRESH_REQUEST_PRESENTITY_INDEX = 8; + protected static final byte REFRESH_RESPONSE_PRESENTITY_INDEX = 9; + protected static final byte CHANNELBIND_REQUEST_PRESENTITY_INDEX = 10; + protected static final byte CHANNELBIND_RESPONSE_PRESENTITY_INDEX = 11; + protected static final byte SEND_INDICATION_PRESENTITY_INDEX = 12; + protected static final byte DATA_INDICATION_PRESENTITY_INDEX = 13; //Attribute indices - protected static final byte MAPPED_ADDRESS_PRESENTITY_INDEX = 0; - protected static final byte RESPONSE_ADDRESS_PRESENTITY_INDEX = 1; - protected static final byte CHANGE_REQUEST_PRESENTITY_INDEX = 2; - protected static final byte SOURCE_ADDRESS_PRESENTITY_INDEX = 3; - protected static final byte CHANGED_ADDRESS_PRESENTITY_INDEX = 4; - protected static final byte USERNAME_PRESENTITY_INDEX = 5; - protected static final byte PASSWORD_PRESENTITY_INDEX = 6; - protected static final byte MESSAGE_INTEGRITY_PRESENTITY_INDEX = 7; - protected static final byte ERROR_CODE_PRESENTITY_INDEX = 8; - protected static final byte UNKNOWN_ATTRIBUTES_PRESENTITY_INDEX = 9; - protected static final byte REFLECTED_FROM_PRESENTITY_INDEX = 10; - protected static final byte XOR_MAPPED_ADDRESS_PRESENTITY_INDEX = 11; - protected static final byte XOR_ONLY_PRESENTITY_INDEX = 12; - protected static final byte SOFTWARE_PRESENTITY_INDEX = 13; - protected static final byte UNKNOWN_OPTIONAL_ATTRIBUTES_PRESENTITY_INDEX = 14; - protected static final byte ALTERNATE_SERVER_PRESENTITY_INDEX = 15; - protected static final byte REALM_PRESENTITY_INDEX = 16; - protected static final byte NONCE_PRESENTITY_INDEX = 17; - protected static final byte FINGERPRINT_PRESENTITY_INDEX = 18; + protected static final byte MAPPED_ADDRESS_PRESENTITY_INDEX = 0; + protected static final byte RESPONSE_ADDRESS_PRESENTITY_INDEX = 1; + protected static final byte CHANGE_REQUEST_PRESENTITY_INDEX = 2; + protected static final byte SOURCE_ADDRESS_PRESENTITY_INDEX = 3; + protected static final byte CHANGED_ADDRESS_PRESENTITY_INDEX = 4; + protected static final byte USERNAME_PRESENTITY_INDEX = 5; + protected static final byte PASSWORD_PRESENTITY_INDEX = 6; + protected static final byte MESSAGE_INTEGRITY_PRESENTITY_INDEX = 7; + protected static final byte ERROR_CODE_PRESENTITY_INDEX = 8; + protected static final byte UNKNOWN_ATTRIBUTES_PRESENTITY_INDEX = 9; + protected static final byte REFLECTED_FROM_PRESENTITY_INDEX = 10; + protected static final byte XOR_MAPPED_ADDRESS_PRESENTITY_INDEX = 11; + protected static final byte XOR_ONLY_PRESENTITY_INDEX = 12; + protected static final byte SOFTWARE_PRESENTITY_INDEX = 13; + protected static final byte UNKNOWN_OPTIONAL_ATTRIBUTES_PRESENTITY_INDEX = + 14; + protected static final byte ALTERNATE_SERVER_PRESENTITY_INDEX = 15; + protected static final byte REALM_PRESENTITY_INDEX = 16; + protected static final byte NONCE_PRESENTITY_INDEX = 17; + protected static final byte FINGERPRINT_PRESENTITY_INDEX = 18; /* TURN attributes */ - protected static final byte CHANNEL_NUMBER_PRESENTITY_INDEX = 19; - protected static final byte LIFETIME_PRESENTITY_INDEX = 20; - protected static final byte XOR_PEER_ADDRESS_PRESENTITY_INDEX = 21; - protected static final byte DATA_PRESENTITY_INDEX = 22; - protected static final byte XOR_RELAYED_ADDRESS_PRESENTITY_INDEX = 23; - protected static final byte EVEN_PORT_PRESENTITY_INDEX = 24; - protected static final byte REQUESTED_TRANSPORT_PRESENTITY_INDEX = 25; - protected static final byte DONT_FRAGMENT_PRESENTITY_INDEX = 26; - protected static final byte RESERVATION_TOKEN_PRESENTITY_INDEX = 27; + protected static final byte CHANNEL_NUMBER_PRESENTITY_INDEX = 19; + protected static final byte LIFETIME_PRESENTITY_INDEX = 20; + protected static final byte XOR_PEER_ADDRESS_PRESENTITY_INDEX = 21; + protected static final byte DATA_PRESENTITY_INDEX = 22; + protected static final byte XOR_RELAYED_ADDRESS_PRESENTITY_INDEX = 23; + protected static final byte EVEN_PORT_PRESENTITY_INDEX = 24; + protected static final byte REQUESTED_TRANSPORT_PRESENTITY_INDEX = 25; + protected static final byte DONT_FRAGMENT_PRESENTITY_INDEX = 26; + protected static final byte RESERVATION_TOKEN_PRESENTITY_INDEX = 27; /* ICE attributes */ - protected static final byte PRIORITY_PRESENTITY_INDEX = 28; - protected static final byte ICE_CONTROLLING_PRESENTITY_INDEX = 29; - protected static final byte ICE_CONTROLLED_PRESENTITY_INDEX = 30; - protected static final byte USE_CANDIDATE_PRESENTITY_INDEX = 31; + protected static final byte PRIORITY_PRESENTITY_INDEX = 28; + protected static final byte ICE_CONTROLLING_PRESENTITY_INDEX = 29; + protected static final byte ICE_CONTROLLED_PRESENTITY_INDEX = 30; + protected static final byte USE_CANDIDATE_PRESENTITY_INDEX = 31; protected final static byte attributePresentities[][] = new byte[][]{ // 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; //take attribute padding into account: - attLen += (4 - attLen%4)%4; + attLen += (4 - (attLen % 4)) % 4; length += attLen; } @@ -320,8 +337,8 @@ public abstract class Message * attribute exists. * * @param attributeType the type of the attribute - * @return the attribute with the specified type or null if no such attribute - * exists + * @return the attribute with the specified type or null if no such + * attribute exists */ public Attribute getAttribute(char attributeType) { @@ -390,7 +407,8 @@ public abstract class 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) throws StunException @@ -434,24 +452,35 @@ public abstract class Message switch (messageType) { - case BINDING_REQUEST: msgIndex = BINDING_REQUEST_PRESENTITY_INDEX; break; - case BINDING_SUCCESS_RESPONSE: msgIndex = BINDING_RESPONSE_PRESENTITY_INDEX; break; - case BINDING_ERROR_RESPONSE: msgIndex = BINDING_ERROR_RESPONSE_PRESENTITY_INDEX; break; - case SHARED_SECRET_REQUEST: msgIndex = SHARED_SECRET_REQUEST_PRESENTITY_INDEX; break; - case SHARED_SECRET_RESPONSE: msgIndex = SHARED_SECRET_RESPONSE_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; + case BINDING_REQUEST: + msgIndex = BINDING_REQUEST_PRESENTITY_INDEX; break; + case BINDING_SUCCESS_RESPONSE: + msgIndex = BINDING_RESPONSE_PRESENTITY_INDEX; break; + case BINDING_ERROR_RESPONSE: + msgIndex = BINDING_ERROR_RESPONSE_PRESENTITY_INDEX; break; + case SHARED_SECRET_REQUEST: + msgIndex = SHARED_SECRET_REQUEST_PRESENTITY_INDEX; break; + case SHARED_SECRET_RESPONSE: + msgIndex = SHARED_SECRET_RESPONSE_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: if (logger.isLoggable(Level.FINE)) { logger.log( Level.FINE, - "Attribute presentity not defined for STUN message type: " - + ((int) messageType) + "Attribute presentity not defined for STUN " + + "message type: " + ((int) messageType) + ". Will assume optional."); } return O; @@ -459,34 +488,63 @@ public abstract class Message switch (attributeType) { - case Attribute.MAPPED_ADDRESS: attributeIndex = MAPPED_ADDRESS_PRESENTITY_INDEX; break; - case Attribute.RESPONSE_ADDRESS: attributeIndex = RESPONSE_ADDRESS_PRESENTITY_INDEX; break; - case Attribute.CHANGE_REQUEST: attributeIndex = CHANGE_REQUEST_PRESENTITY_INDEX; break; - case Attribute.SOURCE_ADDRESS: attributeIndex = SOURCE_ADDRESS_PRESENTITY_INDEX; break; - case Attribute.CHANGED_ADDRESS: attributeIndex = CHANGED_ADDRESS_PRESENTITY_INDEX; break; - case Attribute.USERNAME: attributeIndex = USERNAME_PRESENTITY_INDEX; break; - case Attribute.PASSWORD: attributeIndex = PASSWORD_PRESENTITY_INDEX; break; - case Attribute.MESSAGE_INTEGRITY: attributeIndex = MESSAGE_INTEGRITY_PRESENTITY_INDEX; break; - case Attribute.ERROR_CODE: attributeIndex = ERROR_CODE_PRESENTITY_INDEX; break; - case Attribute.UNKNOWN_ATTRIBUTES: attributeIndex = UNKNOWN_ATTRIBUTES_PRESENTITY_INDEX; break; - case Attribute.REFLECTED_FROM: attributeIndex = REFLECTED_FROM_PRESENTITY_INDEX; break; - case Attribute.XOR_MAPPED_ADDRESS: attributeIndex = XOR_MAPPED_ADDRESS_PRESENTITY_INDEX; break; - case Attribute.XOR_ONLY: attributeIndex = XOR_ONLY_PRESENTITY_INDEX; break; - case Attribute.SOFTWARE: 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; + case Attribute.MAPPED_ADDRESS: + attributeIndex = MAPPED_ADDRESS_PRESENTITY_INDEX; break; + case Attribute.RESPONSE_ADDRESS: + attributeIndex = RESPONSE_ADDRESS_PRESENTITY_INDEX; break; + case Attribute.CHANGE_REQUEST: + attributeIndex = CHANGE_REQUEST_PRESENTITY_INDEX; break; + case Attribute.SOURCE_ADDRESS: + attributeIndex = SOURCE_ADDRESS_PRESENTITY_INDEX; break; + case Attribute.CHANGED_ADDRESS: + attributeIndex = CHANGED_ADDRESS_PRESENTITY_INDEX; break; + case Attribute.USERNAME: + attributeIndex = USERNAME_PRESENTITY_INDEX; break; + case Attribute.PASSWORD: + attributeIndex = PASSWORD_PRESENTITY_INDEX; break; + case Attribute.MESSAGE_INTEGRITY: + attributeIndex = MESSAGE_INTEGRITY_PRESENTITY_INDEX; break; + case Attribute.ERROR_CODE: + attributeIndex = ERROR_CODE_PRESENTITY_INDEX; break; + case Attribute.UNKNOWN_ATTRIBUTES: + attributeIndex = UNKNOWN_ATTRIBUTES_PRESENTITY_INDEX; break; + case Attribute.REFLECTED_FROM: + attributeIndex = REFLECTED_FROM_PRESENTITY_INDEX; break; + case Attribute.XOR_MAPPED_ADDRESS: + attributeIndex = XOR_MAPPED_ADDRESS_PRESENTITY_INDEX; break; + case Attribute.XOR_ONLY: + attributeIndex = XOR_ONLY_PRESENTITY_INDEX; break; + case Attribute.SOFTWARE: + 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 ]; @@ -520,7 +578,8 @@ public abstract class Message case SEND_INDICATION: return "SEND-INDICATION"; case SHARED_SECRET_REQUEST: return "SHARED-SECRET-REQUEST"; 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"; } } @@ -874,7 +933,7 @@ public abstract class Message if(! rfc3489CompatibilityMode ) 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) throw new IllegalStateException( "A mandatory attribute (type=" +(int)i + ") is missing!"); diff --git a/src/org/ice4j/message/MessageFactory.java b/src/org/ice4j/message/MessageFactory.java index 7bf87c9..46b60a9 100644 --- a/src/org/ice4j/message/MessageFactory.java +++ b/src/org/ice4j/message/MessageFactory.java @@ -397,7 +397,7 @@ public class MessageFactory * @param realm the value for the REALM Attribute to be added to * request * @param nonce the value for the NONCE Attribute to be added to - * request + * request * * @throws StunException if anything goes wrong while adding the * Attributes to request which support the STUN long-term @@ -603,18 +603,36 @@ public class MessageFactory } // ======================== 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( "Shared Secret Support is not currently implemented"); } + /** + * Create a shared secret response. + * WARNING: This is not currently supported. + * + * @return response + */ public static Response createSharedSecretResponse() { throw new UnsupportedOperationException( "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() { throw new UnsupportedOperationException( diff --git a/src/org/ice4j/security/LongTermCredentialSession.java b/src/org/ice4j/security/LongTermCredentialSession.java index ee38184..0f14260 100644 --- a/src/org/ice4j/security/LongTermCredentialSession.java +++ b/src/org/ice4j/security/LongTermCredentialSession.java @@ -200,7 +200,7 @@ public class LongTermCredentialSession * username or user frag, an empty array if there was no password for * that username or null if the username is not a remote user * name recognized by this CredentialsAuthority - * @see CredentialsAuthority#getRemoteKey(String) + * @see CredentialsAuthority#getRemoteKey(String, String) */ public byte[] getRemoteKey(String username, String media) {