pppoe: The remote MAC address should be protocol-independent

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/functions/functions.routing b/src/functions/functions.routing
index 66346107c167f91d1d22428330c474910bc8b220..707e0268dea4a56f2483bef49e8ce75de051e317 100644 (file)
--- a/src/functions/functions.routing
+++ b/src/functions/functions.routing
@@ -130,7 +130,7 @@ routing_db_from_ppp() {
 
        # Save the MAC address of the remote DSLAM
        if isset PPP_MACREMOTE; then
-               db_set "${zone}/${proto}/remote-address" "${PPP_MACREMOTE,,}"
+               db_set "${zone}/remote-address" "${PPP_MACREMOTE,,}"
        fi
 }
 

diff --git a/src/hooks/zones/pppoe b/src/hooks/zones/pppoe
index 0bb475f89de05ee445f5ffede478282bbc15f115..865bbc59fb4e4648169075db474a07532c9688eb 100644 (file)
--- a/src/hooks/zones/pppoe
+++ b/src/hooks/zones/pppoe
@@ -232,6 +232,9 @@ hook_status() {
        # XXX display time since connection started
 
        cli_headline 2 "Point-to-Point-over-Ethernet protocol"
+       cli_print_fmt1 2 "MAC-Remote"  "$(db_get "${zone}/remote-address")"
+       cli_space
+
        local proto
        for proto in ${IP_SUPPORTED_PROTOCOLS}; do
                db_exists "${zone}/${proto}" || continue
@@ -254,8 +257,6 @@ hook_status() {
                cli_print_fmt1 3 "Gateway"     "$(db_get "${zone}/${proto}/remote-ip-address")"
                cli_print_fmt1 3 "DNS servers" "$(db_get "${zone}/${proto}/domain-name-servers")"
                cli_space
-               cli_print_fmt1 3 "MAC-Remote"  "$(db_get "${zone}/${proto}/remote-address")"
-               cli_space
        done
 
        exit ${EXIT_OK}