Project

General

Profile

« Previous | Next » 

Revision 15709960

Added by Marcos M 5 months ago

Add combined IPv4/6 system aliases

https://redmine.pfsense.org/issues/15776

View differences:

src/etc/inc/globals.inc
82 82
	'disablehelpicon' => false,
83 83
	'disablecrashreporter' => false,
84 84
	'debug' => false,
85
	'latest_config' => '23.8',
85
	'latest_config' => '23.9',
86 86
	'minimum_ram_warning' => '101',
87 87
	'minimum_ram_warning_text' => '128 MB',
88 88
	'wan_interface_name' => 'wan',
......
354 354

  
355 355
add_reserved_table(
356 356
	[
357
		'name' => '_loopback_',
357
		'name' => '_loopback4_',
358 358
		'type' => 'network',
359
		'descr' => 'IPv4 and IPv6 loopback networks.',
359
		'descr' => 'IPv4 loopback network.',
360 360
	],
361 361
	[
362 362
		'127.0.0.0/8' => 'Loopback', // RFC1122
363
	],
364
);
365
add_reserved_table(
366
	[
367
		'name' => '_loopback6_',
368
		'type' => 'network',
369
		'descr' => 'IPv6 loopback network.',
370
	],
371
	[
363 372
		'::1/128' => 'Loopback Address', // RFC4291
364 373
	],
365 374
);
375
add_reserved_table(
376
	[
377
		'name' => '_loopback46_',
378
		'type' => 'network',
379
		'descr' => 'IPv4 and IPv6 loopback networks.',
380
	],
381
	[
382
		'_loopback4_' => 'IPv4 Loopback',
383
		'_loopback6_' => 'IPv6 Loopback',
384
	],
385
);
386

  
366 387
add_reserved_table(
367 388
	[
368 389
		'name' => '_linklocal4_',
......
383 404
		'fe80::/10' => 'Linked-Scoped Unicast', // RFC4291
384 405
	],
385 406
);
407
add_reserved_table(
408
	[
409
		'name' => '_linklocal46_',
410
		'type' => 'network',
411
		'descr' => 'IPv4 and IPv6 link-local networks.',
412
	],
413
	[
414
		'_linklocal4_' => 'IPv4 link-local networks',
415
		'_linklocal6_' => 'IPv6 link-local networks',
416
	],
417
);
418

  
386 419
add_reserved_table(
387 420
	[
388 421
		'name' => '_private4_',
......
406 439
		'fc00::/7' => 'Unique-Local', // RFC4193
407 440
	],
408 441
);
442
add_reserved_table(
443
	[
444
		'name' => '_private46_',
445
		'type' => 'network',
446
		'descr' => 'IPv4 and IPv6 private networks.',
447
	],
448
	[
449
		'_private4_' => 'IPv4 private networks',
450
		'_private6_' => 'IPv6 private networks',
451
	],
452
);
453

  
409 454
add_reserved_table(
410 455
	[
411 456
		'name' => '_multicast4_',
......
426 471
		'ff00::/8' => 'Multicast', // RFC4291
427 472
	],
428 473
);
474
add_reserved_table(
475
	[
476
		'name' => '_multicast46_',
477
		'type' => 'network',
478
		'descr' => 'IPv4 and IPv6 multicast networks.',
479
	],
480
	[
481
		'_multicast4_' => 'IPv4 multicast networks',
482
		'_multicast6_' => 'IPv6 multicast networks',
483
	],
484
);
485

  
429 486
add_reserved_table(
430 487
	[
431 488
		'name' => '_reserved4_',
......
475 532
		'ff00::/8' => 'Multicast', // RFC4291
476 533
	]
477 534
);
535
add_reserved_table(
536
	[
537
		'name' => '_reserved46_',
538
		'type' => 'network',
539
		'descr' => 'IPv4 and IPv6 networks reserved for local use.',
540
	],
541
	[
542
		'_reserved4_' => 'IPv4 networks reserved for local use',
543
		'_reserved6_' => 'IPv6 networks reserved for local use',
544
	],
545
);
478 546

  
479 547
/* VLAN Prio values. */
480 548
global $vlanprio_values;

Also available in: Unified diff