mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore default MTU when field is cleared. Fixes #3926

Browse Source
This commit is contained in:
Renato Botelho 2015-12-29 13:49:27 -02:00
parent 3f4e6035cb
commit c399d0dd03
1 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/etc/inc/interfaces.inc
View File

@ -3177,52 +3177,56 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven
interfaces_bring_up($wancfg['if']); interfaces_bring_up($wancfg['if']);
} }
if (!empty($wancfg['mtu'])) { if (isset($wancfg['mtu']) && is_numericint($wancfg['mtu'])) {
if (stristr($realif, "_vlan")) { $mtu = $wancfg['mtu'];
$assignedparent = convert_real_interface_to_friendly_interface_name($realhwif); } else {
if (!empty($assignedparent) && !empty($config['interfaces'][$assignedparent]['mtu'])) { $mtu = 1500; /* Default */
$parentmtu = $config['interfaces'][$assignedparent]['mtu']; }
if ($wancfg['mtu'] > $parentmtu) {
log_error("There is a conflict on MTU between parent {$realhwif} and VLAN({$realif})"); if (stristr($realif, "_vlan")) {
} $assignedparent = convert_real_interface_to_friendly_interface_name($realhwif);
} else { if (!empty($assignedparent) && !empty($config['interfaces'][$assignedparent]['mtu'])) {
$parentmtu = 0; $parentmtu = $config['interfaces'][$assignedparent]['mtu'];
if ($mtu > $parentmtu) {
log_error("There is a conflict on MTU between parent {$realhwif} and VLAN({$realif})");
} }
} else {
$parentmtu = 0;
}
$parentmtu = interface_vlan_mtu_configured($realhwif, $parentmtu); $parentmtu = interface_vlan_mtu_configured($realhwif, $parentmtu);
if (get_interface_mtu($realhwif) != $parentmtu) { if (get_interface_mtu($realhwif) != $parentmtu) {
pfSense_interface_mtu($realhwif, $parentmtu); pfSense_interface_mtu($realhwif, $parentmtu);
} }
/* All vlans need to use the same mtu value as their parent. */ /* All vlans need to use the same mtu value as their parent. */
interface_vlan_adapt_mtu(link_interface_to_vlans($realhwif), $parentmtu); interface_vlan_adapt_mtu(link_interface_to_vlans($realhwif), $parentmtu);
} else if (substr($realif, 0, 4) == 'lagg') { } else if (substr($realif, 0, 4) == 'lagg') {
/* LAGG interface must be destroyed and re-created to change MTU */ /* LAGG interface must be destroyed and re-created to change MTU */
if ($wancfg['mtu'] != get_interface_mtu($realif)) { if ($mtu != get_interface_mtu($realif)) {
if (isset($config['laggs']['lagg']) && is_array($config['laggs']['lagg'])) { if (isset($config['laggs']['lagg']) && is_array($config['laggs']['lagg'])) {
foreach ($config['laggs']['lagg'] as $lagg) { foreach ($config['laggs']['lagg'] as $lagg) {
if ($lagg['laggif'] == $realif) { if ($lagg['laggif'] == $realif) {
interface_lagg_configure($lagg); interface_lagg_configure($lagg);
break; break;
}
} }
} }
} }
} else {
if ($wancfg['mtu'] != get_interface_mtu($realif)) {
pfSense_interface_mtu($realif, $wancfg['mtu']);
}
/* This case is needed when the parent of vlans is being configured */
$vlans = link_interface_to_vlans($realif);
if (is_array($vlans)) {
interface_vlan_adapt_mtu($vlans, $wancfg['mtu']);
}
unset($vlans);
} }
/* XXX: What about gre/gif/.. ? */ } else {
if ($mtu != get_interface_mtu($realif)) {
pfSense_interface_mtu($realif, $mtu);
}
/* This case is needed when the parent of vlans is being configured */
$vlans = link_interface_to_vlans($realif);
if (is_array($vlans)) {
interface_vlan_adapt_mtu($vlans, $mtu);
}
unset($vlans);
} }
/* XXX: What about gre/gif/.. ? */
switch ($wancfg['ipaddr']) { switch ($wancfg['ipaddr']) {
case 'dhcp': case 'dhcp':