diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-04-10 13:25:10 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-04-13 18:17:16 +0200 |
| commit | dd9e646306b640bff3294dea3b56be1cc77a954e (patch) | |
| tree | d243961cd4ddb8727289912a54148945703adaa1 | |
| parent | 563894be8c5a3bee86708a1101cbe85f11e78a0d (diff) | |
| download | NetworkManager-dd9e646306b640bff3294dea3b56be1cc77a954e.tar.gz | |
platform: minor fixes in NMPRuleManager (assert and types)
- fix the argument type to be "gint32" and not "int".
- assert in nmp_rules_manager_track_default() for the input
arguments.
- use boolean bitfield in private data.
| -rw-r--r-- | src/platform/nmp-rules-manager.c | 8 | ||||
| -rw-r--r-- | src/platform/nmp-rules-manager.h | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/platform/nmp-rules-manager.c b/src/platform/nmp-rules-manager.c index 3db4129b7e..2ea159a0fb 100644 --- a/src/platform/nmp-rules-manager.c +++ b/src/platform/nmp-rules-manager.c @@ -77,7 +77,7 @@ typedef struct { CList user_tag_lst; guint32 track_priority_val; - bool track_priority_present; + bool track_priority_present:1; bool dirty:1; } RulesData; @@ -551,9 +551,13 @@ nmp_rules_manager_sync (NMPRulesManager *self, void nmp_rules_manager_track_default (NMPRulesManager *self, int addr_family, - int track_priority, + gint32 track_priority, gconstpointer user_tag) { + g_return_if_fail (NMP_IS_RULES_MANAGER (self)); + + nm_assert (NM_IN_SET (addr_family, AF_UNSPEC, AF_INET, AF_INET6)); + /* track the default rules. See also `man ip-rule`. */ if (NM_IN_SET (addr_family, AF_UNSPEC, AF_INET)) { diff --git a/src/platform/nmp-rules-manager.h b/src/platform/nmp-rules-manager.h index b9c025f0e3..57dc267fb8 100644 --- a/src/platform/nmp-rules-manager.h +++ b/src/platform/nmp-rules-manager.h @@ -39,7 +39,7 @@ void nmp_rules_manager_track (NMPRulesManager *self, void nmp_rules_manager_track_default (NMPRulesManager *self, int addr_family, - int track_priority, + gint32 track_priority, gconstpointer user_tag); void nmp_rules_manager_untrack (NMPRulesManager *self, |