[arch-commits] Commit in systemd/trunk (2 files)

[Dave Reisner]

    Date: Friday, July 4, 2014 @ 15:52:03
  Author: dreisner
Revision: 216490

upgpkg: systemd 215-1

- backport fix for tracking of networkd-added addresses

Added:
  systemd/trunk/0001-networkd-properly-track-addresses-when-first-added.patch
Modified:
  systemd/trunk/PKGBUILD

---------------------------------------------------------------+
 0001-networkd-properly-track-addresses-when-first-added.patch |  104 ++++++++++
 PKGBUILD                                                      |   18 +
 2 files changed, 117 insertions(+), 5 deletions(-)

Added: 0001-networkd-properly-track-addresses-when-first-added.patch
===================================================================
--- 0001-networkd-properly-track-addresses-when-first-added.patch	                        (rev 0)
+++ 0001-networkd-properly-track-addresses-when-first-added.patch	2014-07-04 13:52:03 UTC (rev 216490)
@@ -0,0 +1,104 @@
+From 4958aee4977f325be19f0e1e4b424922c3cada5f Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg at jklm.no>
+Date: Thu, 3 Jul 2014 22:47:51 +0200
+Subject: [PATCH] networkd: properly track addresses when first added
+
+When doing a NEWADDR, the reply we get back is the NEWADDR itself, rather
+than just an empty ack (unlike how NEWLINK works). For this reason, the
+process that did the NEWADDR does not get the broadcast message.
+
+We were only listening for broadcast messages, and hence not tracking the
+addresses we added ourselves. This went unnoticed as the kernel will usually
+send NEWADDR messages from time to time anyway, so things would mostly work,
+but in the worst case we would not notice that a routable address was available
+and consider ourselves offline.
+---
+ src/network/networkd-link.c | 54 +++++++++++++++++++++++++--------------------
+ 1 file changed, 30 insertions(+), 24 deletions(-)
+
+diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
+index 961c1ab..6257372 100644
+--- a/src/network/networkd-link.c
++++ b/src/network/networkd-link.c
+@@ -599,10 +599,35 @@ static int route_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata)
+         return 0;
+ }
+ 
++static int link_get_address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
++        _cleanup_link_unref_ Link *link = userdata;
++        int r;
++
++        assert(rtnl);
++        assert(m);
++        assert(link);
++        assert(link->manager);
++
++        for (; m; m = sd_rtnl_message_next(m)) {
++                r = sd_rtnl_message_get_errno(m);
++                if (r < 0) {
++                        log_debug_link(link, "getting address failed: %s", strerror(-r));
++                        continue;
++                }
++
++                r = link_rtnl_process_address(rtnl, m, link->manager);
++                if (r < 0)
++                        log_warning_link(link, "could not process address: %s", strerror(-r));
++        }
++
++        return 1;
++}
++
+ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+         _cleanup_link_unref_ Link *link = userdata;
+         int r;
+ 
++        assert(rtnl);
+         assert(m);
+         assert(link);
+         assert(link->ifname);
+@@ -623,6 +648,11 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+                                 link->ifname, strerror(-r),
+                                 "ERRNO=%d", -r,
+                                 NULL);
++        if (r >= 0) {
++                /* calling handler directly so take a ref */
++                link_ref(link);
++                link_get_address_handler(rtnl, m, link);
++        }
+ 
+         if (link->addr_messages == 0) {
+                 log_debug_link(link, "addresses set");
+@@ -2233,30 +2263,6 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use
+         return 1;
+ }
+ 
+-static int link_get_address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+-        _cleanup_link_unref_ Link *link = userdata;
+-        int r;
+-
+-        assert(rtnl);
+-        assert(m);
+-        assert(link);
+-        assert(link->manager);
+-
+-        for (; m; m = sd_rtnl_message_next(m)) {
+-                r = sd_rtnl_message_get_errno(m);
+-                if (r < 0) {
+-                        log_debug_link(link, "getting address failed: %s", strerror(-r));
+-                        continue;
+-                }
+-
+-                r = link_rtnl_process_address(rtnl, m, link->manager);
+-                if (r < 0)
+-                        log_warning_link(link, "could not process address: %s", strerror(-r));
+-        }
+-
+-        return 1;
+-}
+-
+ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) {
+         Link *link;
+         _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
+-- 
+2.0.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-04 13:21:49 UTC (rev 216489)
+++ PKGBUILD	2014-07-04 13:52:03 UTC (rev 216490)
@@ -3,8 +3,8 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
-pkgver=214
-pkgrel=2
+pkgver=215
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -15,12 +15,20 @@
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-systemd'
-        'initcpio-install-udev')
-md5sums=('eac4f9fc5bd18a0efc3fc20858baacf3'
+        'initcpio-install-udev'
+        '0001-networkd-properly-track-addresses-when-first-added.patch')
+md5sums=('d2603e9fffd8b18d242543e36f2e7d31'
          '29245f7a240bfba66e2b1783b63b6b40'
          '66cca7318e13eaf37c5b7db2efa69846'
-         'bde43090d4ac0ef048e3eaee8202a407')
+         'bde43090d4ac0ef048e3eaee8202a407'
+         '2d237a277a12b3801c88d159d64a7413')
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 <"$srcdir"/0001-networkd-properly-track-addresses-when-first-added.patch
+}
+
 build() {
   cd "$pkgname-$pkgver"