From 9a988d16fbdfa1472980257b2e41bd3aa8bcb00d Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 3 Jan 2024 04:40:44 +0900
Subject: [PATCH] network/nexthop: also remove nexthop on cancelling request

Otherwise, the nexthop may arrive after we call
link_drop_foreign_address() or so on reconfiguring interface.
---
 src/network/networkd-link.c    |  7 +++++++
 src/network/networkd-nexthop.c | 12 +++---------
 src/network/networkd-nexthop.h |  2 ++
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 69f6a0ce726..5f84b5af9ab 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -961,6 +961,13 @@ static int link_drop_requests(Link *link) {
                                         RET_GATHER(ret, neighbor_remove(neighbor, link));
                                 break;
                         }
+                        case REQUEST_TYPE_NEXTHOP: {
+                                NextHop *nexthop = ASSERT_PTR(req->userdata);
+
+                                if (nexthop_get_by_id(link->manager, nexthop->id, NULL) < 0)
+                                        RET_GATHER(ret, nexthop_remove(nexthop, link->manager));
+                                break;
+                        }
                         default:
                                 ;
                         }
diff --git a/src/network/networkd-nexthop.c b/src/network/networkd-nexthop.c
index 1ab56a8ffdb..148417d2c67 100644
--- a/src/network/networkd-nexthop.c
+++ b/src/network/networkd-nexthop.c
@@ -424,17 +424,14 @@ static int nexthop_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, Link
         return 1;
 }
 
-static int nexthop_remove(NextHop *nexthop) {
+int nexthop_remove(NextHop *nexthop, Manager *manager) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
-        Manager *manager;
         Link *link = NULL;
-        Request *req;
         int r;
 
         assert(nexthop);
         assert(nexthop->id > 0);
-
-        manager = ASSERT_PTR(nexthop->manager);
+        assert(manager);
 
         /* link may be NULL. */
         (void) link_get_by_index(manager, nexthop->ifindex, &link);
@@ -457,9 +454,6 @@ static int nexthop_remove(NextHop *nexthop) {
         link_ref(link); /* link may be NULL, link_ref() is OK with that */
 
         nexthop_enter_removing(nexthop);
-        if (nexthop_get_request_by_id(manager, nexthop->id, &req) >= 0)
-                nexthop_enter_removing(req->userdata);
-
         return 0;
 }
 
@@ -780,7 +774,7 @@ int link_drop_nexthops(Link *link, bool foreign) {
                 if (!nexthop_is_marked(nexthop))
                         continue;
 
-                RET_GATHER(r, nexthop_remove(nexthop));
+                RET_GATHER(r, nexthop_remove(nexthop, link->manager));
         }
 
         return r;
diff --git a/src/network/networkd-nexthop.h b/src/network/networkd-nexthop.h
index 564b52532fa..142538ff579 100644
--- a/src/network/networkd-nexthop.h
+++ b/src/network/networkd-nexthop.h
@@ -37,6 +37,8 @@ typedef struct NextHop {
 
 NextHop *nexthop_free(NextHop *nexthop);
 
+int nexthop_remove(NextHop *nexthop, Manager *manager);
+
 int network_drop_invalid_nexthops(Network *network);
 
 int link_drop_nexthops(Link *link, bool foreign);