narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[DHCP] Kill off some no-longer-used DHCP functions

pull/1/head
Michael Brown 2008-03-21 00:50:12 +00:00
parent a9b62cfe8c
commit bb32b8999c
2 changed files with 0 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/include/gpxe/dhcp.h
View File

@ -517,10 +517,6 @@ dhcpopt_put ( struct dhcp_option_block *options ) {
extern struct list_head dhcp_option_blocks; extern struct list_head dhcp_option_blocks;
extern unsigned long dhcp_num_option ( struct dhcp_option *option ); extern unsigned long dhcp_num_option ( struct dhcp_option *option );
extern void dhcp_ipv4_option ( struct dhcp_option *option,
struct in_addr *inp );
extern int dhcp_snprintf ( char *buf, size_t size,
struct dhcp_option *option );
extern struct dhcp_option * extern struct dhcp_option *
find_dhcp_option ( struct dhcp_option_block *options, unsigned int tag ); find_dhcp_option ( struct dhcp_option_block *options, unsigned int tag );
extern void register_dhcp_options ( struct dhcp_option_block *options ); extern void register_dhcp_options ( struct dhcp_option_block *options );
@ -531,14 +527,8 @@ extern struct dhcp_option_block * __malloc alloc_dhcp_options ( size_t max_len )
extern struct dhcp_option * extern struct dhcp_option *
set_dhcp_option ( struct dhcp_option_block *options, unsigned int tag, set_dhcp_option ( struct dhcp_option_block *options, unsigned int tag,
const void *data, size_t len ); const void *data, size_t len );
extern struct dhcp_option * find_global_dhcp_option ( unsigned int tag );
extern unsigned long find_dhcp_num_option ( struct dhcp_option_block *options, extern unsigned long find_dhcp_num_option ( struct dhcp_option_block *options,
unsigned int tag ); unsigned int tag );
extern unsigned long find_global_dhcp_num_option ( unsigned int tag );
extern void find_dhcp_ipv4_option ( struct dhcp_option_block *options,
unsigned int tag, struct in_addr *inp );
extern void find_global_dhcp_ipv4_option ( unsigned int tag,
struct in_addr *inp );
extern void delete_dhcp_option ( struct dhcp_option_block *options, extern void delete_dhcp_option ( struct dhcp_option_block *options,
unsigned int tag ); unsigned int tag );

118
src/net/dhcpopts.c
View File

@ -87,55 +87,6 @@ unsigned long dhcp_num_option ( struct dhcp_option *option ) {
return value; return value;
} }
/**
* Obtain value of an IPv4-address DHCP option
*
* @v option DHCP option, or NULL
* @v inp IPv4 address to fill in
*
* Parses the IPv4 address value from a DHCP option, if present. It
* is permitted to call dhcp_ipv4_option() with @c option set to NULL;
* in this case the address will be set to 0.0.0.0.
*/
void dhcp_ipv4_option ( struct dhcp_option *option, struct in_addr *inp ) {
if ( option )
*inp = option->data.in;
}
/**
* Print DHCP string option value into buffer
*
* @v buf Buffer into which to write the string
* @v size Size of buffer
* @v option DHCP option, or NULL
* @ret len Length of formatted string
*
* DHCP option strings are stored without a NUL terminator. This
* function provides a convenient way to extract these DHCP strings
* into standard C strings. It is permitted to call dhcp_snprintf()
* with @c option set to NULL; in this case the buffer will be filled
* with an empty string.
*
* The usual snprintf() semantics apply with regard to buffer size,
* return value when the buffer is too small, etc.
*/
int dhcp_snprintf ( char *buf, size_t size, struct dhcp_option *option ) {
size_t len;
char *content = "";
if ( option ) {
/* Shrink buffer size so that it is only just large
* enough to contain the option data. snprintf() will
* take care of everything else (inserting the NUL etc.)
*/
len = ( option->len + 1 );
if ( len < size )
size = len;
content = option->data.string;
}
return snprintf ( buf, size, "%s", content );
}
/** /**
* Calculate length of a normal DHCP option * Calculate length of a normal DHCP option
* *
@ -461,19 +412,6 @@ struct dhcp_option * set_dhcp_option ( struct dhcp_option_block *options,
return option; return option;
} }
/**
* Find DHCP option within all registered DHCP options blocks
*
* @v tag DHCP option tag to search for
* @ret option DHCP option, or NULL if not found
*
* This function exists merely as a notational shorthand for
* find_dhcp_option() with @c options set to NULL.
*/
struct dhcp_option * find_global_dhcp_option ( unsigned int tag ) {
return find_dhcp_option ( NULL, tag );
}
/** /**
* Find DHCP numerical option, and return its value * Find DHCP numerical option, and return its value
* *
@ -493,62 +431,6 @@ unsigned long find_dhcp_num_option ( struct dhcp_option_block *options,
return dhcp_num_option ( find_dhcp_option ( options, tag ) ); return dhcp_num_option ( find_dhcp_option ( options, tag ) );
} }
/**
* Find DHCP numerical option, and return its value
*
* @v tag DHCP option tag to search for
* @ret value Numerical value of the option, or 0 if not found
*
* This function exists merely as a notational shorthand for a call to
* find_global_dhcp_option() followed by a call to dhcp_num_option().
* It is not possible to distinguish between the cases "option not
* found" and "option has a value of zero" using this function; if
* this matters to you then issue the two constituent calls directly
* and check that find_global_dhcp_option() returns a non-NULL value.
*/
unsigned long find_global_dhcp_num_option ( unsigned int tag ) {
return dhcp_num_option ( find_global_dhcp_option ( tag ) );
}
/**
* Find DHCP IPv4-address option, and return its value
*
* @v options DHCP options block
* @v tag DHCP option tag to search for
* @v inp IPv4 address to fill in
* @ret value Numerical value of the option, or 0 if not found
*
* This function exists merely as a notational shorthand for a call to
* find_dhcp_option() followed by a call to dhcp_ipv4_option(). It is
* not possible to distinguish between the cases "option not found"
* and "option has a value of 0.0.0.0" using this function; if this
* matters to you then issue the two constituent calls directly and
* check that find_dhcp_option() returns a non-NULL value.
*/
void find_dhcp_ipv4_option ( struct dhcp_option_block *options,
unsigned int tag, struct in_addr *inp ) {
dhcp_ipv4_option ( find_dhcp_option ( options, tag ), inp );
}
/**
* Find DHCP IPv4-address option, and return its value
*
* @v options DHCP options block
* @v tag DHCP option tag to search for
* @v inp IPv4 address to fill in
* @ret value Numerical value of the option, or 0 if not found
*
* This function exists merely as a notational shorthand for a call to
* find_dhcp_option() followed by a call to dhcp_ipv4_option(). It is
* not possible to distinguish between the cases "option not found"
* and "option has a value of 0.0.0.0" using this function; if this
* matters to you then issue the two constituent calls directly and
* check that find_dhcp_option() returns a non-NULL value.
*/
void find_global_dhcp_ipv4_option ( unsigned int tag, struct in_addr *inp ) {
dhcp_ipv4_option ( find_global_dhcp_option ( tag ), inp );
}
/** /**
* Delete DHCP option * Delete DHCP option
* *