Gargoyle 1.15.x BETA - 2024-08-11 - Based on OpenWrt 23.05

[Lantis]

- Created a new separate config file

Can you tell us about this feature.

Apologies the forum ate my formatting, I’ve tried to fix it.
That was under the bandwidth monitoring heading.

Previously there was a single bwmon setting for custom month start which lived in /etc/config/gargoyle.
Now that there are several configuration items it made sense to break it out to its own /etc/config/bwmon_gargoyle.

[ispyisail]

Thank you

I wondered if it was for router upgrades

I wish OpenWRT would do something better for upgrades

[Lantis]

Please disable the Modem Access via the Advanced page by leaving it unticked and hitting save. If this does not disable it, please manually remove the "modem" section from your /etc/config/network file.
Next, modify /usr/lib/gargoyle_firewall_util/gargoyle_firewall_util.sh L650 from

Code: Select all

wan_dev=$(uci -q get network.wan.ifname) #not really the interface, but the device

to

Code: Select all

wan_dev=$(uci -q get network.wan.device) #not really the interface, but the device

You can now reboot the router or simply call /usr/lib/gargoyle/restart_firewall.sh

Modem access should now be working in PPPoE mode as intended.

If you can confirm that's all good I will make the appropriate bug fixes.

I've been following steps by 1) excluding modem access from /etc/config/network and 2) editing L650 in gargoyle_firewall_util.sh. But those did not work for me. Modem access becomes failing.
My topology is: (PC) <wired or wireless> (WRT3200ACM) <wired> (VDSL2+ CPE) <PPPoE passthrough>. CPE can be accessed with a fixed IP: 192.168.1.1 directly via a PC, if configuring it in the same subnet e.g. 192.168.1.2.
Now I revert the change in gargoyle_firewall_util.sh + recover modem access from /etc/config/network. WebUI display under Connection / Advanced / Internet / WAN may not be as expected but functionality is good. Any PC behind WRT3200CM can access CPE. There is static route in WRT3200ACM pointing to CPE. Thanks.

Alright, a bit unexpected but let's try the opposite.
Modify /www/js/advanced.js
https://github.com/ericpaulbishop/gargo ... ed.js#L166
from

Code: Select all

if(wandhcp == 'dhcp')

to

Code: Select all

if(['dhcp','pppoe'].indexOf(wandhcp) > -1)

The GUI should all work as expected.
Be aware that the JS file is probably minimised so you may need to hunt down this section.

[angus]

Modify /www/js/advanced.js
https://github.com/ericpaulbishop/gargo ... ed.js#L166
from

Code: Select all

if(wandhcp == 'dhcp')

to

Code: Select all

if(['dhcp','pppoe'].indexOf(wandhcp) > -1)

The fix should be done in advanced.js::setModemNetworkVisibility(). What I see from root file system is as follows. Don't know how to do at present because of lack of JavaScript knowledge. Any ideas? Thanks.

Code: Select all

function setModemNetworkVisibility() {
    "dhcp" == uciOriginal.get("network", "wan", "proto") && (loadChecked(["use_modem_network", uciOriginal, "network", "modem", "ipaddr", function(e) {
        return "" != e
    }
    ]),
    loadValueFromVariable(["modem_network_ip", uciOriginal, "network", "modem", "ipaddr", "192.168.0.2"]),
    loadValueFromVariable(["modem_network_mask", uciOriginal, "network", "modem", "netmask", "255.255.255.0"]),
    enableAssociatedField(byId("use_modem_network"), "modem_network_ip", "192.168.0.2"),
    enableAssociatedField(byId("use_modem_network"), "modem_network_mask", "255.255.255.0"))
}

[Lantis]

JavaScript has been turned on its head by the minimiser.
From

Code: Select all

 "dhcp" == uciOriginal.get("network", "wan", "proto") && (loadCheck…

To

Code: Select all

 ("dhcp" == uciOriginal.get("network", "wan", "proto") || "pppoe" == uciOriginal.get("network", "wan", "proto")) && (loadCheck…

[angus]

From

Code: Select all

 "dhcp" == uciOriginal.get("network", "wan", "proto") && (loadCheck…

To

Code: Select all

 ("dhcp" == uciOriginal.get("network", "wan", "proto") || "pppoe" == uciOriginal.get("network", "wan", "proto")) && (loadCheck…

Finished and tested but nothing is changed. I start wondering if the original WebUI design of modem access is not like what I thought. So Lantis, please confirm its design philosophy. In my test, 192.168.0.2 is always seen despite my setting to IP must in modem subnet field is 192.168.1.2. Thanks.

[Lantis]

No, you should see what is configured. If you disable it (or untick the box and retick it) it will set the default value of 192.168.0.2, otherwise behaviour is normal.

I'm not convinced your tests are solid (sorry). Your results just don't compute. You're possibly running into caching issues or similar.
That’s not your fault, and it’s difficult for me to support you to do so unless we do live debugging.

[angus]

I'm not convinced your tests are solid (sorry). Your results just don't compute. You're possibly running into caching issues or similar.
That’s not your fault, and it’s difficult for me to support you to do so unless we do live debugging.

Thanks Lantis. Good point that I'm running into caching issue. Tested again and confirmed your patch works. Run 0811 image soon or later. Thanks.

[Lantis]

Oh good
Which version works though the last one?

[angus]

Oh good
Which version works though the last one?

Code: Select all

------------------------------------------------------------------
|            _____                             _                 |
|           |  __ \                           | |                |
|           | |  \/ __ _ _ __ __ _  ___  _   _| | ___            |
|           | | __ / _` | '__/ _` |/ _ \| | | | |/ _ \           |
|           | |_\ \ (_| | | | (_| | (_) | |_| | |  __/           |
|            \____/\__,_|_|  \__, |\___/ \__, |_|\___|           |
|                             __/ |       __/ |                  |
|                            |___/       |___/                   |
|                                                                |
|----------------------------------------------------------------|
| Gargoyle version 1.15.X   | OpenWrt 23.05 branch               |
| Gargoyle revision ab461167| OpenWrt commit e367ba9             |
| Built July 02, 2024       | Target  mvebu/default              |
------------------------------------------------------------------