[systemd-commits] 3 commits - src/libsystemd-network src/network

[Tom Gundersen]

 src/libsystemd-network/network-internal.c |    8 ++++----
 src/network/networkd-fdb.c                |    3 +--
 src/network/networkd-link.c               |    2 +-
 src/network/networkd-manager.c            |   19 ++++++++++++-------
 src/network/networkd.h                    |    2 +-
 5 files changed, 19 insertions(+), 15 deletions(-)

New commits:
commit 910889b6170cb484e0bf0b8a3a13c1ba6226ac07
Author: Tom Gundersen <teg at jklm.no>
Date:   Wed Feb 11 13:10:48 2015 +0100

    network-internal: fix inverted matching
    
    This fixes the test-suite again.

diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c
index 870858c..41f43d3 100644
--- a/src/libsystemd-network/network-internal.c
+++ b/src/libsystemd-network/network-internal.c
@@ -122,7 +122,7 @@ bool net_match_config(const struct ether_addr *match_mac,
                         return false;
 
                 STRV_FOREACH(match_path, match_paths)
-                        if (fnmatch(*match_path, dev_path, 0) != 0)
+                        if (fnmatch(*match_path, dev_path, 0) == 0)
                                 return true;
 
                 return false;
@@ -133,7 +133,7 @@ bool net_match_config(const struct ether_addr *match_mac,
                         return false;
 
                 STRV_FOREACH(match_driver, match_drivers)
-                        if (fnmatch(*match_driver, dev_driver, 0) != 0)
+                        if (fnmatch(*match_driver, dev_driver, 0) == 0)
                                 return true;
 
                 return false;
@@ -144,7 +144,7 @@ bool net_match_config(const struct ether_addr *match_mac,
                         return false;
 
                 STRV_FOREACH(match_type, match_types)
-                        if (fnmatch(*match_type, dev_type, 0) != 0)
+                        if (fnmatch(*match_type, dev_type, 0) == 0)
                                 return true;
 
                 return false;
@@ -155,7 +155,7 @@ bool net_match_config(const struct ether_addr *match_mac,
                         return false;
 
                 STRV_FOREACH(match_name, match_names)
-                        if (fnmatch(*match_name, dev_name, 0) != 0)
+                        if (fnmatch(*match_name, dev_name, 0) == 0)
                                 return true;
 
                 return false;

commit a245ced0d7b0af9ae5438d978e24183672a0a4d9
Author: Tom Gundersen <teg at jklm.no>
Date:   Wed Feb 11 13:02:58 2015 +0100

    networkd: fdb - fix const warning

diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c
index 78488c9..feab8d4 100644
--- a/src/network/networkd-fdb.c
+++ b/src/network/networkd-fdb.c
@@ -99,8 +99,7 @@ static int set_fdb_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
 }
 
 /* send a request to the kernel to add a FDB entry in its static MAC table. */
-int fdb_entry_configure(Link *link,
-                        FdbEntry *const fdb_entry) {
+int fdb_entry_configure(Link *const link, FdbEntry *const fdb_entry) {
         _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
         sd_rtnl *rtnl;
         int r;
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 3f15394..7b48816 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -728,7 +728,7 @@ int link_address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata)
         return 1;
 }
 
-static int link_set_bridge_fdb(const Link *const link) {
+static int link_set_bridge_fdb(Link *const link) {
         FdbEntry *fdb_entry;
         int r = 0;
 
diff --git a/src/network/networkd.h b/src/network/networkd.h
index fdd0684..7f1f06c 100644
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -383,7 +383,7 @@ int config_parse_label(const char *unit, const char *filename, unsigned line,
                        int ltype, const char *rvalue, void *data, void *userdata);
 
 /* Forwarding database table. */
-int fdb_entry_configure(Link *link, FdbEntry *const fdb_entry);
+int fdb_entry_configure(Link *const link, FdbEntry *const fdb_entry);
 void fdb_entry_free(FdbEntry *fdb_entry);
 int fdb_entry_new_static(Network *const network, const unsigned section, FdbEntry **ret);
 

commit f806f64c7460632d6b6c27865e1554cb6c934320
Author: Tom Gundersen <teg at jklm.no>
Date:   Wed Feb 11 12:57:58 2015 +0100

    networkd: don't do exit-on-idle if there is something wrong with the dbus connection
    
    Just fall back to plain old event loop in this (highly unlikely) case.
    
    In the glorious future when kdbus is upstream we can of course drop all this.

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 4617f11..ce97ac0 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -534,13 +534,18 @@ static bool manager_check_idle(void *userdata) {
 int manager_run(Manager *m) {
         assert(m);
 
-        return bus_event_loop_with_idle(
-                        m->event,
-                        m->bus,
-                        "org.freedesktop.network1",
-                        DEFAULT_EXIT_USEC,
-                        manager_check_idle,
-                        m);
+        if (m->bus)
+                return bus_event_loop_with_idle(
+                                m->event,
+                                m->bus,
+                                "org.freedesktop.network1",
+                                DEFAULT_EXIT_USEC,
+                                manager_check_idle,
+                                m);
+        else
+                /* failed to connect to the bus, so we lose exit-on-idle logic,
+                   this should not happen except if dbus is not around at all */
+                return sd_event_loop(m->event);
 }
 
 int manager_load_config(Manager *m) {