浏览代码

[ipv6] Rename ipv6_scope to dhcpv6_scope

The settings scope ipv6_scope refers specifically to IPv6 settings
that have a corresponding DHCPv6 option.  Rename to dhcpv6_scope to
more accurately reflect this purpose.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 7 年前
父节点
当前提交
129206f476
共有 5 个文件被更改,包括 8 次插入8 次删除
  1. 1
    1
      src/core/settings.c
  2. 1
    1
      src/include/ipxe/settings.h
  3. 4
    4
      src/net/udp/dhcpv6.c
  4. 1
    1
      src/net/udp/dns.c
  5. 1
    1
      src/net/udp/syslog.c

+ 1
- 1
src/core/settings.c 查看文件

@@ -1784,7 +1784,7 @@ const struct setting_type setting_type_ipv6 __setting_type = {
1784 1784
 };
1785 1785
 
1786 1786
 /** IPv6 settings scope */
1787
-const struct settings_scope ipv6_scope;
1787
+const struct settings_scope dhcpv6_scope;
1788 1788
 
1789 1789
 /**
1790 1790
  * Integer setting type indices

+ 1
- 1
src/include/ipxe/settings.h 查看文件

@@ -284,7 +284,7 @@ struct builtin_setting {
284 284
 extern const struct settings_scope builtin_scope;
285 285
 
286 286
 /** IPv6 setting scope */
287
-extern const struct settings_scope ipv6_scope;
287
+extern const struct settings_scope dhcpv6_scope;
288 288
 
289 289
 /**
290 290
  * A generic settings block

+ 4
- 4
src/net/udp/dhcpv6.c 查看文件

@@ -280,7 +280,7 @@ struct dhcpv6_settings {
280 280
 static int dhcpv6_applies ( struct settings *settings __unused,
281 281
 			    const struct setting *setting ) {
282 282
 
283
-	return ( setting->scope == &ipv6_scope );
283
+	return ( setting->scope == &dhcpv6_scope );
284 284
 }
285 285
 
286 286
 /**
@@ -341,7 +341,7 @@ static int dhcpv6_register ( struct dhcpv6_option_list *options,
341 341
 	}
342 342
 	ref_init ( &dhcpv6set->refcnt, NULL );
343 343
 	settings_init ( &dhcpv6set->settings, &dhcpv6_settings_operations,
344
-			&dhcpv6set->refcnt, &ipv6_scope );
344
+			&dhcpv6set->refcnt, &dhcpv6_scope );
345 345
 	data = ( ( ( void * ) dhcpv6set ) + sizeof ( *dhcpv6set ) );
346 346
 	len = options->len;
347 347
 	memcpy ( data, options->data, len );
@@ -987,7 +987,7 @@ const struct setting filename6_setting __setting ( SETTING_BOOT, filename ) = {
987 987
 	.description = "Boot filename",
988 988
 	.tag = DHCPV6_BOOTFILE_URL,
989 989
 	.type = &setting_type_string,
990
-	.scope = &ipv6_scope,
990
+	.scope = &dhcpv6_scope,
991 991
 };
992 992
 
993 993
 /** DNS search list setting */
@@ -996,5 +996,5 @@ const struct setting dnssl6_setting __setting ( SETTING_IP_EXTRA, dnssl ) = {
996 996
 	.description = "DNS search list",
997 997
 	.tag = DHCPV6_DOMAIN_LIST,
998 998
 	.type = &setting_type_dnssl,
999
-	.scope = &ipv6_scope,
999
+	.scope = &dhcpv6_scope,
1000 1000
 };

+ 1
- 1
src/net/udp/dns.c 查看文件

@@ -1061,7 +1061,7 @@ const struct setting dns6_setting __setting ( SETTING_IP6_EXTRA, dns6 ) = {
1061 1061
 	.description = "DNS server",
1062 1062
 	.tag = DHCPV6_DNS_SERVERS,
1063 1063
 	.type = &setting_type_ipv6,
1064
-	.scope = &ipv6_scope,
1064
+	.scope = &dhcpv6_scope,
1065 1065
 };
1066 1066
 
1067 1067
 /** DNS search list */

+ 1
- 1
src/net/udp/syslog.c 查看文件

@@ -213,7 +213,7 @@ const struct setting syslog6_setting __setting ( SETTING_MISC, syslog6 ) = {
213 213
 	.description = "Syslog server",
214 214
 	.tag = DHCPV6_LOG_SERVERS,
215 215
 	.type = &setting_type_ipv6,
216
-	.scope = &ipv6_scope,
216
+	.scope = &dhcpv6_scope,
217 217
 };
218 218
 
219 219
 /**

正在加载...
取消
保存