l3cfg: various minor cleanup to NML3Cfg/NML3ConfigData

4 files changed, 61 insertions, 48 deletions

diff --git a/src/core/nm-l3-config-data.c b/src/core/nm-l3-config-data.c
index 51ea92f634..4af73b34e6 100644
--- a/src/core/nm-l3-config-data.c
+++ b/src/core/nm-l3-config-data.c
@@ -689,9 +689,11 @@ nm_l3_config_data_ref(const NML3ConfigData *self)
 const NML3ConfigData *
 nm_l3_config_data_ref_and_seal(const NML3ConfigData *self)
 {
-    nm_assert(_NM_IS_L3_CONFIG_DATA(self, TRUE));
-    ((NML3ConfigData *) self)->is_sealed = TRUE;
-    ((NML3ConfigData *) self)->ref_count++;
+    if (self) {
+        nm_assert(_NM_IS_L3_CONFIG_DATA(self, TRUE));
+        ((NML3ConfigData *) self)->is_sealed = TRUE;
+        ((NML3ConfigData *) self)->ref_count++;
+    }
     return self;
 }
 
@@ -2373,11 +2375,7 @@ nm_l3_config_data_add_dependent_routes(NML3ConfigData *self,
 /*****************************************************************************/
 
 static void
-_init_from_connection_ip(NML3ConfigData *self,
-                         int             addr_family,
-                         NMConnection *  connection,
-                         guint32         route_table,
-                         guint32         route_metric)
+_init_from_connection_ip(NML3ConfigData *self, int addr_family, NMConnection *connection)
 {
     const int          IS_IPv4 = NM_IS_IPv4(addr_family);
     NMSettingIPConfig *s_ip;
@@ -2409,17 +2407,17 @@ _init_from_connection_ip(NML3ConfigData *self,
 
         if (IS_IPv4) {
             r.r4 = (NMPlatformIP4Route){
-                .rt_source     = NM_IP_CONFIG_SOURCE_USER,
-                .gateway       = gateway_bin.addr4,
-                .table_coerced = nm_platform_route_table_coerce(route_table),
-                .metric        = route_metric,
+                .rt_source  = NM_IP_CONFIG_SOURCE_USER,
+                .gateway    = gateway_bin.addr4,
+                .table_any  = TRUE,
+                .metric_any = TRUE,
             };
         } else {
             r.r6 = (NMPlatformIP6Route){
-                .rt_source     = NM_IP_CONFIG_SOURCE_USER,
-                .gateway       = gateway_bin.addr6,
-                .table_coerced = nm_platform_route_table_coerce(route_table),
-                .metric        = route_metric,
+                .rt_source  = NM_IP_CONFIG_SOURCE_USER,
+                .gateway    = gateway_bin.addr6,
+                .table_any  = TRUE,
+                .metric_any = TRUE,
             };
         }
 
@@ -2474,6 +2472,7 @@ _init_from_connection_ip(NML3ConfigData *self,
         NMIPAddr           next_hop_bin;
         gint64             metric64;
         guint32            metric;
+        gboolean           metric_any;
         guint              plen;
 
         nm_assert(nm_ip_route_get_family(s_route) == addr_family);
@@ -2482,11 +2481,14 @@ _init_from_connection_ip(NML3ConfigData *self,
         nm_ip_route_get_next_hop_binary(s_route, &next_hop_bin);
 
         metric64 = nm_ip_route_get_metric(s_route);
-        if (metric64 < 0)
-            metric = route_metric;
-        else
-            metric = metric64;
-        metric = nm_utils_ip_route_metric_normalize(addr_family, metric);
+        if (metric64 < 0) {
+            metric_any = TRUE;
+            metric     = 0;
+        } else {
+            metric_any = FALSE;
+            metric     = metric64;
+            metric     = nm_utils_ip_route_metric_normalize(addr_family, metric);
+        }
 
         plen = nm_ip_route_get_prefix(s_route);
 
@@ -2494,25 +2496,27 @@ _init_from_connection_ip(NML3ConfigData *self,
 
         if (IS_IPv4) {
             r.r4 = (NMPlatformIP4Route){
-                .network   = network_bin.addr4,
-                .plen      = nm_ip_route_get_prefix(s_route),
-                .gateway   = next_hop_bin.addr4,
-                .metric    = metric,
-                .rt_source = NM_IP_CONFIG_SOURCE_USER,
+                .network    = network_bin.addr4,
+                .plen       = nm_ip_route_get_prefix(s_route),
+                .gateway    = next_hop_bin.addr4,
+                .metric_any = metric_any,
+                .metric     = metric,
+                .rt_source  = NM_IP_CONFIG_SOURCE_USER,
             };
             nm_assert(r.r4.plen <= 32);
         } else {
             r.r6 = (NMPlatformIP6Route){
-                .network   = network_bin.addr6,
-                .plen      = nm_ip_route_get_prefix(s_route),
-                .gateway   = next_hop_bin.addr6,
-                .metric    = metric,
-                .rt_source = NM_IP_CONFIG_SOURCE_USER,
+                .network    = network_bin.addr6,
+                .plen       = nm_ip_route_get_prefix(s_route),
+                .gateway    = next_hop_bin.addr6,
+                .metric_any = metric_any,
+                .metric     = metric,
+                .rt_source  = NM_IP_CONFIG_SOURCE_USER,
             };
             nm_assert(r.r6.plen <= 128);
         }
 
-        nm_utils_ip_route_attribute_to_platform(addr_family, s_route, &r.rx, route_table);
+        nm_utils_ip_route_attribute_to_platform(addr_family, s_route, &r.rx, -1);
 
         nm_l3_config_data_add_route(self, addr_family, NULL, &r.rx);
     }
@@ -2551,19 +2555,15 @@ _init_from_connection_ip(NML3ConfigData *self,
 NML3ConfigData *
 nm_l3_config_data_new_from_connection(NMDedupMultiIndex *multi_idx,
                                       int                ifindex,
-                                      NMConnection *     connection,
-                                      guint32            route_table_4,
-                                      guint32            route_table_6,
-                                      guint32            route_metric_4,
-                                      guint32            route_metric_6)
+                                      NMConnection *     connection)
 {
     NML3ConfigData *self;
     NMSettingProxy *s_proxy;
 
     self = nm_l3_config_data_new(multi_idx, ifindex, NM_IP_CONFIG_SOURCE_USER);
 
-    _init_from_connection_ip(self, AF_INET, connection, route_table_4, route_metric_4);
-    _init_from_connection_ip(self, AF_INET6, connection, route_table_6, route_metric_6);
+    _init_from_connection_ip(self, AF_INET, connection);
+    _init_from_connection_ip(self, AF_INET6, connection);
 
     s_proxy = _nm_connection_get_setting(connection, NM_TYPE_SETTING_PROXY);
     if (s_proxy) {
@@ -2919,7 +2919,7 @@ nm_l3_config_data_new_clone(const NML3ConfigData *src, int ifindex)
     if (ifindex <= 0)
         ifindex = src->ifindex;
 
-    self = nm_l3_config_data_new(src->multi_idx, ifindex, NM_IP_CONFIG_SOURCE_UNKNOWN);
+    self = nm_l3_config_data_new(src->multi_idx, ifindex, src->source);
     nm_l3_config_data_merge(self,
                             src,
                             NM_L3_CONFIG_MERGE_FLAGS_CLONE,
diff --git a/src/core/nm-l3-config-data.h b/src/core/nm-l3-config-data.h
index 9274d8896d..0ea5bd0e69 100644
--- a/src/core/nm-l3-config-data.h
+++ b/src/core/nm-l3-config-data.h
@@ -138,11 +138,7 @@ NML3ConfigData *nm_l3_config_data_new_clone(const NML3ConfigData *src, int ifind
 
 NML3ConfigData *nm_l3_config_data_new_from_connection(NMDedupMultiIndex *multi_idx,
                                                       int                ifindex,
-                                                      NMConnection *     connection,
-                                                      guint32            route_table_4,
-                                                      guint32            route_table_6,
-                                                      guint32            route_metric_4,
-                                                      guint32            route_metric_6);
+                                                      NMConnection *     connection);
 
 NML3ConfigData *nm_l3_config_data_new_from_platform(NMDedupMultiIndex *       multi_idx,
                                                     int                       ifindex,
diff --git a/src/core/nm-l3cfg.c b/src/core/nm-l3cfg.c
index 2ea93677ea..303c5c9591 100644
--- a/src/core/nm-l3cfg.c
+++ b/src/core/nm-l3cfg.c
@@ -1134,9 +1134,9 @@ _l3_acd_nacd_event_down_timeout_cb(gpointer user_data)
 static gboolean
 _l3_acd_nacd_event(int fd, GIOCondition condition, gpointer user_data)
 {
-    NML3Cfg *self    = user_data;
-    gboolean success = FALSE;
-    int      r;
+    gs_unref_object NML3Cfg *self    = g_object_ref(user_data);
+    gboolean                 success = FALSE;
+    int                      r;
 
     nm_assert(NM_IS_L3CFG(self));
     nm_assert(self->priv.p->nacd);
@@ -1153,6 +1153,13 @@ _l3_acd_nacd_event(int fd, GIOCondition condition, gpointer user_data)
         AcdData *          acd_data;
         NAcdEvent *        event;
 
+        if (!self->priv.p->nacd) {
+            /* In the loop we emit signals, where *anything* might happen.
+             * Check that we still have the nacd instance. */
+            success = TRUE;
+            goto out;
+        }
+
         r = n_acd_pop_event(self->priv.p->nacd, &event);
         if (r) {
             _LOGT("acd: pop-event failed with error %d", r);
@@ -2595,6 +2602,14 @@ nm_l3cfg_commit_on_idle_schedule(NML3Cfg *self)
     return TRUE;
 }
 
+gboolean
+nm_l3cfg_commit_on_idle_is_scheduled(NML3Cfg *self)
+{
+    nm_assert(NM_IS_L3CFG(self));
+
+    return !!(self->priv.p->commit_on_idle_source);
+}
+
 /*****************************************************************************/
 
 #define _l3_config_datas_at(l3_config_datas, idx) \
diff --git a/src/core/nm-l3cfg.h b/src/core/nm-l3cfg.h
index d4438cbe3a..29946bdf8e 100644
--- a/src/core/nm-l3cfg.h
+++ b/src/core/nm-l3cfg.h
@@ -334,6 +334,8 @@ void nm_l3cfg_commit(NML3Cfg *self, NML3CfgCommitType commit_type);
 
 gboolean nm_l3cfg_commit_on_idle_schedule(NML3Cfg *self);
 
+gboolean nm_l3cfg_commit_on_idle_is_scheduled(NML3Cfg *self);
+
 /*****************************************************************************/
 
 const NML3AcdAddrInfo *nm_l3cfg_get_acd_addr_info(NML3Cfg *self, in_addr_t addr);