sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2026-02-14 02:31:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

[settings] Merge SETTING_IPv4 and SETTING_IPv6

Browse Source 
Allow for equivalent IPv4 and IPv6 settings (which requires equivalent
settings to be adjacent within the settings list).

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2013-12-05 15:11:15 +00:00
parent eaa8615648
commit f3e5df3162
4 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/ipv4.c
View File

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

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

@@ -652,7 +652,7 @@ struct resolver dns_resolver __resolver ( RESOLV_NORMAL ) = {
*/
/** IPv4 DNS server setting */
const struct setting dns_setting __setting ( SETTING_IPv4_EXTRA, dns ) = {
const struct setting dns_setting __setting ( SETTING_IP_EXTRA, dns ) = {
.name = "dns",
.description = "DNS server",
.tag = DHCP_DNS_SERVERS,
@@ -660,7 +660,7 @@ const struct setting dns_setting __setting ( SETTING_IPv4_EXTRA, dns ) = {
};
/** IPv6 DNS server setting */
const struct setting dns6_setting __setting ( SETTING_IPv6_EXTRA, dns6 ) = {
const struct setting dns6_setting __setting ( SETTING_IP_EXTRA, dns6 ) = {
.name = "dns6",
.description = "DNS server",
.tag = DHCPV6_DNS_SERVERS,