fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-28 22:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: allow NMDevice implementations to inject policy routing rules

Browse source
This commit is contained in:
Thomas Haller 2019-07-28 15:59:20 +02:00
parent 310ea1bc6a
commit 40ae1c8d7d
2 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/devices/nm-device.c
View file

@ -6587,11 +6587,15 @@ _routing_rules_sync (NMDevice *self,
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
NMPRulesManager *rules_manager = nm_netns_get_rules_manager (nm_device_get_netns (self));
NMDeviceClass *klass = NM_DEVICE_GET_CLASS (self);
gboolean untrack_only_dirty = FALSE;
gboolean keep_deleted_rules;
gpointer user_tag;
gpointer user_tag_1;
gpointer user_tag_2;
user_tag = priv;
/* take two arbitrary user-tag pointers that belong to @self. */
user_tag_1 = &priv->v4_route_table;
user_tag_2 = &priv->v6_route_table;
if (set_mode == NM_TERNARY_TRUE) {
NMConnection *applied_connection;
@ -6600,7 +6604,9 @@ _routing_rules_sync (NMDevice *self,
int is_ipv4;
untrack_only_dirty = TRUE;
nmp_rules_manager_set_dirty (rules_manager, user_tag);
nmp_rules_manager_set_dirty (rules_manager, user_tag_1);
if (klass->get_extra_rules)
nmp_rules_manager_set_dirty (rules_manager, user_tag_2);
applied_connection = nm_device_get_applied_connection (self);
@ -6625,13 +6631,30 @@ _routing_rules_sync (NMDevice *self,
nmp_rules_manager_track (rules_manager,
&plrule,
10,
user_tag,
user_tag_1,
NMP_RULES_MANAGER_EXTERN_WEAKLY_TRACKED_USER_TAG);
}
}
if (klass->get_extra_rules) {
gs_unref_ptrarray GPtrArray *extra_rules = NULL;
extra_rules = klass->get_extra_rules (self);
if (extra_rules) {
for (i = 0; i < extra_rules->len; i++) {
nmp_rules_manager_track (rules_manager,
NMP_OBJECT_CAST_ROUTING_RULE (extra_rules->pdata[i]),
10,
user_tag_2,
NMP_RULES_MANAGER_EXTERN_WEAKLY_TRACKED_USER_TAG);
}
}
}
}
nmp_rules_manager_untrack_all (rules_manager, user_tag, !untrack_only_dirty);
nmp_rules_manager_untrack_all (rules_manager, user_tag_1, !untrack_only_dirty);
if (klass->get_extra_rules)
nmp_rules_manager_untrack_all (rules_manager, user_tag_2, !untrack_only_dirty);
keep_deleted_rules = FALSE;
if (set_mode == NM_TERNARY_DEFAULT) {

6
src/devices/nm-device.h
View file

@ -320,6 +320,12 @@ typedef struct _NMDeviceClass {
void (* set_enabled) (NMDevice *self, gboolean enabled);
/* let the subclass return additional NMPlatformRoutingRule (in form of NMPObject
* pointers) that shall be added to the rules provided by this device.
* The returned GPtrArray will be g_ptr_array_unref()'ed. The subclass may or
* may not keep an additional reference and return this array again and again. */
GPtrArray *(*get_extra_rules) (NMDevice *self);
/* allow derived classes to override the result of nm_device_autoconnect_allowed().
* If the value changes, the class should call nm_device_emit_recheck_auto_activate(),
* which emits NM_DEVICE_RECHECK_AUTO_ACTIVATE signal. */