david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

[settings] Create space for IPv6 in settings display order 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2016-07-15 16:52:47 +01:00
parent c53a209a42
commit ecfc81d76f
4 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/include/ipxe/settings.h
View File

@ -62,18 +62,22 @@ struct setting {
#define SETTING_NETDEV 01 /**< Network device settings */
#define SETTING_NETDEV_EXTRA 02 /**< Network device additional settings */
#define SETTING_IP 03 /**< IPv4 settings */
#define SETTING_IP_EXTRA 04 /**< IPv4 additional settings */
#define SETTING_BOOT 05 /**< Generic boot settings */
#define SETTING_BOOT_EXTRA 06 /**< Generic boot additional settings */
#define SETTING_SANBOOT 07 /**< SAN boot settings */
#define SETTING_SANBOOT_EXTRA 08 /**< SAN boot additional settings */
#define SETTING_HOST 09 /**< Host identity settings */
#define SETTING_HOST_EXTRA 10 /**< Host identity additional settings */
#define SETTING_AUTH 11 /**< Authentication settings */
#define SETTING_AUTH_EXTRA 12 /**< Authentication additional settings */
#define SETTING_CRYPTO 13 /**< Cryptography settings */
#define SETTING_MISC 14 /**< Miscellaneous settings */
#define SETTING_IP4 03 /**< IPv4 settings */
#define SETTING_IP4_EXTRA 04 /**< IPv4 additional settings */
#define SETTING_IP6 05 /**< IPv6 settings */
#define SETTING_IP6_EXTRA 06 /**< IPv6 additional settings */
#define SETTING_IP 07 /**< IPv4 settings */
#define SETTING_IP_EXTRA 08 /**< IPv4 additional settings */
#define SETTING_BOOT 09 /**< Generic boot settings */
#define SETTING_BOOT_EXTRA 10 /**< Generic boot additional settings */
#define SETTING_SANBOOT 11 /**< SAN boot settings */
#define SETTING_SANBOOT_EXTRA 12 /**< SAN boot additional settings */
#define SETTING_HOST 13 /**< Host identity settings */
#define SETTING_HOST_EXTRA 14 /**< Host identity additional settings */
#define SETTING_AUTH 15 /**< Authentication settings */
#define SETTING_AUTH_EXTRA 16 /**< Authentication additional settings */
#define SETTING_CRYPTO 17 /**< Cryptography settings */
#define SETTING_MISC 18 /**< Miscellaneous settings */
/** @} */
@ -421,13 +425,13 @@ extern const struct setting_type setting_type_busdevfn __setting_type;
extern const struct setting_type setting_type_dnssl __setting_type;
extern const struct setting
ip_setting __setting ( SETTING_IP, ip );
ip_setting __setting ( SETTING_IP4, ip );
extern const struct setting
netmask_setting __setting ( SETTING_IP, netmask );
netmask_setting __setting ( SETTING_IP4, netmask );
extern const struct setting
gateway_setting __setting ( SETTING_IP, gateway );
gateway_setting __setting ( SETTING_IP4, gateway );
extern const struct setting
dns_setting __setting ( SETTING_IP_EXTRA, dns );
dns_setting __setting ( SETTING_IP4_EXTRA, dns );
extern const struct setting
hostname_setting __setting ( SETTING_HOST, hostname );
extern const struct setting

6
src/net/ipv4.c
View File

@ -788,7 +788,7 @@ int format_ipv4_setting ( const struct setting_type *type __unused,
}
/** IPv4 address setting */
const struct setting ip_setting __setting ( SETTING_IP, ip ) = {
const struct setting ip_setting __setting ( SETTING_IP4, ip ) = {
.name = "ip",
.description = "IP address",
.tag = DHCP_EB_YIADDR,
@ -796,7 +796,7 @@ const struct setting ip_setting __setting ( SETTING_IP, ip ) = {
};
/** IPv4 subnet mask setting */
const struct setting netmask_setting __setting ( SETTING_IP, netmask ) = {
const struct setting netmask_setting __setting ( SETTING_IP4, netmask ) = {
.name = "netmask",
.description = "Subnet mask",
.tag = DHCP_SUBNET_MASK,
@ -804,7 +804,7 @@ const struct setting netmask_setting __setting ( SETTING_IP, netmask ) = {
};
/** Default gateway setting */
const struct setting gateway_setting __setting ( SETTING_IP, gateway ) = {
const struct setting gateway_setting __setting ( SETTING_IP4, gateway ) = {
.name = "gateway",
.description = "Default gateway",
.tag = DHCP_ROUTERS,

2
src/net/ndp.c
View File

@ -785,7 +785,7 @@ static int ndp_register_settings ( struct net_device *netdev,
}
/** DNS server setting */
const struct setting ndp_dns6_setting __setting ( SETTING_IP_EXTRA, dns6 ) = {
const struct setting ndp_dns6_setting __setting ( SETTING_IP6_EXTRA, dns6 ) = {
.name = "dns6",
.description = "DNS server",
.tag = NDP_TAG ( NDP_OPT_RDNSS,

4
src/net/udp/dns.c
View File

@ -1048,7 +1048,7 @@ const struct setting_type setting_type_dnssl __setting_type = {
};
/** IPv4 DNS server setting */
const struct setting dns_setting __setting ( SETTING_IP_EXTRA, dns ) = {
const struct setting dns_setting __setting ( SETTING_IP4_EXTRA, dns ) = {
.name = "dns",
.description = "DNS server",
.tag = DHCP_DNS_SERVERS,
@ -1056,7 +1056,7 @@ const struct setting dns_setting __setting ( SETTING_IP_EXTRA, dns ) = {
};
/** IPv6 DNS server setting */
const struct setting dns6_setting __setting ( SETTING_IP_EXTRA, dns6 ) = {
const struct setting dns6_setting __setting ( SETTING_IP6_EXTRA, dns6 ) = {
.name = "dns6",
.description = "DNS server",
.tag = DHCPV6_DNS_SERVERS,