[Openvpn-devel,v1] route: print net_gateway info instead of unset rgi/rgi6

Message ID 20261102142000.30467-1-gert@greenie.muc.de
State New
Headers
Series [Openvpn-devel,v1] route: print net_gateway info instead of unset rgi/rgi6 |

Commit Message

Gert Doering Nov. 2, 2026, 2:19 p.m. UTC
  From: Razvan Cojocaru <razvanc@mailbox.org>

init_route_list() and init_route_ipv6_list() print rgi/rgi6 before
they are filled, so ROUTE_GATEWAY/ROUTE6_GATEWAY were never logged.
Print ngi/ngi6, which the surrounding block checks and exports.

Broken since 2777cdd3 ("route: handle default gateway (net_gateway)
and nexthop towards VPN server separately").

Change-Id: I73cebcb7649e7c2bfdd29fee955b192f143a5ab9
Signed-off-by: Razvan Cojocaru <razvanc@mailbox.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2086
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2086
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):
Gert Doering <gert@greenie.muc.de>
  

Patch

diff --git a/src/openvpn/route.c b/src/openvpn/route.c
index 0bce966..7a475a6 100644
--- a/src/openvpn/route.c
+++ b/src/openvpn/route.c
@@ -619,7 +619,7 @@ 
     {
         setenv_route_addr(es, "net_gateway", rl->ngi.gateway.addr, -1);
 #ifndef ENABLE_SMALL
-        print_default_gateway(D_ROUTE, &rl->rgi, NULL);
+        print_default_gateway(D_ROUTE, &rl->ngi, NULL);
 #endif
     }
     else
@@ -770,7 +770,7 @@ 
     {
         setenv_str(es, "net_gateway_ipv6", print_in6_addr(rl6->ngi6.gateway.addr_ipv6, 0, &gc));
 #ifndef ENABLE_SMALL
-        print_default_gateway(D_ROUTE, NULL, &rl6->rgi6);
+        print_default_gateway(D_ROUTE, NULL, &rl6->ngi6);
 #endif
     }
     else