Project

General

Profile

« Previous | Next » 

Revision 1665e79c

Added by Scott Ullrich almost 20 years ago

Destroy the bridge either way, it will be recreated if needed.

View differences:

usr/local/www/interfaces.php
182 182

  
183 183
	if (!$input_errors) {
184 184

  
185
		if($wancfg['bridge'] <> "" and $_POST['bridge'] == "") {
186
			$bridge = discover_bridge($wancfg['if'], $wancfg['bridge']);
187
			if($bridge) {
188
				destroy_bridge($bridge);
189
			}
185
		$bridge = discover_bridge($wancfg['if'], $wancfg['bridge']);
186
		if($bridge) {
187
			destroy_bridge($bridge);
190 188
		}
191 189
	
192 190
		unset($wancfg['ipaddr']);
usr/local/www/interfaces_lan.php
106 106

  
107 107
	if (!$input_errors) {
108 108
		
109
		if($lancfg['bridge'] <> "" and $_POST['bridge'] == "") {
110
			$bridge = discover_bridge($lancfg['if'], $lancfg['bridge']);
111
			if($bridge) {
112
				destroy_bridge($bridge);
113
			}
109
		$bridge = discover_bridge($lancfg['if'], $lancfg['bridge']);
110
		if($bridge) {
111
			destroy_bridge($bridge);
114 112
		}
115
		
113

  
116 114
		$lancfg['bridge'] = $_POST['bridge'];
117 115
		
118 116
		if (($lancfg['ipaddr'] != $_POST['ipaddr']) || ($lancfg['subnet'] != $_POST['subnet'])) {
usr/local/www/interfaces_opt.php
165 165

  
166 166
	if (!$input_errors) {
167 167

  
168
		if($optcfg['bridge'] <> "" and $_POST['bridge'] == "") {
169
			$bridge = discover_bridge($optcfg['if'], $optcfg['bridge']);
170
			if($bridge) {
171
				destroy_bridge($bridge);
172
			}
168
		$bridge = discover_bridge($optcfg['if'], $optcfg['bridge']);
169
		if($bridge) {
170
			destroy_bridge($bridge);
173 171
		}
174 172

  
175 173
		unset($optcfg['dhcphostname']);
usr/local/www/interfaces_wan.php
182 182

  
183 183
	if (!$input_errors) {
184 184

  
185
		if($wancfg['bridge'] <> "" and $_POST['bridge'] == "") {
186
			$bridge = discover_bridge($wancfg['if'], $wancfg['bridge']);
187
			if($bridge) {
188
				destroy_bridge($bridge);
189
			}
185
		$bridge = discover_bridge($wancfg['if'], $wancfg['bridge']);
186
		if($bridge) {
187
			destroy_bridge($bridge);
190 188
		}
191 189
	
192 190
		unset($wancfg['ipaddr']);

Also available in: Unified diff