You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/02/20 04:58:21 UTC
svn commit: r379013 [30/45] - in /directory/trunks/apacheds: ./ core-plugin/
core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/
core-plugin/src/test/java/org/apache/directory/server/core/tools/schema/
core-shared/ core-shared/src/...
Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicket.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicket.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicket.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicket.java Sun Feb 19 19:57:02 2006
@@ -16,18 +16,20 @@
*/
package org.apache.directory.server.changepw.service;
+
import javax.security.auth.kerberos.KerberosPrincipal;
import org.apache.directory.server.changepw.ChangePasswordConfiguration;
+import org.apache.directory.server.kerberos.shared.messages.components.Ticket;
+import org.apache.directory.server.kerberos.shared.service.VerifyTicket;
import org.apache.directory.server.protocol.shared.chain.Context;
-import org.apache.kerberos.messages.components.Ticket;
-import org.apache.kerberos.service.VerifyTicket;
+
public class VerifyServiceTicket extends VerifyTicket
{
public boolean execute( Context context ) throws Exception
{
- ChangePasswordContext changepwContext = (ChangePasswordContext) context;
+ ChangePasswordContext changepwContext = ( ChangePasswordContext ) context;
ChangePasswordConfiguration config = changepwContext.getConfig();
Ticket ticket = changepwContext.getTicket();
String primaryRealm = config.getPrimaryRealm();
Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicket.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicketAuthHeader.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicketAuthHeader.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicketAuthHeader.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicketAuthHeader.java Sun Feb 19 19:57:02 2006
@@ -16,22 +16,24 @@
*/
package org.apache.directory.server.changepw.service;
+
import java.net.InetAddress;
+import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest;
+import org.apache.directory.server.kerberos.shared.messages.components.Authenticator;
+import org.apache.directory.server.kerberos.shared.messages.components.Ticket;
+import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
+import org.apache.directory.server.kerberos.shared.replay.ReplayCache;
+import org.apache.directory.server.kerberos.shared.service.LockBox;
+import org.apache.directory.server.kerberos.shared.service.VerifyAuthHeader;
import org.apache.directory.server.protocol.shared.chain.Context;
-import org.apache.kerberos.messages.ApplicationRequest;
-import org.apache.kerberos.messages.components.Authenticator;
-import org.apache.kerberos.messages.components.Ticket;
-import org.apache.kerberos.messages.value.EncryptionKey;
-import org.apache.kerberos.replay.ReplayCache;
-import org.apache.kerberos.service.LockBox;
-import org.apache.kerberos.service.VerifyAuthHeader;
+
public class VerifyServiceTicketAuthHeader extends VerifyAuthHeader
{
public boolean execute( Context context ) throws Exception
{
- ChangePasswordContext changepwContext = (ChangePasswordContext) context;
+ ChangePasswordContext changepwContext = ( ChangePasswordContext ) context;
ApplicationRequest authHeader = changepwContext.getAuthHeader();
Ticket ticket = changepwContext.getTicket();
@@ -43,7 +45,7 @@
LockBox lockBox = changepwContext.getLockBox();
Authenticator authenticator = verifyAuthHeader( authHeader, ticket, serverKey, clockSkew, replayCache,
- emptyAddressesAllowed, clientAddress, lockBox );
+ emptyAddressesAllowed, clientAddress, lockBox );
changepwContext.setAuthenticator( authenticator );
Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicketAuthHeader.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/value/ChangePasswordData.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/value/ChangePasswordData.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/value/ChangePasswordData.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/value/ChangePasswordData.java Sun Feb 19 19:57:02 2006
@@ -16,7 +16,9 @@
*/
package org.apache.directory.server.changepw.value;
-import org.apache.kerberos.messages.value.PrincipalName;
+
+import org.apache.directory.server.kerberos.shared.messages.value.PrincipalName;
+
public class ChangePasswordData
{
@@ -24,22 +26,26 @@
private PrincipalName principalName;
private String realm;
- public ChangePasswordData( byte[] password, PrincipalName principalName, String realm )
+
+ public ChangePasswordData(byte[] password, PrincipalName principalName, String realm)
{
this.password = password;
this.principalName = principalName;
this.realm = realm;
}
+
public byte[] getPassword()
{
return password;
}
+
public PrincipalName getPrincipalName()
{
return principalName;
}
+
public String getRealm()
{
Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/value/ChangePasswordData.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/value/ChangePasswordData.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/value/ChangePasswordDataModifier.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/value/ChangePasswordDataModifier.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/value/ChangePasswordDataModifier.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/value/ChangePasswordDataModifier.java Sun Feb 19 19:57:02 2006
@@ -16,7 +16,9 @@
*/
package org.apache.directory.server.changepw.value;
-import org.apache.kerberos.messages.value.PrincipalName;
+
+import org.apache.directory.server.kerberos.shared.messages.value.PrincipalName;
+
public class ChangePasswordDataModifier
{
@@ -24,20 +26,24 @@
private PrincipalName principalName;
private String realm;
+
public ChangePasswordData getChangePasswdData()
{
return new ChangePasswordData( password, principalName, realm );
}
+
public void setNewPassword( byte[] password )
{
this.password = password;
}
+
public void setTargetName( PrincipalName principalName )
{
this.principalName = principalName;
}
+
public void setTargetRealm( String realm )
{
Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/value/ChangePasswordDataModifier.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/value/ChangePasswordDataModifier.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-changepw/src/test/java/org/apache/directory/server/changepw/service/CheckPasswordPolicyTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/test/java/org/apache/directory/server/changepw/service/CheckPasswordPolicyTest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/test/java/org/apache/directory/server/changepw/service/CheckPasswordPolicyTest.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/test/java/org/apache/directory/server/changepw/service/CheckPasswordPolicyTest.java Sun Feb 19 19:57:02 2006
@@ -16,12 +16,14 @@
*/
package org.apache.directory.server.changepw.service;
+
import javax.security.auth.kerberos.KerberosPrincipal;
import org.apache.directory.server.changepw.service.CheckPasswordPolicy;
import junit.framework.TestCase;
+
/**
* Tests {@link CheckPasswordPolicy}.
*
@@ -36,6 +38,7 @@
private CheckPasswordPolicy policy = new CheckPasswordPolicy();
+
public void testGoodPassword()
{
String username = "Enrique Rodriguez";
@@ -46,6 +49,7 @@
assertTrue( policy.isValid( username, password, passwordLength, categoryCount, tokenSize ) );
}
+
public void testBadPassword()
{
String username = "Erin Randall";
@@ -55,6 +59,7 @@
assertFalse( policy.isValidUsernameSubstring( username, password, tokenSize ) );
assertFalse( policy.isValid( username, password, passwordLength, categoryCount, tokenSize ) );
}
+
public void testPrincipalAsUsername()
{
Propchange: directory/trunks/apacheds/protocol-changepw/src/test/java/org/apache/directory/server/changepw/service/CheckPasswordPolicyTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/pom.xml?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/pom.xml (original)
+++ directory/trunks/apacheds/protocol-dhcp/pom.xml Sun Feb 19 19:57:02 2006
@@ -4,17 +4,25 @@
<parent>
<groupId>org.apache.directory.server</groupId>
<artifactId>build</artifactId>
- <version>1.0-RC1-SNAPSHOT</version>
+ <version>1.0-RC1</version>
</parent>
- <version>0.1-SNAPSHOT</version>
<artifactId>apacheds-protocol-dhcp</artifactId>
<name>ApacheDS Protocol Dhcp</name>
+ <description>
+ The DHCP protocol provider for ApacheDS
+ </description>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>nlog4j</artifactId>
+ <version>1.2.19</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -25,7 +33,7 @@
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-shared</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
</project>
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/DhcpException.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/DhcpException.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/DhcpException.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/DhcpException.java Sun Feb 19 19:57:02 2006
@@ -22,6 +22,7 @@
{
private static final long serialVersionUID = 3985748516732135317L;
+
/**
* This empty constructor is used if no
* explanation of the DHCP exception is required.
@@ -31,15 +32,15 @@
super();
}
+
/**
* This constructor is used if a description of the event
* that caused the exception is required.
*
* @param description this is a description of the exception
*/
- public DhcpException( String description )
+ public DhcpException(String description)
{
super( description );
}
}
-
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/DhcpException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/DhcpException.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/DhcpService.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/DhcpService.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/DhcpService.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/DhcpService.java Sun Feb 19 19:57:02 2006
@@ -17,13 +17,14 @@
package org.apache.directory.server.dhcp;
+
import org.apache.directory.server.dhcp.messages.DhcpMessage;
+
/**
* DHCP Protocol (RFC 2131, RFC 2132)
*/
public interface DhcpService
{
- public DhcpMessage getReplyFor( DhcpMessage request );
+ public DhcpMessage getReplyFor( DhcpMessage request );
}
-
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/DhcpService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/DhcpService.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageDecoder.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageDecoder.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageDecoder.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageDecoder.java Sun Feb 19 19:57:02 2006
@@ -17,6 +17,7 @@
package org.apache.directory.server.dhcp.io;
+
import java.nio.ByteBuffer;
import org.apache.directory.server.dhcp.DhcpException;
@@ -27,66 +28,65 @@
public class DhcpMessageDecoder
{
- /**
- * Convert a byte buffer into a DhcpMessage.
- *
- * @return a DhcpMessage.
- * @param buffer ByteBuffer to convert to a DhcpMessage object
- */
- public DhcpMessage decode( ByteBuffer buffer ) throws DhcpException
- {
- /**
- * TODO - need to figure out why the buffer needs to be rewound.
- */
- buffer.rewind();
-
- DhcpMessageModifier modifier = new DhcpMessageModifier();
-
- modifier.setMessageType( MessageType.DHCPDISCOVER );
-
- modifier.setOpCode( buffer.get() );
- modifier.setHardwareAddressType( buffer.get() );
-
- short hardwareAddressLength = (short)( buffer.get() & 0xff );
-
- modifier.setHardwareAddressLength( (byte)hardwareAddressLength );
- modifier.setHardwareOptions( buffer.get() );
-
- modifier.setTransactionId( buffer.getInt() );
- modifier.setSeconds( buffer.getShort() );
- modifier.setFlags( buffer.getShort() );
-
- byte[] nextFourBytes = new byte[ 4 ];
-
- buffer.get( nextFourBytes );
- modifier.setActualClientAddress( nextFourBytes );
-
- buffer.get( nextFourBytes );
- modifier.setAssignedClientAddress( nextFourBytes );
-
- buffer.get( nextFourBytes );
- modifier.setNextServerAddress( nextFourBytes );
-
- buffer.get( nextFourBytes );
- modifier.setRelayAgentAddress( nextFourBytes );
-
- byte[] clientHardwareAddress = new byte[ 16 ];
-
- buffer.get( clientHardwareAddress );
- modifier.setClientHardwareAddress( clientHardwareAddress );
-
- byte[] serverHostname = new byte[ 64 ];
- buffer.get( serverHostname );
- modifier.setServerHostname( serverHostname );
-
- byte[] bootFileName = new byte[ 128 ];
- buffer.get( bootFileName );
- modifier.setBootFileName( bootFileName );
-
- DhcpOptionsDecoder decoder = new DhcpOptionsDecoder();
- modifier.setOptions( decoder.decode( buffer ) );
-
- return modifier.getDhcpMessage();
- }
-}
+ /**
+ * Convert a byte buffer into a DhcpMessage.
+ *
+ * @return a DhcpMessage.
+ * @param buffer ByteBuffer to convert to a DhcpMessage object
+ */
+ public DhcpMessage decode( ByteBuffer buffer ) throws DhcpException
+ {
+ /**
+ * TODO - need to figure out why the buffer needs to be rewound.
+ */
+ buffer.rewind();
+
+ DhcpMessageModifier modifier = new DhcpMessageModifier();
+
+ modifier.setMessageType( MessageType.DHCPDISCOVER );
+
+ modifier.setOpCode( buffer.get() );
+ modifier.setHardwareAddressType( buffer.get() );
+
+ short hardwareAddressLength = ( short ) ( buffer.get() & 0xff );
+
+ modifier.setHardwareAddressLength( ( byte ) hardwareAddressLength );
+ modifier.setHardwareOptions( buffer.get() );
+
+ modifier.setTransactionId( buffer.getInt() );
+ modifier.setSeconds( buffer.getShort() );
+ modifier.setFlags( buffer.getShort() );
+
+ byte[] nextFourBytes = new byte[4];
+
+ buffer.get( nextFourBytes );
+ modifier.setActualClientAddress( nextFourBytes );
+ buffer.get( nextFourBytes );
+ modifier.setAssignedClientAddress( nextFourBytes );
+
+ buffer.get( nextFourBytes );
+ modifier.setNextServerAddress( nextFourBytes );
+
+ buffer.get( nextFourBytes );
+ modifier.setRelayAgentAddress( nextFourBytes );
+
+ byte[] clientHardwareAddress = new byte[16];
+
+ buffer.get( clientHardwareAddress );
+ modifier.setClientHardwareAddress( clientHardwareAddress );
+
+ byte[] serverHostname = new byte[64];
+ buffer.get( serverHostname );
+ modifier.setServerHostname( serverHostname );
+
+ byte[] bootFileName = new byte[128];
+ buffer.get( bootFileName );
+ modifier.setBootFileName( bootFileName );
+
+ DhcpOptionsDecoder decoder = new DhcpOptionsDecoder();
+ modifier.setOptions( decoder.decode( buffer ) );
+
+ return modifier.getDhcpMessage();
+ }
+}
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageDecoder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageDecoder.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageEncoder.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageEncoder.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageEncoder.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageEncoder.java Sun Feb 19 19:57:02 2006
@@ -17,6 +17,7 @@
package org.apache.directory.server.dhcp.io;
+
import java.nio.ByteBuffer;
import org.apache.directory.server.dhcp.messages.DhcpMessage;
@@ -25,34 +26,33 @@
public class DhcpMessageEncoder
{
- /**
- * Converts a DhcpMessage object into a byte buffer.
- *
- * @param byteBuffer ByteBuffer to put DhcpMessage into
- * @param message DhcpMessage to encode into ByteBuffer
- */
- public void encode( ByteBuffer byteBuffer, DhcpMessage message )
- {
- byteBuffer.put( message.getOpCode() );
- byteBuffer.put( message.getHardwareAddressType() );
- byteBuffer.put( message.getHardwareAddressLength() );
- byteBuffer.put( message.getHardwareOptions() );
- byteBuffer.putInt( message.getTransactionId() );
- byteBuffer.putShort( message.getSeconds() );
- byteBuffer.putShort( message.getFlags() );
- byteBuffer.put( message.getActualClientAddress() );
- byteBuffer.put( message.getAssignedClientAddress() );
- byteBuffer.put( message.getNextServerAddress() );
- byteBuffer.put( message.getRelayAgentAddress() );
- byteBuffer.put( message.getClientHardwareAddress() );
- byteBuffer.put( message.getServerHostname() );
- byteBuffer.put( message.getBootFileName() );
-
- OptionsField options = message.getOptions();
-
- DhcpOptionsEncoder optionsEncoder = new DhcpOptionsEncoder();
-
- optionsEncoder.encode( options, byteBuffer );
- }
-}
+ /**
+ * Converts a DhcpMessage object into a byte buffer.
+ *
+ * @param byteBuffer ByteBuffer to put DhcpMessage into
+ * @param message DhcpMessage to encode into ByteBuffer
+ */
+ public void encode( ByteBuffer byteBuffer, DhcpMessage message )
+ {
+ byteBuffer.put( message.getOpCode() );
+ byteBuffer.put( message.getHardwareAddressType() );
+ byteBuffer.put( message.getHardwareAddressLength() );
+ byteBuffer.put( message.getHardwareOptions() );
+ byteBuffer.putInt( message.getTransactionId() );
+ byteBuffer.putShort( message.getSeconds() );
+ byteBuffer.putShort( message.getFlags() );
+ byteBuffer.put( message.getActualClientAddress() );
+ byteBuffer.put( message.getAssignedClientAddress() );
+ byteBuffer.put( message.getNextServerAddress() );
+ byteBuffer.put( message.getRelayAgentAddress() );
+ byteBuffer.put( message.getClientHardwareAddress() );
+ byteBuffer.put( message.getServerHostname() );
+ byteBuffer.put( message.getBootFileName() );
+
+ OptionsField options = message.getOptions();
+ DhcpOptionsEncoder optionsEncoder = new DhcpOptionsEncoder();
+
+ optionsEncoder.encode( options, byteBuffer );
+ }
+}
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageEncoder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageEncoder.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpOptionsDecoder.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpOptionsDecoder.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpOptionsDecoder.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpOptionsDecoder.java Sun Feb 19 19:57:02 2006
@@ -17,6 +17,7 @@
package org.apache.directory.server.dhcp.io;
+
import java.nio.ByteBuffer;
import java.util.Arrays;
@@ -38,68 +39,68 @@
public class DhcpOptionsDecoder
{
- private static final byte[] VENDOR_MAGIC_COOKIE =
- { (byte) 99, (byte) 130, (byte) 83, (byte) 99 };
-
- public OptionsField decode( ByteBuffer message ) throws DhcpException
- {
- byte[] magicCookie = new byte[ 4 ];
- message.get( magicCookie );
-
- if ( !Arrays.equals( VENDOR_MAGIC_COOKIE, magicCookie ) )
- {
- throw new DhcpException("Parse exception.");
- }
-
- byte code;
- byte length;
- byte value[];
-
- OptionsField options = new OptionsField();
-
- while ( message.get( message.position() ) != (byte) 255 )
- {
- code = message.get();
- length = message.get();
- value = new byte[ length ];
- message.get( value );
-
- options.add( getInstance( code, value ) );
- }
-
- return options;
- }
-
- private DhcpOption getInstance( int tag, byte[] value)
- throws DhcpException
- {
- switch (tag)
- {
- case 0:
- return new PadOption();
- case 1:
- return new EndOption();
- case 2:
- return new SubnetMask( value );
- case 3:
- return new TimeOffset( value );
- case 6:
- return new DomainNameServers( value );
- case 15:
- return new DomainName( value );
- case 50:
- return new RequestedIpAddress( value );
- case 51:
- return new IpAddressLeaseTime( value );
- case 53:
- return new DhcpMessageType( value );
- case 54:
- return new ServerIdentifier( value );
- case 55:
- return new ParameterRequestList( value );
- default:
- throw new DhcpException( "Unsupported or bad option code: " + tag );
- }
- }
-}
+ private static final byte[] VENDOR_MAGIC_COOKIE =
+ { ( byte ) 99, ( byte ) 130, ( byte ) 83, ( byte ) 99 };
+
+
+ public OptionsField decode( ByteBuffer message ) throws DhcpException
+ {
+ byte[] magicCookie = new byte[4];
+ message.get( magicCookie );
+
+ if ( !Arrays.equals( VENDOR_MAGIC_COOKIE, magicCookie ) )
+ {
+ throw new DhcpException( "Parse exception." );
+ }
+
+ byte code;
+ byte length;
+ byte value[];
+ OptionsField options = new OptionsField();
+
+ while ( message.get( message.position() ) != ( byte ) 255 )
+ {
+ code = message.get();
+ length = message.get();
+ value = new byte[length];
+ message.get( value );
+
+ options.add( getInstance( code, value ) );
+ }
+
+ return options;
+ }
+
+
+ private DhcpOption getInstance( int tag, byte[] value ) throws DhcpException
+ {
+ switch ( tag )
+ {
+ case 0:
+ return new PadOption();
+ case 1:
+ return new EndOption();
+ case 2:
+ return new SubnetMask( value );
+ case 3:
+ return new TimeOffset( value );
+ case 6:
+ return new DomainNameServers( value );
+ case 15:
+ return new DomainName( value );
+ case 50:
+ return new RequestedIpAddress( value );
+ case 51:
+ return new IpAddressLeaseTime( value );
+ case 53:
+ return new DhcpMessageType( value );
+ case 54:
+ return new ServerIdentifier( value );
+ case 55:
+ return new ParameterRequestList( value );
+ default:
+ throw new DhcpException( "Unsupported or bad option code: " + tag );
+ }
+ }
+}
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpOptionsDecoder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpOptionsDecoder.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpOptionsEncoder.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpOptionsEncoder.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpOptionsEncoder.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpOptionsEncoder.java Sun Feb 19 19:57:02 2006
@@ -17,6 +17,7 @@
package org.apache.directory.server.dhcp.io;
+
import java.nio.ByteBuffer;
import org.apache.directory.server.dhcp.options.DhcpOption;
@@ -26,22 +27,22 @@
public class DhcpOptionsEncoder
{
- private static final byte[] VENDOR_MAGIC_COOKIE =
- { (byte) 99, (byte) 130, (byte) 83, (byte) 99 };
-
+ private static final byte[] VENDOR_MAGIC_COOKIE =
+ { ( byte ) 99, ( byte ) 130, ( byte ) 83, ( byte ) 99 };
+
+
public void encode( OptionsField options, ByteBuffer message )
{
- message.put( VENDOR_MAGIC_COOKIE );
+ message.put( VENDOR_MAGIC_COOKIE );
- DhcpOption[] optionsArray = options.toArray();
-
- for ( int ii=0; ii < optionsArray.length; ii++ )
- {
- optionsArray[ ii ].writeTo( message );
- }
-
- DhcpOption endOption = new EndOption();
- endOption.writeTo( message );
- }
-}
+ DhcpOption[] optionsArray = options.toArray();
+
+ for ( int ii = 0; ii < optionsArray.length; ii++ )
+ {
+ optionsArray[ii].writeTo( message );
+ }
+ DhcpOption endOption = new EndOption();
+ endOption.writeTo( message );
+ }
+}
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpOptionsEncoder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpOptionsEncoder.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/DhcpMessage.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/DhcpMessage.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/DhcpMessage.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/DhcpMessage.java Sun Feb 19 19:57:02 2006
@@ -17,191 +17,206 @@
package org.apache.directory.server.dhcp.messages;
+
import org.apache.directory.server.dhcp.options.OptionsField;
public class DhcpMessage
{
- private MessageType messageType;
-
- private byte opCode;
- private byte hardwareAddressType;
- private byte hardwareAddressLength;
- private byte hardwareOptions;
- private int transactionId;
- private short seconds;
- private short flags;
- private byte actualClientAddress[] = new byte[4];
- private byte assignedClientAddress[] = new byte[4];
- private byte nextServerAddress[] = new byte[4];
- private byte relayAgentAddress[] = new byte[4];
- private byte clientHardwareAddress[] = new byte[16];
- private byte serverHostname[] = new byte[64];
- private byte bootFileName[] = new byte[128];
-
- private OptionsField options = new OptionsField();
-
- public DhcpMessage( MessageType messageType, byte opCode, byte hardwareAddressType,
- byte hardwareAddressLength, byte hardwareOptions, int transactionId,
- short seconds, short flags, byte[] actualClientAddress,
- byte[] assignedClientAddress, byte[] nextServerAddress, byte[] relayAgentAddress,
- byte[] clientHardwareAddress, byte[] serverHostname, byte[] bootFileName,
- OptionsField options )
- {
- this.messageType = messageType;
- this.opCode = opCode;
- this.hardwareAddressType = hardwareAddressType;
- this.hardwareAddressLength = hardwareAddressLength;
- this.hardwareOptions = hardwareOptions;
- this.transactionId = transactionId;
- this.seconds = seconds;
- this.flags = flags;
- this.actualClientAddress = actualClientAddress;
- this.assignedClientAddress = assignedClientAddress;
- this.nextServerAddress = nextServerAddress;
- this.relayAgentAddress = relayAgentAddress;
- this.clientHardwareAddress = clientHardwareAddress;
- this.serverHostname = serverHostname;
- this.bootFileName = bootFileName;
- this.options = options;
- }
-
- /**
- * Message type.
- */
- public MessageType getMessageType()
- {
- return messageType;
- }
-
- /**
- * Message op code / message type.
- * 1 = BOOTREQUEST, 2 = BOOTREPLY
- */
- public byte getOpCode()
- {
- return opCode;
- }
-
- /**
- * Hardware address type, see ARP section in
- * "Assigned Numbers" RFC; e.g., '1' = 10mb ethernet.
- */
- public byte getHardwareAddressType()
- {
- return hardwareAddressType;
- }
-
- /**
- * Hardware address length (e.g. '6' for 10mb ethernet).
- */
- public byte getHardwareAddressLength()
- {
- return hardwareAddressLength;
- }
-
- /**
- * Client sets to zero, optionally used by relay agents
- * when booting via a relay agent.
- */
- public byte getHardwareOptions()
- {
- return hardwareOptions;
- }
-
- /**
- * Transaction ID, a random number chosen by the client,
- * used by the client and server to associate messages
- * and responses between a client and a server.
- */
- public int getTransactionId()
- {
- return transactionId;
- }
-
- /**
- * Filled in by client, seconds elapsed since client
- * began address acquisition or renewal process.
- */
- public short getSeconds()
- {
- return seconds;
- }
-
- /**
- * Flags.
- */
- public short getFlags()
- {
- return flags;
- }
-
- /**
- * Client IP address; only filled in if client is in BOUND,
- * RENEW or REBINDING state and can respond to ARP requests.
- */
- public byte[] getActualClientAddress()
- {
- return actualClientAddress;
- }
-
- /**
- * Get 'your' (client) IP address.
- */
- public byte[] getAssignedClientAddress()
- {
- return assignedClientAddress;
- }
-
- /**
- * IP address of next server to use in bootstrap;
- * returned in DHCPOFFER, DHCPACK by server.
- */
- public byte[] getNextServerAddress()
- {
- return nextServerAddress;
- }
-
- /**
- * Relay agent IP address, used in booting via a relay agent.
- */
- public byte[] getRelayAgentAddress()
- {
- return relayAgentAddress;
- }
-
- /**
- * Client hardware address.
- */
- public byte[] getClientHardwareAddress()
- {
- return clientHardwareAddress;
- }
-
- /**
- * Optional server host name, null terminated string.
- */
- public byte[] getServerHostname()
- {
- return serverHostname;
- }
-
- /**
- * Boot file name, null terminated string; "generic" name or null
- * in DHCPDISCOVER, fully qualified directory-path name in DHCPOFFER.
- */
- public byte[] getBootFileName()
- {
- return bootFileName;
- }
-
- /**
- * Optional parameters field. See the options
- * documents for a list of defined options.
- */
- public OptionsField getOptions()
- {
- return options;
- }
-}
+ private MessageType messageType;
+ private byte opCode;
+ private byte hardwareAddressType;
+ private byte hardwareAddressLength;
+ private byte hardwareOptions;
+ private int transactionId;
+ private short seconds;
+ private short flags;
+ private byte actualClientAddress[] = new byte[4];
+ private byte assignedClientAddress[] = new byte[4];
+ private byte nextServerAddress[] = new byte[4];
+ private byte relayAgentAddress[] = new byte[4];
+ private byte clientHardwareAddress[] = new byte[16];
+ private byte serverHostname[] = new byte[64];
+ private byte bootFileName[] = new byte[128];
+
+ private OptionsField options = new OptionsField();
+
+
+ public DhcpMessage(MessageType messageType, byte opCode, byte hardwareAddressType, byte hardwareAddressLength,
+ byte hardwareOptions, int transactionId, short seconds, short flags, byte[] actualClientAddress,
+ byte[] assignedClientAddress, byte[] nextServerAddress, byte[] relayAgentAddress, byte[] clientHardwareAddress,
+ byte[] serverHostname, byte[] bootFileName, OptionsField options)
+ {
+ this.messageType = messageType;
+ this.opCode = opCode;
+ this.hardwareAddressType = hardwareAddressType;
+ this.hardwareAddressLength = hardwareAddressLength;
+ this.hardwareOptions = hardwareOptions;
+ this.transactionId = transactionId;
+ this.seconds = seconds;
+ this.flags = flags;
+ this.actualClientAddress = actualClientAddress;
+ this.assignedClientAddress = assignedClientAddress;
+ this.nextServerAddress = nextServerAddress;
+ this.relayAgentAddress = relayAgentAddress;
+ this.clientHardwareAddress = clientHardwareAddress;
+ this.serverHostname = serverHostname;
+ this.bootFileName = bootFileName;
+ this.options = options;
+ }
+
+
+ /**
+ * Message type.
+ */
+ public MessageType getMessageType()
+ {
+ return messageType;
+ }
+
+
+ /**
+ * Message op code / message type.
+ * 1 = BOOTREQUEST, 2 = BOOTREPLY
+ */
+ public byte getOpCode()
+ {
+ return opCode;
+ }
+
+
+ /**
+ * Hardware address type, see ARP section in
+ * "Assigned Numbers" RFC; e.g., '1' = 10mb ethernet.
+ */
+ public byte getHardwareAddressType()
+ {
+ return hardwareAddressType;
+ }
+
+
+ /**
+ * Hardware address length (e.g. '6' for 10mb ethernet).
+ */
+ public byte getHardwareAddressLength()
+ {
+ return hardwareAddressLength;
+ }
+
+
+ /**
+ * Client sets to zero, optionally used by relay agents
+ * when booting via a relay agent.
+ */
+ public byte getHardwareOptions()
+ {
+ return hardwareOptions;
+ }
+
+
+ /**
+ * Transaction ID, a random number chosen by the client,
+ * used by the client and server to associate messages
+ * and responses between a client and a server.
+ */
+ public int getTransactionId()
+ {
+ return transactionId;
+ }
+
+
+ /**
+ * Filled in by client, seconds elapsed since client
+ * began address acquisition or renewal process.
+ */
+ public short getSeconds()
+ {
+ return seconds;
+ }
+
+
+ /**
+ * Flags.
+ */
+ public short getFlags()
+ {
+ return flags;
+ }
+
+
+ /**
+ * Client IP address; only filled in if client is in BOUND,
+ * RENEW or REBINDING state and can respond to ARP requests.
+ */
+ public byte[] getActualClientAddress()
+ {
+ return actualClientAddress;
+ }
+
+
+ /**
+ * Get 'your' (client) IP address.
+ */
+ public byte[] getAssignedClientAddress()
+ {
+ return assignedClientAddress;
+ }
+
+
+ /**
+ * IP address of next server to use in bootstrap;
+ * returned in DHCPOFFER, DHCPACK by server.
+ */
+ public byte[] getNextServerAddress()
+ {
+ return nextServerAddress;
+ }
+
+
+ /**
+ * Relay agent IP address, used in booting via a relay agent.
+ */
+ public byte[] getRelayAgentAddress()
+ {
+ return relayAgentAddress;
+ }
+
+
+ /**
+ * Client hardware address.
+ */
+ public byte[] getClientHardwareAddress()
+ {
+ return clientHardwareAddress;
+ }
+
+
+ /**
+ * Optional server host name, null terminated string.
+ */
+ public byte[] getServerHostname()
+ {
+ return serverHostname;
+ }
+
+
+ /**
+ * Boot file name, null terminated string; "generic" name or null
+ * in DHCPDISCOVER, fully qualified directory-path name in DHCPOFFER.
+ */
+ public byte[] getBootFileName()
+ {
+ return bootFileName;
+ }
+
+
+ /**
+ * Optional parameters field. See the options
+ * documents for a list of defined options.
+ */
+ public OptionsField getOptions()
+ {
+ return options;
+ }
+}
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/DhcpMessage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/DhcpMessage.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/DhcpMessageModifier.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/DhcpMessageModifier.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/DhcpMessageModifier.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/DhcpMessageModifier.java Sun Feb 19 19:57:02 2006
@@ -16,175 +16,191 @@
*/
package org.apache.directory.server.dhcp.messages;
+
import org.apache.directory.server.dhcp.options.OptionsField;
public class DhcpMessageModifier
{
- private MessageType messageType;
-
- private byte opCode;
- private byte hardwareAddressType;
- private byte hardwareAddressLength;
- private byte hardwareOptions;
- private int transactionId;
- private short seconds;
- private short flags;
- private byte actualClientAddress[] = new byte[4];
- private byte assignedClientAddress[] = new byte[4];
- private byte nextServerAddress[] = new byte[4];
- private byte relayAgentAddress[] = new byte[4];
- private byte clientHardwareAddress[] = new byte[16];
- private byte serverHostname[] = new byte[64];
- private byte bootFileName[] = new byte[128];
-
- private OptionsField options = new OptionsField();
-
- public DhcpMessage getDhcpMessage()
- {
- return new DhcpMessage( messageType, opCode, hardwareAddressType, hardwareAddressLength,
- hardwareOptions, transactionId, seconds, flags, actualClientAddress,
- assignedClientAddress, nextServerAddress, relayAgentAddress,
- clientHardwareAddress, serverHostname, bootFileName, options );
- }
-
- /**
- * Message type.
- */
- public void setMessageType( MessageType messageType )
- {
- this.messageType = messageType;
- }
-
- /**
- * Message op code / message type.
- * 1 = BOOTREQUEST, 2 = BOOTREPLY
- */
- public void setOpCode( byte opCode )
- {
- this.opCode = opCode;
- }
-
- /**
- * Hardware address type, see ARP section in
- * "Assigned Numbers" RFC; e.g., '1' = 10mb ethernet.
- */
- public void setHardwareAddressType( byte hardwareAddressType )
- {
- this.hardwareAddressType = hardwareAddressType;
- }
-
- /**
- * Hardware address length (e.g. '6' for 10mb ethernet).
- */
- public void setHardwareAddressLength( byte hardwareAddressLength )
- {
- this.hardwareAddressLength = hardwareAddressLength;
- }
-
- /**
- * Set hops field.
- *
- * @param hardwareOptions hops field
- */
- public void setHardwareOptions( byte hardwareOptions )
- {
- this.hardwareOptions = hardwareOptions;
- }
-
- /**
- * Transaction ID, a random number chosen by the client,
- * used by the client and server to associate messages
- * and responses between a client and a server.
- */
- public void setTransactionId( int transactionId )
- {
- this.transactionId = transactionId;
- }
-
- /**
- * Filled in by client, seconds elapsed since client
- * began address acquisition or renewal process.
- */
- public void setSeconds( short seconds )
- {
- this.seconds = seconds;
- }
-
- /**
- * Flags.
- */
- public void setFlags( short flags )
- {
- this.flags = flags;
- }
-
- /**
- * Client IP address; only filled in if client is in BOUND,
- * RENEW or REBINDING state and can respond to ARP requests.
- */
- public void setActualClientAddress( byte[] actualClientAddress )
- {
- this.actualClientAddress = actualClientAddress;
- }
-
- /**
- * Get 'your' (client) IP address.
- */
- public void setAssignedClientAddress( byte[] assignedClientAddress )
- {
- this.assignedClientAddress = assignedClientAddress;
- }
-
- /**
- * IP address of next server to use in bootstrap;
- * returned in DHCPOFFER, DHCPACK by server.
- */
- public void setNextServerAddress( byte[] nextServerAddress )
- {
- this.nextServerAddress = nextServerAddress;
- }
-
- /**
- * Relay agent IP address, used in booting via a relay agent.
- */
- public void setRelayAgentAddress( byte[] relayAgentAddress )
- {
- this.relayAgentAddress = relayAgentAddress;
- }
-
- /**
- * Client hardware address.
- */
- public void setClientHardwareAddress( byte[] clientHardwareAddress )
- {
- this.clientHardwareAddress = clientHardwareAddress;
- }
-
- /**
- * Optional server host name, null terminated string.
- */
- public void setServerHostname( byte[] serverHostname )
- {
- this.serverHostname = serverHostname;
- }
-
- /**
- * Boot file name, null terminated string; "generic" name or null
- * in DHCPDISCOVER, fully qualified directory-path name in DHCPOFFER.
- */
- public void setBootFileName( byte[] bootFileName )
- {
- this.bootFileName = bootFileName;
- }
-
- /**
- * Optional parameters field. See the options
- * documents for a list of defined options.
- */
- public void setOptions( OptionsField options )
- {
- this.options = options;
- }
-}
+ private MessageType messageType;
+ private byte opCode;
+ private byte hardwareAddressType;
+ private byte hardwareAddressLength;
+ private byte hardwareOptions;
+ private int transactionId;
+ private short seconds;
+ private short flags;
+ private byte actualClientAddress[] = new byte[4];
+ private byte assignedClientAddress[] = new byte[4];
+ private byte nextServerAddress[] = new byte[4];
+ private byte relayAgentAddress[] = new byte[4];
+ private byte clientHardwareAddress[] = new byte[16];
+ private byte serverHostname[] = new byte[64];
+ private byte bootFileName[] = new byte[128];
+
+ private OptionsField options = new OptionsField();
+
+
+ public DhcpMessage getDhcpMessage()
+ {
+ return new DhcpMessage( messageType, opCode, hardwareAddressType, hardwareAddressLength, hardwareOptions,
+ transactionId, seconds, flags, actualClientAddress, assignedClientAddress, nextServerAddress,
+ relayAgentAddress, clientHardwareAddress, serverHostname, bootFileName, options );
+ }
+
+
+ /**
+ * Message type.
+ */
+ public void setMessageType( MessageType messageType )
+ {
+ this.messageType = messageType;
+ }
+
+
+ /**
+ * Message op code / message type.
+ * 1 = BOOTREQUEST, 2 = BOOTREPLY
+ */
+ public void setOpCode( byte opCode )
+ {
+ this.opCode = opCode;
+ }
+
+
+ /**
+ * Hardware address type, see ARP section in
+ * "Assigned Numbers" RFC; e.g., '1' = 10mb ethernet.
+ */
+ public void setHardwareAddressType( byte hardwareAddressType )
+ {
+ this.hardwareAddressType = hardwareAddressType;
+ }
+
+
+ /**
+ * Hardware address length (e.g. '6' for 10mb ethernet).
+ */
+ public void setHardwareAddressLength( byte hardwareAddressLength )
+ {
+ this.hardwareAddressLength = hardwareAddressLength;
+ }
+
+
+ /**
+ * Set hops field.
+ *
+ * @param hardwareOptions hops field
+ */
+ public void setHardwareOptions( byte hardwareOptions )
+ {
+ this.hardwareOptions = hardwareOptions;
+ }
+
+
+ /**
+ * Transaction ID, a random number chosen by the client,
+ * used by the client and server to associate messages
+ * and responses between a client and a server.
+ */
+ public void setTransactionId( int transactionId )
+ {
+ this.transactionId = transactionId;
+ }
+
+
+ /**
+ * Filled in by client, seconds elapsed since client
+ * began address acquisition or renewal process.
+ */
+ public void setSeconds( short seconds )
+ {
+ this.seconds = seconds;
+ }
+
+
+ /**
+ * Flags.
+ */
+ public void setFlags( short flags )
+ {
+ this.flags = flags;
+ }
+
+
+ /**
+ * Client IP address; only filled in if client is in BOUND,
+ * RENEW or REBINDING state and can respond to ARP requests.
+ */
+ public void setActualClientAddress( byte[] actualClientAddress )
+ {
+ this.actualClientAddress = actualClientAddress;
+ }
+
+
+ /**
+ * Get 'your' (client) IP address.
+ */
+ public void setAssignedClientAddress( byte[] assignedClientAddress )
+ {
+ this.assignedClientAddress = assignedClientAddress;
+ }
+
+
+ /**
+ * IP address of next server to use in bootstrap;
+ * returned in DHCPOFFER, DHCPACK by server.
+ */
+ public void setNextServerAddress( byte[] nextServerAddress )
+ {
+ this.nextServerAddress = nextServerAddress;
+ }
+
+
+ /**
+ * Relay agent IP address, used in booting via a relay agent.
+ */
+ public void setRelayAgentAddress( byte[] relayAgentAddress )
+ {
+ this.relayAgentAddress = relayAgentAddress;
+ }
+
+
+ /**
+ * Client hardware address.
+ */
+ public void setClientHardwareAddress( byte[] clientHardwareAddress )
+ {
+ this.clientHardwareAddress = clientHardwareAddress;
+ }
+
+
+ /**
+ * Optional server host name, null terminated string.
+ */
+ public void setServerHostname( byte[] serverHostname )
+ {
+ this.serverHostname = serverHostname;
+ }
+
+
+ /**
+ * Boot file name, null terminated string; "generic" name or null
+ * in DHCPDISCOVER, fully qualified directory-path name in DHCPOFFER.
+ */
+ public void setBootFileName( byte[] bootFileName )
+ {
+ this.bootFileName = bootFileName;
+ }
+
+
+ /**
+ * Optional parameters field. See the options
+ * documents for a list of defined options.
+ */
+ public void setOptions( OptionsField options )
+ {
+ this.options = options;
+ }
+}
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/DhcpMessageModifier.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/DhcpMessageModifier.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/MessageType.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/MessageType.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/MessageType.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/MessageType.java Sun Feb 19 19:57:02 2006
@@ -17,6 +17,7 @@
package org.apache.directory.server.dhcp.messages;
+
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -24,62 +25,66 @@
public final class MessageType implements Comparable
{
- /**
- * Enumeration elements are constructed once upon class loading.
- * Order of appearance here determines the order of compareTo.
- */
- public static final MessageType NULL = new MessageType( 0, "Null" );
- public static final MessageType DHCPDISCOVER = new MessageType( 1, "DHCP Discover" );
- public static final MessageType DHCPOFFER = new MessageType( 2, "DHCP Offer" );
- public static final MessageType DHCPREQUEST = new MessageType( 3, "DHCP Request" );
- public static final MessageType DHCPDECLINE = new MessageType( 4, "DHCP Decline" );
- public static final MessageType DHCPACK = new MessageType( 5, "DHCP Acknowledge" );
- public static final MessageType DHCPNAK = new MessageType( 6, "DHCP Not Acknowledge" );
- public static final MessageType DHCPRELEASE = new MessageType( 7, "DHCP Release" );
- public static final MessageType DHCPINFORM = new MessageType( 8, "DHCP Inform" );
+ /**
+ * Enumeration elements are constructed once upon class loading.
+ * Order of appearance here determines the order of compareTo.
+ */
+ public static final MessageType NULL = new MessageType( 0, "Null" );
+ public static final MessageType DHCPDISCOVER = new MessageType( 1, "DHCP Discover" );
+ public static final MessageType DHCPOFFER = new MessageType( 2, "DHCP Offer" );
+ public static final MessageType DHCPREQUEST = new MessageType( 3, "DHCP Request" );
+ public static final MessageType DHCPDECLINE = new MessageType( 4, "DHCP Decline" );
+ public static final MessageType DHCPACK = new MessageType( 5, "DHCP Acknowledge" );
+ public static final MessageType DHCPNAK = new MessageType( 6, "DHCP Not Acknowledge" );
+ public static final MessageType DHCPRELEASE = new MessageType( 7, "DHCP Release" );
+ public static final MessageType DHCPINFORM = new MessageType( 8, "DHCP Inform" );
+
- public String toString()
+ public String toString()
{
- return name;
- }
+ return name;
+ }
+
- public int compareTo( Object that )
+ public int compareTo( Object that )
{
- return ordinal - ( (MessageType) that ).ordinal;
- }
+ return ordinal - ( ( MessageType ) that ).ordinal;
+ }
- public static MessageType getTypeByOrdinal( int type )
+
+ public static MessageType getTypeByOrdinal( int type )
{
- for ( int ii = 0; ii < values.length; ii++ )
- if ( values[ ii ].ordinal == type )
- return values[ ii ];
- return NULL;
- }
-
- public int getOrdinal()
+ for ( int ii = 0; ii < values.length; ii++ )
+ if ( values[ii].ordinal == type )
+ return values[ii];
+ return NULL;
+ }
+
+
+ public int getOrdinal()
{
- return ordinal;
- }
+ return ordinal;
+ }
+
+ /// PRIVATE /////
+ private final String name;
+ private final int ordinal;
- /// PRIVATE /////
- private final String name;
- private final int ordinal;
-
- /**
- * Private constructor prevents construction outside of this class.
- */
- private MessageType( int ordinal, String name )
+
+ /**
+ * Private constructor prevents construction outside of this class.
+ */
+ private MessageType(int ordinal, String name)
{
this.ordinal = ordinal;
- this.name = name;
- }
+ this.name = name;
+ }
- /**
- * These two lines are all that's necessary to export a List of VALUES.
- */
- private static final MessageType[] values = { NULL, DHCPDISCOVER, DHCPOFFER,
- DHCPREQUEST, DHCPDECLINE, DHCPACK, DHCPNAK, DHCPRELEASE, DHCPINFORM };
- // VALUES needs to be located here, otherwise illegal forward reference
- public static final List VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
+ /**
+ * These two lines are all that's necessary to export a List of VALUES.
+ */
+ private static final MessageType[] values =
+ { NULL, DHCPDISCOVER, DHCPOFFER, DHCPREQUEST, DHCPDECLINE, DHCPACK, DHCPNAK, DHCPRELEASE, DHCPINFORM };
+ // VALUES needs to be located here, otherwise illegal forward reference
+ public static final List VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
}
-
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/MessageType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/MessageType.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/AddressListOption.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/AddressListOption.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/AddressListOption.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/AddressListOption.java Sun Feb 19 19:57:02 2006
@@ -17,6 +17,7 @@
package org.apache.directory.server.dhcp.options;
+
import java.nio.ByteBuffer;
@@ -31,17 +32,18 @@
*/
public abstract class AddressListOption extends DhcpOption
{
- private byte[] value;
-
- public AddressListOption( int tag, byte[] value )
- {
- super( tag, value.length );
- this.value = value;
- }
-
- protected void valueToByteBuffer( ByteBuffer out )
- {
- out.put( value );
- }
-}
+ private byte[] value;
+
+ public AddressListOption(int tag, byte[] value)
+ {
+ super( tag, value.length );
+ this.value = value;
+ }
+
+
+ protected void valueToByteBuffer( ByteBuffer out )
+ {
+ out.put( value );
+ }
+}
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/AddressListOption.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/AddressListOption.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/AddressOption.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/AddressOption.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/AddressOption.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/AddressOption.java Sun Feb 19 19:57:02 2006
@@ -17,6 +17,7 @@
package org.apache.directory.server.dhcp.options;
+
import java.nio.ByteBuffer;
@@ -31,19 +32,20 @@
*/
public abstract class AddressOption extends DhcpOption
{
- private static final int length = 4;
-
- private byte[] value;
-
- public AddressOption( int tag, byte[] value )
- {
- super( tag, length );
- this.value = value;
- }
-
- protected void valueToByteBuffer( ByteBuffer out )
- {
- out.put( value );
- }
-}
+ private static final int length = 4;
+
+ private byte[] value;
+
+ public AddressOption(int tag, byte[] value)
+ {
+ super( tag, length );
+ this.value = value;
+ }
+
+
+ protected void valueToByteBuffer( ByteBuffer out )
+ {
+ out.put( value );
+ }
+}
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/AddressOption.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/AddressOption.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/DhcpOption.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/DhcpOption.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/DhcpOption.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/DhcpOption.java Sun Feb 19 19:57:02 2006
@@ -17,6 +17,7 @@
package org.apache.directory.server.dhcp.options;
+
import java.nio.ByteBuffer;
@@ -29,23 +30,25 @@
*/
public abstract class DhcpOption
{
- private int tag;
- private int length;
+ private int tag;
+ private int length;
+
+
+ public DhcpOption(int tag, int length)
+ {
+ this.tag = tag;
+ this.length = length;
+ }
- public DhcpOption( int tag, int length )
- {
- this.tag = tag;
- this.length = length;
- }
-
- abstract protected void valueToByteBuffer( ByteBuffer out );
-
- public void writeTo( ByteBuffer out )
- {
- out.put( (byte)tag );
- out.put( (byte)length );
-
- valueToByteBuffer( out );
- }
-}
+ abstract protected void valueToByteBuffer( ByteBuffer out );
+
+
+ public void writeTo( ByteBuffer out )
+ {
+ out.put( ( byte ) tag );
+ out.put( ( byte ) length );
+
+ valueToByteBuffer( out );
+ }
+}
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/DhcpOption.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/DhcpOption.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/OptionsField.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/OptionsField.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/OptionsField.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/OptionsField.java Sun Feb 19 19:57:02 2006
@@ -17,9 +17,11 @@
package org.apache.directory.server.dhcp.options;
+
import java.util.HashSet;
import java.util.Set;
+
/**
* The Dynamic Host Configuration Protocol (DHCP) provides a framework
* for passing configuration information to hosts on a TCP/IP network.
@@ -29,21 +31,23 @@
*/
public class OptionsField
{
- private Set options = new HashSet();
+ private Set options = new HashSet();
- public void add( DhcpOption option )
- {
- options.add( option );
- }
-
- public boolean isEmpty()
- {
- return options.isEmpty();
- }
-
- public DhcpOption[] toArray()
- {
- return (DhcpOption[])options.toArray( new DhcpOption[ options.size() ] );
- }
-}
+ public void add( DhcpOption option )
+ {
+ options.add( option );
+ }
+
+
+ public boolean isEmpty()
+ {
+ return options.isEmpty();
+ }
+
+
+ public DhcpOption[] toArray()
+ {
+ return ( DhcpOption[] ) options.toArray( new DhcpOption[options.size()] );
+ }
+}
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/OptionsField.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/OptionsField.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/BootfileName.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/BootfileName.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/BootfileName.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/BootfileName.java Sun Feb 19 19:57:02 2006
@@ -17,10 +17,12 @@
package org.apache.directory.server.dhcp.options.dhcp;
+
import java.nio.ByteBuffer;
import org.apache.directory.server.dhcp.options.DhcpOption;
+
/**
* This option is used to identify a bootfile when the 'file' field in
* the DHCP header has been used for DHCP options.
@@ -29,17 +31,18 @@
*/
public class BootfileName extends DhcpOption
{
- private byte[] bootFileName;
-
- public BootfileName( byte[] bootFileName )
- {
- super( 67, 1 );
- this.bootFileName = bootFileName;
- }
-
- protected void valueToByteBuffer( ByteBuffer out )
- {
- out.put( bootFileName );
- }
-}
+ private byte[] bootFileName;
+
+ public BootfileName(byte[] bootFileName)
+ {
+ super( 67, 1 );
+ this.bootFileName = bootFileName;
+ }
+
+
+ protected void valueToByteBuffer( ByteBuffer out )
+ {
+ out.put( bootFileName );
+ }
+}
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/BootfileName.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/BootfileName.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/ClientIdentifier.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/ClientIdentifier.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/ClientIdentifier.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/ClientIdentifier.java Sun Feb 19 19:57:02 2006
@@ -17,10 +17,12 @@
package org.apache.directory.server.dhcp.options.dhcp;
+
import java.nio.ByteBuffer;
import org.apache.directory.server.dhcp.options.DhcpOption;
+
/**
* This option is used by DHCP clients to specify their unique
* identifier. DHCP servers use this value to index their database of
@@ -47,17 +49,18 @@
*/
public class ClientIdentifier extends DhcpOption
{
- private byte[] clientIdentifier;
-
- public ClientIdentifier( byte[] clientIdentifier )
- {
- super( 61, 2 );
- this.clientIdentifier = clientIdentifier;
- }
-
- protected void valueToByteBuffer( ByteBuffer out )
- {
- out.put( clientIdentifier );
- }
-}
+ private byte[] clientIdentifier;
+
+ public ClientIdentifier(byte[] clientIdentifier)
+ {
+ super( 61, 2 );
+ this.clientIdentifier = clientIdentifier;
+ }
+
+
+ protected void valueToByteBuffer( ByteBuffer out )
+ {
+ out.put( clientIdentifier );
+ }
+}
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/ClientIdentifier.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/ClientIdentifier.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/DhcpMessageType.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/DhcpMessageType.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/DhcpMessageType.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/DhcpMessageType.java Sun Feb 19 19:57:02 2006
@@ -17,10 +17,12 @@
package org.apache.directory.server.dhcp.options.dhcp;
+
import java.nio.ByteBuffer;
import org.apache.directory.server.dhcp.options.DhcpOption;
+
/**
* This option is used to convey the type of the DHCP message. The code
* for this option is 53, and its length is 1. Legal values for this
@@ -39,17 +41,18 @@
*/
public class DhcpMessageType extends DhcpOption
{
- private byte[] messageType;
-
- public DhcpMessageType( byte[] messageType )
- {
- super( 53, 1 );
- this.messageType = messageType;
- }
-
- protected void valueToByteBuffer( ByteBuffer out )
- {
- out.put( messageType );
- }
-}
+ private byte[] messageType;
+
+ public DhcpMessageType(byte[] messageType)
+ {
+ super( 53, 1 );
+ this.messageType = messageType;
+ }
+
+
+ protected void valueToByteBuffer( ByteBuffer out )
+ {
+ out.put( messageType );
+ }
+}
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/DhcpMessageType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/DhcpMessageType.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/IpAddressLeaseTime.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/IpAddressLeaseTime.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/IpAddressLeaseTime.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/IpAddressLeaseTime.java Sun Feb 19 19:57:02 2006
@@ -17,10 +17,12 @@
package org.apache.directory.server.dhcp.options.dhcp;
+
import java.nio.ByteBuffer;
import org.apache.directory.server.dhcp.options.DhcpOption;
+
/**
* This option is used in a client request (DHCPDISCOVER or DHCPREQUEST)
* to allow the client to request a lease time for the IP address. In a
@@ -34,17 +36,18 @@
*/
public class IpAddressLeaseTime extends DhcpOption
{
- private byte[] ipAddressLeaseTime;
-
- public IpAddressLeaseTime( byte[] ipAddressLeaseTime )
- {
- super( 51, 4 );
- this.ipAddressLeaseTime = ipAddressLeaseTime;
- }
-
- protected void valueToByteBuffer( ByteBuffer out )
- {
- out.put( ipAddressLeaseTime );
- }
-}
+ private byte[] ipAddressLeaseTime;
+
+ public IpAddressLeaseTime(byte[] ipAddressLeaseTime)
+ {
+ super( 51, 4 );
+ this.ipAddressLeaseTime = ipAddressLeaseTime;
+ }
+
+
+ protected void valueToByteBuffer( ByteBuffer out )
+ {
+ out.put( ipAddressLeaseTime );
+ }
+}
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/IpAddressLeaseTime.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/IpAddressLeaseTime.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/MaximumDhcpMessageSize.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/MaximumDhcpMessageSize.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/MaximumDhcpMessageSize.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/MaximumDhcpMessageSize.java Sun Feb 19 19:57:02 2006
@@ -17,10 +17,12 @@
package org.apache.directory.server.dhcp.options.dhcp;
+
import java.nio.ByteBuffer;
import org.apache.directory.server.dhcp.options.DhcpOption;
+
/**
* This option specifies the maximum length DHCP message that it is
* willing to accept. The length is specified as an unsigned 16-bit
@@ -33,17 +35,18 @@
*/
public class MaximumDhcpMessageSize extends DhcpOption
{
- private byte[] maximumDhcpMessageSize;
-
- public MaximumDhcpMessageSize( byte[] maximumDhcpMessageSize )
- {
- super( 57, 2 );
- this.maximumDhcpMessageSize = maximumDhcpMessageSize;
- }
-
- protected void valueToByteBuffer( ByteBuffer out )
- {
- out.put( maximumDhcpMessageSize );
- }
-}
+ private byte[] maximumDhcpMessageSize;
+
+ public MaximumDhcpMessageSize(byte[] maximumDhcpMessageSize)
+ {
+ super( 57, 2 );
+ this.maximumDhcpMessageSize = maximumDhcpMessageSize;
+ }
+
+
+ protected void valueToByteBuffer( ByteBuffer out )
+ {
+ out.put( maximumDhcpMessageSize );
+ }
+}
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/MaximumDhcpMessageSize.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/MaximumDhcpMessageSize.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/Message.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/Message.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/Message.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/Message.java Sun Feb 19 19:57:02 2006
@@ -17,10 +17,12 @@
package org.apache.directory.server.dhcp.options.dhcp;
+
import java.nio.ByteBuffer;
import org.apache.directory.server.dhcp.options.DhcpOption;
+
/**
* This option is used by a DHCP server to provide an error message to a
* DHCP client in a DHCPNAK message in the event of a failure. A client
@@ -33,17 +35,18 @@
*/
public class Message extends DhcpOption
{
- private byte[] message;
-
- public Message( byte[] message )
- {
- super( 56, 1 );
- this.message = message;
- }
-
- protected void valueToByteBuffer( ByteBuffer out )
- {
- out.put( message );
- }
-}
+ private byte[] message;
+
+ public Message(byte[] message)
+ {
+ super( 56, 1 );
+ this.message = message;
+ }
+
+
+ protected void valueToByteBuffer( ByteBuffer out )
+ {
+ out.put( message );
+ }
+}
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/Message.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/Message.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/OptionOverload.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/OptionOverload.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/OptionOverload.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/OptionOverload.java Sun Feb 19 19:57:02 2006
@@ -17,10 +17,12 @@
package org.apache.directory.server.dhcp.options.dhcp;
+
import java.nio.ByteBuffer;
import org.apache.directory.server.dhcp.options.DhcpOption;
+
/**
* This option is used to indicate that the DHCP 'sname' or 'file'
* fields are being overloaded by using them to carry DHCP options. A
@@ -42,17 +44,18 @@
*/
public class OptionOverload extends DhcpOption
{
- private byte[] optionOverload;
-
- public OptionOverload( byte[] optionOverload )
- {
- super( 52, 1 );
- this.optionOverload = optionOverload;
- }
-
- protected void valueToByteBuffer( ByteBuffer out )
- {
- out.put( optionOverload );
- }
-}
+ private byte[] optionOverload;
+
+ public OptionOverload(byte[] optionOverload)
+ {
+ super( 52, 1 );
+ this.optionOverload = optionOverload;
+ }
+
+
+ protected void valueToByteBuffer( ByteBuffer out )
+ {
+ out.put( optionOverload );
+ }
+}
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/OptionOverload.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/OptionOverload.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/ParameterRequestList.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/ParameterRequestList.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/ParameterRequestList.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/ParameterRequestList.java Sun Feb 19 19:57:02 2006
@@ -17,10 +17,12 @@
package org.apache.directory.server.dhcp.options.dhcp;
+
import java.nio.ByteBuffer;
import org.apache.directory.server.dhcp.options.DhcpOption;
+
/**
* This option is used by a DHCP client to request values for specified
* configuration parameters. The list of requested parameters is
@@ -36,17 +38,18 @@
*/
public class ParameterRequestList extends DhcpOption
{
- private byte[] parameterRequestList;
-
- public ParameterRequestList( byte[] parameterRequestList )
- {
- super( 55, 1 );
- this.parameterRequestList = parameterRequestList;
- }
-
- protected void valueToByteBuffer( ByteBuffer out )
- {
- out.put( parameterRequestList );
- }
-}
+ private byte[] parameterRequestList;
+
+ public ParameterRequestList(byte[] parameterRequestList)
+ {
+ super( 55, 1 );
+ this.parameterRequestList = parameterRequestList;
+ }
+
+
+ protected void valueToByteBuffer( ByteBuffer out )
+ {
+ out.put( parameterRequestList );
+ }
+}
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/ParameterRequestList.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/ParameterRequestList.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/RebindingTimeValue.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/RebindingTimeValue.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/RebindingTimeValue.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/RebindingTimeValue.java Sun Feb 19 19:57:02 2006
@@ -17,10 +17,12 @@
package org.apache.directory.server.dhcp.options.dhcp;
+
import java.nio.ByteBuffer;
import org.apache.directory.server.dhcp.options.DhcpOption;
+
/**
* This option specifies the time interval from address assignment until
* the client transitions to the REBINDING state.
@@ -32,17 +34,18 @@
*/
public class RebindingTimeValue extends DhcpOption
{
- private int rebindingTimeValue;
-
- public RebindingTimeValue( int rebindingTimeValue )
- {
- super( 59, 4 );
- this.rebindingTimeValue = rebindingTimeValue;
- }
-
- protected void valueToByteBuffer( ByteBuffer out )
- {
- out.putInt( rebindingTimeValue );
- }
-}
+ private int rebindingTimeValue;
+
+ public RebindingTimeValue(int rebindingTimeValue)
+ {
+ super( 59, 4 );
+ this.rebindingTimeValue = rebindingTimeValue;
+ }
+
+
+ protected void valueToByteBuffer( ByteBuffer out )
+ {
+ out.putInt( rebindingTimeValue );
+ }
+}
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/RebindingTimeValue.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/RebindingTimeValue.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/RenewalTimeValue.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/RenewalTimeValue.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/RenewalTimeValue.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/RenewalTimeValue.java Sun Feb 19 19:57:02 2006
@@ -17,10 +17,12 @@
package org.apache.directory.server.dhcp.options.dhcp;
+
import java.nio.ByteBuffer;
import org.apache.directory.server.dhcp.options.DhcpOption;
+
/**
* This option specifies the time interval from address assignment until
* the client transitions to the RENEWING state.
@@ -32,17 +34,18 @@
*/
public class RenewalTimeValue extends DhcpOption
{
- private int renewalTimeValue;
-
- public RenewalTimeValue( int renewalTimeValue )
- {
- super( 58, 4 );
- this.renewalTimeValue = renewalTimeValue;
- }
-
- protected void valueToByteBuffer( ByteBuffer out )
- {
- out.putInt( renewalTimeValue );
- }
-}
+ private int renewalTimeValue;
+
+ public RenewalTimeValue(int renewalTimeValue)
+ {
+ super( 58, 4 );
+ this.renewalTimeValue = renewalTimeValue;
+ }
+
+
+ protected void valueToByteBuffer( ByteBuffer out )
+ {
+ out.putInt( renewalTimeValue );
+ }
+}
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/RenewalTimeValue.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/RenewalTimeValue.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id