[dhcp] Rename length fields for DHCP options

Rename "len" to "used_len" and "max_len" to "alloc_len".

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/include/ipxe/dhcpopts.h b/src/include/ipxe/dhcpopts.h
index fea99d59ddedf0f6ae8b57bacf288651c175ee97..d88036e3aca17c3b469c5be973159af2f4727166 100644 (file)
--- a/src/include/ipxe/dhcpopts.h
+++ b/src/include/ipxe/dhcpopts.h
@@ -15,10 +15,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 struct dhcp_options {
        /** Option block raw data */
        void *data;
-       /** Option block length */
-       size_t len;
-       /** Option block maximum length */
-       size_t max_len;
+       /** Option block used length */
+       size_t used_len;
+       /** Option block allocated length */
+       size_t alloc_len;
 };
 
 extern int dhcpopt_store ( struct dhcp_options *options, unsigned int tag,
@@ -29,6 +29,6 @@ extern int dhcpopt_extensible_store ( struct dhcp_options *options,
 extern int dhcpopt_fetch ( struct dhcp_options *options, unsigned int tag,
                           void *data, size_t len );
 extern void dhcpopt_init ( struct dhcp_options *options,
-                          void *data, size_t max_len );
+                          void *data, size_t alloc_len );
 
 #endif /* _IPXE_DHCPOPTS_H */

diff --git a/src/include/ipxe/dhcppkt.h b/src/include/ipxe/dhcppkt.h
index b004800d8af1701c11df55331a72a87dee40348a..3179a6bb0492bfc9fa2981edef08e98fb6dd35d0 100644 (file)
--- a/src/include/ipxe/dhcppkt.h
+++ b/src/include/ipxe/dhcppkt.h
@@ -57,7 +57,8 @@ dhcppkt_put ( struct dhcp_packet *dhcppkt ) {
  * @ret len            Used length
  */
 static inline int dhcppkt_len ( struct dhcp_packet *dhcppkt ) {
-       return ( offsetof ( struct dhcphdr, options ) + dhcppkt->options.len );
+       return ( offsetof ( struct dhcphdr, options ) +
+                dhcppkt->options.used_len );
 }
 
 extern int dhcppkt_store ( struct dhcp_packet *dhcppkt, unsigned int tag,

diff --git a/src/net/cachedhcp.c b/src/net/cachedhcp.c
index 294624c8e2e8d20f2246753392a8c5a187a6730a..36f480a96f025d8db98e141e69c90a567a0ac9bf 100644 (file)
--- a/src/net/cachedhcp.c
+++ b/src/net/cachedhcp.c
@@ -58,7 +58,7 @@ void store_cached_dhcpack ( userptr_t data, size_t len ) {
        dhcphdr = ( ( ( void * ) dhcppkt ) + sizeof ( * dhcppkt ) );
        copy_from_user ( dhcphdr, data, 0, len );
        dhcppkt_init ( dhcppkt, dhcphdr, len );
-       DBG_HD ( dhcppkt->options.data, dhcppkt->options.len );
+       DBG_HD ( dhcppkt->options.data, dhcppkt->options.used_len );
 
        /* Register settings on the last opened network device.
         * This will have the effect of registering cached settings

diff --git a/src/net/dhcpopts.c b/src/net/dhcpopts.c
index f351c32e3517399d8edd27162cae6d4228ba6cb2..214a8244ce6a6a359b1961835702d2702bd431d4 100644 (file)
--- a/src/net/dhcpopts.c
+++ b/src/net/dhcpopts.c
@@ -117,7 +117,7 @@ static int find_dhcp_option_with_encap ( struct dhcp_options *options,
        unsigned int original_tag __attribute__ (( unused )) = tag;
        struct dhcp_option *option;
        int offset = 0;
-       ssize_t remaining = options->len;
+       ssize_t remaining = options->used_len;
        unsigned int option_len;
 
        /* Sanity check */
@@ -199,8 +199,8 @@ static int resize_dhcp_option ( struct dhcp_options *options,
                DBGC ( options, "DHCPOPT %p overlength option\n", options );
                return -ENOSPC;
        }
-       new_options_len = ( options->len + delta );
-       if ( new_options_len > options->max_len ) {
+       new_options_len = ( options->used_len + delta );
+       if ( new_options_len > options->alloc_len ) {
                /* Reallocate options block if allowed to do so. */
                if ( can_realloc ) {
                        new_data = realloc ( options->data, new_options_len );
@@ -211,7 +211,7 @@ static int resize_dhcp_option ( struct dhcp_options *options,
                                return -ENOMEM;
                        }
                        options->data = new_data;
-                       options->max_len = new_options_len;
+                       options->alloc_len = new_options_len;
                } else {
                        DBGC ( options, "DHCPOPT %p out of space\n", options );
                        return -ENOMEM;
@@ -227,13 +227,13 @@ static int resize_dhcp_option ( struct dhcp_options *options,
                }
                encapsulator->len = new_encapsulator_len;
        }
-       options->len = new_options_len;
+       options->used_len = new_options_len;
 
        /* Move remainder of option data */
        option = dhcp_option ( options, offset );
        source = ( ( ( void * ) option ) + old_len );
        dest = ( ( ( void * ) option ) + new_len );
-       end = ( options->data + options->max_len );
+       end = ( options->data + options->alloc_len );
        memmove ( dest, source, ( end - dest ) );
 
        return 0;
@@ -277,7 +277,7 @@ static int set_dhcp_option ( struct dhcp_options *options, unsigned int tag,
        creation_offset = find_dhcp_option_with_encap ( options, DHCP_END,
                                                        NULL );
        if ( creation_offset < 0 )
-               creation_offset = options->len;
+               creation_offset = options->used_len;
        /* Find old instance of this option, if any */
        offset = find_dhcp_option_with_encap ( options, tag, &encap_offset );
        if ( offset >= 0 ) {
@@ -402,14 +402,14 @@ int dhcpopt_fetch ( struct dhcp_options *options, unsigned int tag,
  * The "used length" field will be updated based on scanning through
  * the block to find the end of the options.
  */
-static void dhcpopt_update_len ( struct dhcp_options *options ) {
+static void dhcpopt_update_used_len ( struct dhcp_options *options ) {
        struct dhcp_option *option;
        int offset = 0;
-       ssize_t remaining = options->max_len;
+       ssize_t remaining = options->alloc_len;
        unsigned int option_len;
 
        /* Find last non-pad option */
-       options->len = 0;
+       options->used_len = 0;
        while ( remaining ) {
                option = dhcp_option ( options, offset );
                option_len = dhcp_option_len ( option );
@@ -418,7 +418,7 @@ static void dhcpopt_update_len ( struct dhcp_options *options ) {
                        break;
                offset += option_len;
                if ( option->tag != DHCP_PAD )
-                       options->len = offset;
+                       options->used_len = offset;
        }
 }
 
@@ -427,21 +427,21 @@ static void dhcpopt_update_len ( struct dhcp_options *options ) {
  *
  * @v options          Uninitialised DHCP option block
  * @v data             Memory for DHCP option data
- * @v max_len          Length of memory for DHCP option data
+ * @v alloc_len                Length of memory for DHCP option data
  *
  * The memory content must already be filled with valid DHCP options.
  * A zeroed block counts as a block of valid DHCP options.
  */
 void dhcpopt_init ( struct dhcp_options *options, void *data,
-                   size_t max_len ) {
+                   size_t alloc_len ) {
 
        /* Fill in fields */
        options->data = data;
-       options->max_len = max_len;
+       options->alloc_len = alloc_len;
 
        /* Update length */
-       dhcpopt_update_len ( options );
+       dhcpopt_update_used_len ( options );
 
-       DBGC ( options, "DHCPOPT %p created (data %p len %#zx max_len %#zx)\n",
-              options, options->data, options->len, options->max_len );
+       DBGC ( options, "DHCPOPT %p created (data %p lengths %#zx,%#zx)\n",
+              options, options->data, options->used_len, options->alloc_len );
 }