Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[dhcp] Include gPXE version number within DHCP request
  • Loading branch information
Michael Brown committed Jan 8, 2009
1 parent 3e220aa commit ba1016f
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 10 deletions.
1 change: 1 addition & 0 deletions src/Makefile
Expand Up @@ -123,6 +123,7 @@ MM_VERSION = $(VERSION_MAJOR).$(VERSION_MINOR)
VERSION = $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION)
CFLAGS += -DVERSION_MAJOR=$(VERSION_MAJOR) \
-DVERSION_MINOR=$(VERSION_MINOR) \
-DVERSION_PATCH=$(VERSION_PATCH) \
-DVERSION=\"$(VERSION)\"
IDENT = '$(@F) $(VERSION) (GPL) etherboot.org'
version :
Expand Down
3 changes: 3 additions & 0 deletions src/include/gpxe/dhcp.h
Expand Up @@ -260,6 +260,9 @@ struct dhcp_packet;
*/
#define DHCP_EB_REVERSE_PASSWORD DHCP_ENCAP_OPT ( DHCP_EB_ENCAP, 0xc1 )

/** gPXE version number */
#define DHCP_EB_VERSION DHCP_ENCAP_OPT ( DHCP_EB_ENCAP, 0xeb )

/** iSCSI primary target IQN */
#define DHCP_ISCSI_PRIMARY_TARGET_IQN 201

Expand Down
23 changes: 13 additions & 10 deletions src/include/gpxe/features.h
Expand Up @@ -51,17 +51,16 @@
/** @} */

/** Declare a feature code for DHCP */
#define __dhcp_feature( category ) \
__table ( uint8_t, dhcp_features, category )
#define __dhcp_feature __table ( uint8_t, dhcp_features, 01 )

/** Construct a DHCP feature table entry */
#define DHCP_FEATURE( category, feature_opt, version ) \
_DHCP_FEATURE ( category, OBJECT, feature_opt, version )
#define _DHCP_FEATURE( category, _name, feature_opt, version ) \
__DHCP_FEATURE ( category, _name, feature_opt, version )
#define __DHCP_FEATURE( category, _name, feature_opt, version ) \
uint8_t __dhcp_feature_ ## _name [] __dhcp_feature ( category ) = { \
feature_opt, DHCP_BYTE ( version ) \
#define DHCP_FEATURE( feature_opt, ... ) \
_DHCP_FEATURE ( OBJECT, feature_opt, __VA_ARGS__ )
#define _DHCP_FEATURE( _name, feature_opt, ... ) \
__DHCP_FEATURE ( _name, feature_opt, __VA_ARGS__ )
#define __DHCP_FEATURE( _name, feature_opt, ... ) \
uint8_t __dhcp_feature_ ## _name [] __dhcp_feature = { \
feature_opt, DHCP_OPTION ( __VA_ARGS__ ) \
};

/** A named feature */
Expand All @@ -87,6 +86,10 @@ struct feature {
/** Declare a feature */
#define FEATURE( category, text, feature_opt, version ) \
FEATURE_NAME ( category, text ); \
DHCP_FEATURE ( category, feature_opt, version );
DHCP_FEATURE ( feature_opt, version );

/** Declare the version number feature */
#define FEATURE_VERSION( ... ) \
DHCP_FEATURE ( DHCP_ENCAPSULATED ( DHCP_EB_VERSION ), __VA_ARGS__ )

#endif /* _GPXE_FEATURES_H */
4 changes: 4 additions & 0 deletions src/net/udp/dhcp.c
Expand Up @@ -38,6 +38,7 @@
#include <gpxe/dhcp.h>
#include <gpxe/dhcpopts.h>
#include <gpxe/dhcppkt.h>
#include <gpxe/features.h>

/** @file
*
Expand Down Expand Up @@ -93,6 +94,9 @@ static struct dhcp_options dhcp_request_options = {
static uint8_t dhcp_features[0] __table_start ( uint8_t, dhcp_features );
static uint8_t dhcp_features_end[0] __table_end ( uint8_t, dhcp_features );

/** Version number feature */
FEATURE_VERSION ( VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH );

/** DHCP network device descriptor */
struct dhcp_netdev_desc {
/** Bus type ID */
Expand Down

0 comments on commit ba1016f

Please sign in to comment.