colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform: minor fixes in NMPRuleManager (assert and types)

Browse Source 
- 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.
This commit is contained in:
Thomas Haller
2019-04-10 13:25:10 +02:00
parent 563894be8c
commit dd9e646306
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/platform/nmp-rules-manager.c
View File

@@ -77,7 +77,7 @@ typedef struct {
CList user_tag_lst; CList user_tag_lst;
guint32 track_priority_val; guint32 track_priority_val;
bool track_priority_present; bool track_priority_present:1;
bool dirty:1; bool dirty:1;
} RulesData; } RulesData;
@@ -551,9 +551,13 @@ nmp_rules_manager_sync (NMPRulesManager *self,
void void
nmp_rules_manager_track_default (NMPRulesManager *self, nmp_rules_manager_track_default (NMPRulesManager *self,
int addr_family, int addr_family,
int track_priority, gint32 track_priority,
gconstpointer user_tag) 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`. */ /* track the default rules. See also `man ip-rule`. */
if (NM_IN_SET (addr_family, AF_UNSPEC, AF_INET)) { if (NM_IN_SET (addr_family, AF_UNSPEC, AF_INET)) {

2
src/platform/nmp-rules-manager.h
View File

@@ -39,7 +39,7 @@ void nmp_rules_manager_track (NMPRulesManager *self,
void nmp_rules_manager_track_default (NMPRulesManager *self, void nmp_rules_manager_track_default (NMPRulesManager *self,
int addr_family, int addr_family,
int track_priority, gint32 track_priority,
gconstpointer user_tag); gconstpointer user_tag);
void nmp_rules_manager_untrack (NMPRulesManager *self, void nmp_rules_manager_untrack (NMPRulesManager *self,