From ac6e109fcfda649add1d747cc1f5eb22cb05aae0 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 9 Nov 2022 09:50:52 +0200
Subject: [PATCH] interfaces: polish main log message in renew, variable rename

---
 src/etc/rc.newwanip   | 16 ++++++++--------
 src/etc/rc.newwanipv6 | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip
index 39cd2240d..b76c99c6f 100755
--- a/src/etc/rc.newwanip
+++ b/src/etc/rc.newwanip
@@ -46,21 +46,21 @@ exit_on_bootup(function ($argument) {
 
 if (empty($argument)) {
     $interface = 'wan';
-    $interface_real = get_real_interface($interface);
+    $device = get_real_interface($interface);
 } else {
     $interface = convert_real_interface_to_friendly_interface_name($argument);
-    $interface_real = $argument;
+    $device = $argument;
 }
 
 if (!isset($config['interfaces'][$interface]['enable'])) {
-    log_msg("Interface '{$interface}' ($interface_real) is disabled or empty, nothing to do.", LOG_WARNING);
+    log_msg("Interface '{$interface}' ($device) is disabled or empty, nothing to do.", LOG_WARNING);
     return;
 }
 
 $interface_descr = convert_friendly_interface_to_friendly_descr($interface);
 $ip = get_interface_ip($interface);
 
-$cacheip_file = "/tmp/{$interface_real}_oldip";
+$cacheip_file = "/tmp/{$device}_oldip";
 
 if (!is_ipaddr($ip)) {
     /* remove previously cached IP since it is gone */
@@ -71,7 +71,7 @@ if (!is_ipaddr($ip)) {
      * to reconfigure an interface.  OpenVPN might be in tap(4)
      * mode and not have an IP address.
      */
-    if (substr($interface_real, 0, 4) != 'ovpn') {
+    if (substr($device, 0, 4) != 'ovpn') {
         log_msg("Failed to detect IP for {$interface_descr}[{$interface}]", LOG_WARNING);
         return;
     }
@@ -87,7 +87,7 @@ if ($ip == $cacheip) {
     return;
 }
 
-log_msg("On (IP address: {$ip} vs. ${cacheip}) (interface: {$interface_descr}[{$interface}]) (real interface: {$interface_real}).");
+log_msg("IP renwal starting (new: {$ip}, old: ${cacheip}, interface: {$interface_descr}[{$interface}], device: {$device})");
 
 interfaces_vips_configure($interface, 4);
 
@@ -104,7 +104,7 @@ foreach ($gifs as $gif) {
 $bridge = link_interface_to_bridge($interface);
 if (!empty($bridge)) {
     /* XXX _interfaces_bridge_configure() is probably cleaner */
-    interface_bridge_add_member($bridge, $interface_real);
+    interface_bridge_add_member($bridge, $device);
 }
 
 if (isset($config['interfaces'][$interface]['ipaddrv6'])) {
@@ -159,7 +159,7 @@ foreach (array_keys($restartifs) as $ifname) {
  */
 ifgroup_setup();
 
-$cacheip_file = "/tmp/{$interface_real}_oldip";
+$cacheip_file = "/tmp/{$device}_oldip";
 $cacheip = trim(@file_get_contents($cacheip_file));
 $intf_ipaddr = $config['interfaces'][$interface]['ipaddr'];
 
diff --git a/src/etc/rc.newwanipv6 b/src/etc/rc.newwanipv6
index 2f2d64095..2b5d57664 100755
--- a/src/etc/rc.newwanipv6
+++ b/src/etc/rc.newwanipv6
@@ -46,21 +46,21 @@ exit_on_bootup(function ($argument) {
 
 if (empty($argument)) {
     $interface = 'wan';
-    $interface_real = get_real_interface($interface, 'inet6');
+    $device = get_real_interface($interface, 'inet6');
 } else {
     $interface = convert_real_interface_to_friendly_interface_name($argument);
-    $interface_real = $argument;
+    $device = $argument;
 }
 
 if (!isset($config['interfaces'][$interface]['enable'])) {
-    log_msg("Interface '{$interface}' ($interface_real) is disabled or empty, nothing to do.", LOG_WARNING);
+    log_msg("Interface '{$interface}' ($device) is disabled or empty, nothing to do.", LOG_WARNING);
     return;
 }
 
 $interface_descr = convert_friendly_interface_to_friendly_descr($interface);
 $ip = get_interface_ipv6($interface);
 
-$cacheip_file = "/tmp/{$interface_real}_oldipv6";
+$cacheip_file = "/tmp/{$device}_oldipv6";
 
 if (!is_ipaddr($ip)) {
     /* remove previously cached IP since it is gone */
@@ -71,7 +71,7 @@ if (!is_ipaddr($ip)) {
      * to reconfigure an interface.  OpenVPN might be in tap(4)
      * mode and not have an IP address.
      */
-    if (substr($interface_real, 0, 4) != 'ovpn') {
+    if (substr($device, 0, 4) != 'ovpn') {
         log_msg("Failed to detect IP for {$interface_descr}[{$interface}]", LOG_WARNING);
         return;
     }
@@ -87,7 +87,7 @@ if ($ip == $cacheip) {
     return;
 }
 
-log_msg("On (IP address: {$ip} vs. ${cacheip}) (interface: {$interface_descr}[{$interface}]) (real interface: {$interface_real}).");
+log_msg("IP renwal starting (new: {$ip}, old: ${cacheip}, interface: {$interface_descr}[{$interface}], device: {$device})");
 
 interfaces_vips_configure($interface, 6);