Project

General

Profile

Actions
Copy link

Todo #16707

open

Improve gateway status consistency

Added by Marcos M 23 days ago. Updated 22 days ago.

Status:
Feedback
Priority:
Normal
Assignee:
Marcos M
Category:
Gateway Monitoring
Target version:
2.9.0
Start date:
Due date:
% Done:

100%

Estimated time:
Plus Target Version:
26.07
Release Notes:
Default

Description

Currently there are several places where the gateway status is checked and each place has its own implementation of those checks. This tends to result in inconsistencies between GUI pages when showing the status of a gateway. For example, the gateway groups page shows "Pending" for a gateway group which has a single gateway that also has monitoring disabled; whereas other pages show that gateway as "Online". Update the code so that the gateway status is consistent across all pages.

Actions
Copy link
 #1

Updated by Marcos M 23 days ago

  • Status changed from New to Feedback
  • % Done changed from 0 to 100

Applied in changeset commit:ddd366b3706a7c24d2406b9ccfdca76a0dca4be4.

Actions
Copy link
 #2

Updated by Jim Pingle 22 days ago

  • Status changed from Feedback to In Progress

Looks like this change introduced a PHP error on one of my test VMs:

PHP ERROR: Type: 1, File: /etc/inc/gwlb.inc, Line: 309, Message: Uncaught TypeError: is_gateway_action_enabled(): Argument #1 ($gateway) must be of type array|string, null given, called in /etc/inc/gwlb.inc on line 1835 and defined in /etc/inc/gwlb.inc:309
Stack trace:
#0 /etc/inc/gwlb.inc(1835): is_gateway_action_enabled(NULL)
#1 /etc/inc/gwlb.inc(1676): get_gwgroup_members_inner(Array, Array, Array, Array)
#2 /etc/inc/gwlb.inc(1936): fixup_default_gateway('inet', Array, Array)
#3 /etc/inc/filter.inc(1732): return_gateway_groups_array(true)
#4 /etc/inc/filter.inc(928): filter_generate_gateways()
#5 /etc/rc.bootup(296): filter_configure_sync()
#6 {main}
  thrown

The gateway configuration on this test VM is:

        <gateways>
                <gateway_item>
                        <interface>wan</interface>
                        <gateway></gateway>
                        <name>WAN_DHCP6</name>
                        <weight>1</weight>
                        <ipprotocol>inet6</ipprotocol>
                        <descr><![CDATA[Interface WAN_DHCP6 Gateway]]></descr>
                        <gw_down_kill_states></gw_down_kill_states>
                </gateway_item>
                <gateway_item>
                        <interface>wan</interface>
                        <gateway>dynamic</gateway>
                        <name>WAN_DHCP</name>
                        <weight>1</weight>
                        <ipprotocol>inet</ipprotocol>
                        <descr><![CDATA[Interface WAN_DHCP Gateway]]></descr>
                        <gw_down_kill_states></gw_down_kill_states>
                </gateway_item>
                <gateway_item>
                        <interface>opt2</interface>
                        <gateway>dynamic</gateway>
                        <name>WAN2_DHCP</name>
                        <weight>1</weight>
                        <ipprotocol>inet</ipprotocol>
                        <descr><![CDATA[Interface WAN2_DHCP Gateway]]></descr>
                        <gw_down_kill_states></gw_down_kill_states>
                </gateway_item>
                <gateway_item>
                        <interface>opt3</interface>
                        <gateway>dynamic</gateway>
                        <name>OPT3_TUNNELV4</name>
                        <weight>1</weight>
                        <ipprotocol>inet</ipprotocol>
                        <descr><![CDATA[Interface OPT3_TUNNELV4 Gateway]]></descr>
                        <gw_down_kill_states></gw_down_kill_states>
                </gateway_item>
                <gateway_group>
                        <name>PreferWAN</name>
                        <item>WAN_DHCP|1|address</item>
                        <item>WAN2_PPPOE|2|address</item>
                        <trigger>down</trigger>
                        <descr></descr>
                </gateway_group>
                <defaultgw4>PreferWAN</defaultgw4>
                <defaultgw6>WAN_DHCP6</defaultgw6>
        </gateways>

Note that the gateway group contains a gateway that does not exist. Removing that item allowed the system to boot.

Actions
Copy link
 #3

Updated by Marcos M 22 days ago

  • Status changed from In Progress to Feedback
  • Plus Target Version changed from 26.03 to 26.07

That should be fixed with the addition of commit:ccaf33eebcfe6db42d35e2bc96430c12ba4a8f33.

Actions
Copy link

Also available in: Atom PDF