Project

General

Profile

« Previous | Next » 

Revision 31c43fd3

Added by Seth Mos over 13 years ago

Add 6to4 support for automatic tunneling.

View differences:

usr/local/www/interfaces.php
220 220
		$pconfig['dhcp6-ia-pd-len'] = $wancfg['dhcp6-ia-pd-len'];
221 221
		$pconfig['type6'] = "dhcp6";
222 222
		break;
223
	case "6to4":
224
		$pconfig['type6'] = "6to4";
225
		break;
223 226
	case "6rd":
224 227
		$pconfig['prefix-6rd'] = $wancfg['prefix-6rd'];
225 228
		if($wancfg['prefix-6rd-v4plen'] == "")
......
500 503
			if (in_array($wancfg['ipaddrv6'], array()))
501 504
				$input_errors[] = sprintf(gettext("You have to reassign the interface to be able to configure as %s."),$_POST['type']);
502 505
			break;
506
		case "6to4":
507
			if (in_array($wancfg['ipaddrv6'], array()))
508
				$input_errors[] = sprintf(gettext("You have to reassign the interface to be able to configure as %s."),$_POST['type']);
509
			break;
503 510
	}
504 511

  
505 512
	
......
669 676
		/* for dynamic interfaces we tack a gateway item onto the array to prevent system
670 677
		 * log messages from appearing. They can also manually add these items */
671 678
		/* 1st added gateway gets a default bit */
679
		/* FIXME: Add address family check here! */
672 680
		if(!empty($a_gateways)) {
673 681
			$gateway_item = array();
674 682
			/* check for duplicates */
......
816 824
					$a_gateways[] = $gateway_item;
817 825
				}
818 826
				break;
827
			case "6to4":
828
				$wancfg['ipaddrv6'] = "6to4";
829
				break;
819 830
			case "none":
820 831
				break;
821 832
		}
......
1068 1079
$closehead = false;
1069 1080
include("head.inc");
1070 1081
$types4 = array("none" => gettext("None"), "staticv4" => gettext("Static IPv4"), "dhcp" => gettext("DHCP"), "ppp" => gettext("PPP"), "pppoe" => gettext("PPPoE"), "pptp" => gettext("PPTP"), "l2tp" => gettext("L2TP") /* , "carpdev-dhcp" => "CarpDev"*/);
1071
$types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"), "dhcp6" => gettext("DHCP6"), "6rd" => gettext("6RD"));
1082
$types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"), "dhcp6" => gettext("DHCP6"), "6rd" => gettext("6rd"), "6to4" => gettext("6to4"));
1072 1083

  
1073 1084
?>
1074 1085

  
......
1115 1126
	function updateTypeSix(t) {
1116 1127
		switch(t) {
1117 1128
			case "none": {
1118
				jQuery('#staticv6, #dhcp6, #6rd').hide();
1129
				jQuery('#staticv6, #dhcp6, #6rd, #6to4').hide();
1119 1130
				break;
1120 1131
			}
1121 1132
			case "staticv6": {
1122
				jQuery('#none, #dhcp6, #6rd').hide();
1133
				jQuery('#none, #dhcp6, #6rd, #6to4').hide();
1123 1134
				break;
1124 1135
			}
1125 1136
			case "dhcp6": {
1126
				jQuery('#none, #staticv6, #6rd').hide();
1137
				jQuery('#none, #staticv6, #6rd, #6to4').hide();
1127 1138
				break;
1128 1139
			}
1129 1140
			case "6rd": {
1130
				jQuery('#none, #dhcp6, #staticv6').hide();
1141
				jQuery('#none, #dhcp6, #staticv6, #6to4').hide();
1142
				break;
1143
			}
1144
			case "6to4": {
1145
				jQuery('#none, #dhcp6, #staticv6, #6rd').hide();
1131 1146
				break;
1132 1147
			}
1133 1148
		}

Also available in: Unified diff