[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>
This commit is contained in:
Michael Brown
2010-11-30 00:31:01 +00:00
parent 6cee8904d1
commit 310d46c1ed
4 changed files with 25 additions and 24 deletions

View File

@@ -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 */

View File

@@ -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,