diff options
| author | Michael Brown | 2017-03-20 12:58:59 +0100 |
|---|---|---|
| committer | Michael Brown | 2017-03-20 12:58:59 +0100 |
| commit | de2c6fa240fc3b42c91c06775de6a26eb4aa3faf (patch) | |
| tree | 7cd6c420f74cebdeb73052dd7889620db840c0f2 /src/net | |
| parent | [undi] Move PXE API caller back into UNDI driver (diff) | |
| download | ipxe-de2c6fa240fc3b42c91c06775de6a26eb4aa3faf.tar.gz ipxe-de2c6fa240fc3b42c91c06775de6a26eb4aa3faf.tar.xz ipxe-de2c6fa240fc3b42c91c06775de6a26eb4aa3faf.zip | |
[dhcp] Allow vendor class to be changed in DHCP requests
Allow the DHCPv4 vendor class to be specified via the "vendor-class"
setting.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/udp/dhcp.c | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c index 95f80821..3a3666c9 100644 --- a/src/net/udp/dhcp.c +++ b/src/net/udp/dhcp.c @@ -99,6 +99,12 @@ static uint8_t dhcp_request_options_data[] = { DHCP_END }; +/** Settings copied in to all DHCP requests */ +static const struct setting * dhcp_request_settings[] = { + &user_class_setting, + &vendor_class_setting, +}; + /** DHCP server address setting */ const struct setting dhcp_server_setting __setting ( SETTING_MISC, dhcp-server ) = { @@ -975,11 +981,13 @@ int dhcp_create_request ( struct dhcp_packet *dhcppkt, struct dhcp_netdev_desc dhcp_desc; struct dhcp_client_id client_id; struct dhcp_client_uuid client_uuid; + const struct setting *setting; uint8_t *dhcp_features; size_t dhcp_features_len; size_t ll_addr_len; - void *user_class; + void *raw; ssize_t len; + unsigned int i; int rc; /* Create DHCP packet */ @@ -1047,19 +1055,23 @@ int dhcp_create_request ( struct dhcp_packet *dhcppkt, } } - /* Add user class, if we have one. */ - if ( ( len = fetch_raw_setting_copy ( NULL, &user_class_setting, - &user_class ) ) >= 0 ) { - if ( ( rc = dhcppkt_store ( dhcppkt, DHCP_USER_CLASS_ID, - user_class, len ) ) != 0 ) { - DBG ( "DHCP could not set user class: %s\n", - strerror ( rc ) ); - goto err_store_user_class; + /* Add request settings, if applicable */ + for ( i = 0 ; i < ( sizeof ( dhcp_request_settings ) / + sizeof ( dhcp_request_settings[0] ) ) ; i++ ) { + setting = dhcp_request_settings[i]; + if ( ( len = fetch_raw_setting_copy ( NULL, setting, + &raw ) ) >= 0 ) { + rc = dhcppkt_store ( dhcppkt, setting->tag, raw, len ); + free ( raw ); + if ( rc != 0 ) { + DBG ( "DHCP could not set %s: %s\n", + setting->name, strerror ( rc ) ); + goto err_store_raw; + } } } - err_store_user_class: - free ( user_class ); + err_store_raw: err_store_client_uuid: err_store_client_id: err_store_busid: |