wgengine/router: refactor udm-pro into broader ubnt support#14452
Conversation
ca4839e to
e0684d6
Compare
|
Hi @sailorfrag, Thank you again for your help with getting #10828 merged—it’s greatly appreciated. If possible, I’d love to get this PR merged before the next stable release is cut to ensure the additional devices can benefit from the changes. Please let me know if there’s anything I can do to help move this forward. Thanks so much for your time and support. |
e0684d6 to
89acc16
Compare
| case isUDMPro(): | ||
| // UDM-Pro runs on debian | ||
| return UDMPro | ||
| case have("/usr/bin/ubnt-device-info"): |
There was a problem hiding this comment.
It looks like USG4 does not have this file. I think I'd like this to succinctly list the product families that are supported. That seems better than discussing what exact path(s) to use to support everything because that may take a while; support for other things can be done in later PRs.
There was a problem hiding this comment.
@sailorfrag One of the challenges I’m facing is that I don’t have the knowledge or access to a broad range of devices to confirm this definitively.
@notheotherben Do you know the exact list of product families which have this binary? UDM for sure, any others?
|
Also, in the commit message, please capitalize |
18fceca to
8b00c7b
Compare
Fixes tailscale#14453 Signed-off-by: Jason Barnett <[email protected]>
8b00c7b to
7ef2adf
Compare
|
This will be in any unstable release at least 1.79.52 |
|
appreciate the fix here. should this be available in the latest 1.79.9 unstable release? I don't seem to be getting the correct ip rules on a UDM-SE. root@bAL-UDM-SE:~# ip rule show
0: from all lookup local
5210: from all fwmark 0x80000/0xff0000 lookup main
5230: from all fwmark 0x80000/0xff0000 lookup default
5250: from all fwmark 0x80000/0xff0000 unreachable
5270: from all lookup 52
32000: from all lookup main
32500: from all fwmark 0x1a0000/0x7e0000 lookup 201.ppp0
32502: from X.X.X.X lookup 201.ppp0
32765: from all fwmark 0x10000/0x10000 lookup 251.blackhole
32766: from all lookup 201.ppp0
32767: from all lookup default |
Please refer to my previous comment. |
|
@sailorfrag how often is the unstable release produced? I couldn't find any documentation on the topic. |
|
It's erratic, normally someone starts the builder every few days but I guess that hasn't happened for a bit now |
|
I just started a build, assuming there are no errors it should be up later today. |
|
confirmed on 1.79.101 unstable, udm-se now supports operation as a subnet router and |
After collaboration with @notheotherben I realized my original implementation was quite narrow and left many Ubiquiti Network devices unsupported.
This is also more performant since it detects the device using a file path instead of reading file contents.
Fixes #14453