From fa25b451983f7371bbfa4a95d47d340dcc813473 Mon Sep 17 00:00:00 2001 From: Travis LaDuke Date: Fri, 7 Jan 2022 07:59:48 -0800 Subject: [PATCH] Keep interface name on via routes on linux See issue #1498 --- osdep/ManagedRoute.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/osdep/ManagedRoute.cpp b/osdep/ManagedRoute.cpp index 746808112..325f4c803 100644 --- a/osdep/ManagedRoute.cpp +++ b/osdep/ManagedRoute.cpp @@ -526,14 +526,13 @@ bool ManagedRoute::sync() #ifdef __LINUX__ // ---------------------------------------------------------- - const char *const devptr = (_via) ? (const char *)0 : _device; - if ((leftt)&&(!LinuxNetLink::getInstance().routeIsSet(leftt,_via,_src,devptr))) { + if ((leftt)&&(!LinuxNetLink::getInstance().routeIsSet(leftt,_via,_src,_device))) { _applied[leftt] = false; // boolean unused - LinuxNetLink::getInstance().addRoute(leftt, _via, _src, devptr); + LinuxNetLink::getInstance().addRoute(leftt, _via, _src, _device); } - if ((rightt)&&(!LinuxNetLink::getInstance().routeIsSet(rightt,_via,_src,devptr))) { + if ((rightt)&&(!LinuxNetLink::getInstance().routeIsSet(rightt,_via,_src,_device))) { _applied[rightt] = false; // boolean unused - LinuxNetLink::getInstance().addRoute(rightt, _via, _src, devptr); + LinuxNetLink::getInstance().addRoute(rightt, _via, _src, _device); } #endif // __LINUX__ ----------------------------------------------------------