entrouvert
/
univnautes
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Rework the banner display a bit to preserve space (could still use some shortening, but better than it was)

This commit is contained in:
jim-p 2012-06-13 16:20:07 -04:00
parent bd0c22951d
commit 29e566a1a4
1 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
etc/rc.banner
View File

@ -55,18 +55,38 @@
/* look for 'special cases' */
switch($ifconf['ipaddr']) {
case "dhcp":
$class = "(DHCP)";
$class = "/DHCP4";
break;
case "pppoe":
$class = "(PPPoE)";
$class = "/PPPoE";
break;
case "pptp":
$class = "(PPTP)";
$class = "/PPTP";
break;
case "l2tp":
$class = "/L2TP";
break;
default:
$class = "";
break;
}
switch($ifconf['ipaddrv6']) {
case "dhcp6":
$class6 = "/DHCP6";
break;
case "slaac":
$class6 = "/SLAAC";
break;
case "6rd":
$class6 = "/6RD";
break;
case "6to4":
$class6 = "/6to4";
break;
case "track6":
$class6 = "/t6";
break;
}
$ipaddr = get_interface_ip($ifname);
$subnet = get_interface_subnet($ifname);
$ipaddr6 = get_interface_ipv6($ifname);
@ -74,15 +94,30 @@
$realif = get_real_interface($ifname);
$tobanner = "{$friendly} ({$ifname})";
printf("\n %-15s -> %-10s -> %s/%s\t%s/%s %s",
printf("\n %-15s -> %-10s -> ",
$tobanner,
$realif,
$ipaddr ? $ipaddr : "NONE",
$subnet ? $subnet : "NONE",
$ipaddr6 ? $ipaddr6 : "NONE",
$subnet6 ? $subnet6 : "NONE",
$class
$realif
);
$v6first = false;
if (!empty($ipaddr) && !empty($subnet)) {
printf("v4%s: %s/%s",
$class,
$ipaddr,
$subnet
);
} else {
$v6first = true;
}
if (!empty($ipaddr6) && !empty($subnet6)) {
if (!$v6first) {
printf("\n%s", str_repeat(" ",34));
}
printf("v6%s: %s/%s",
$class6,
$ipaddr6,
$subnet6
);
}
}
?>