diff options
| author | Michael Brown | 2009-01-08 09:39:05 +0100 |
|---|---|---|
| committer | Michael Brown | 2009-01-08 09:39:05 +0100 |
| commit | ba1016f3786081652fb02707ddc40a557523e3ff (patch) | |
| tree | 4c1a732f12488982c57f2f511958ed7b9affc9cc | |
| parent | [main] Print an "initialising devices" banner (diff) | |
| download | ipxe-ba1016f3786081652fb02707ddc40a557523e3ff.tar.gz ipxe-ba1016f3786081652fb02707ddc40a557523e3ff.tar.xz ipxe-ba1016f3786081652fb02707ddc40a557523e3ff.zip | |
[dhcp] Include gPXE version number within DHCP request
| -rw-r--r-- | src/Makefile | 1 | ||||
| -rw-r--r-- | src/include/gpxe/dhcp.h | 3 | ||||
| -rw-r--r-- | src/include/gpxe/features.h | 23 | ||||
| -rw-r--r-- | src/net/udp/dhcp.c | 4 |
4 files changed, 21 insertions, 10 deletions
diff --git a/src/Makefile b/src/Makefile index eed91f030..147f6997f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -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 : diff --git a/src/include/gpxe/dhcp.h b/src/include/gpxe/dhcp.h index e89503d39..cd3964c55 100644 --- a/src/include/gpxe/dhcp.h +++ b/src/include/gpxe/dhcp.h @@ -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 diff --git a/src/include/gpxe/features.h b/src/include/gpxe/features.h index e4d29213b..32c316947 100644 --- a/src/include/gpxe/features.h +++ b/src/include/gpxe/features.h @@ -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 */ @@ -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 */ diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c index 213478323..2ef8c084d 100644 --- a/src/net/udp/dhcp.c +++ b/src/net/udp/dhcp.c @@ -38,6 +38,7 @@ #include <gpxe/dhcp.h> #include <gpxe/dhcpopts.h> #include <gpxe/dhcppkt.h> +#include <gpxe/features.h> /** @file * @@ -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 */ |