Merge pull request #30717 from yuwata/network-ref-unref

network: introduce address_ref() and friends

diff --cc src/network/networkd-dhcp4.c
Simple merge

diff --cc src/network/networkd-ndisc.c
Simple merge

diff --cc src/network/networkd-neighbor.c
Simple merge

diff --cc src/network/networkd-neighbor.h
index 0d1216c21c78869da99d86a666e01bdbd0a364ad,4a5503ca13f6f1cff4bbed78e996c14db12adaf9..93b3927f02ca0c3df119dafd9ed4a4ff6591928f
--- 1/src/network/networkd-neighbor.h
--- 2/src/network/networkd-neighbor.h
+++ b/src/network/networkd-neighbor.h
@@@ -26,11 -28,9 +28,12 @@@ typedef struct Neighbor 
          struct hw_addr_data ll_addr;
  } Neighbor;
  
- Neighbor *neighbor_free(Neighbor *neighbor);
+ Neighbor* neighbor_ref(Neighbor *neighbor);
+ Neighbor* neighbor_unref(Neighbor *neighbor);
  
 +int neighbor_get(Link *link, const Neighbor *in, Neighbor **ret);
 +int neighbor_remove(Neighbor *neighbor, Link *link);
 +
  int network_drop_invalid_neighbors(Network *network);
  
  int link_drop_managed_neighbors(Link *link);

diff --cc src/network/networkd-network.c
Simple merge

diff --cc src/network/networkd-nexthop.c
Simple merge

diff --cc src/network/networkd-nexthop.h
index 6bc736f54e2bd176f389db8000d4446ff70f722a,f79eda5cb1eaa777c2411b055f88ecfb798a57f6..bc2bacfa40da3db931d69784a3c59dd17112e907
--- 1/src/network/networkd-nexthop.h
--- 2/src/network/networkd-nexthop.h
+++ b/src/network/networkd-nexthop.h
@@@ -35,10 -37,9 +37,11 @@@ typedef struct NextHop 
          Hashmap *group;
  } NextHop;
  
- NextHop *nexthop_free(NextHop *nexthop);
+ NextHop* nexthop_ref(NextHop *nexthop);
+ NextHop* nexthop_unref(NextHop *nexthop);
  
 +int nexthop_remove(NextHop *nexthop, Manager *manager);
 +
  int network_drop_invalid_nexthops(Network *network);
  
  int link_drop_nexthops(Link *link, bool foreign);

diff --cc src/shared/conf-parser.c
Simple merge