diff options
| author | Tom Gundersen <teg@jklm.no> | 2013-10-29 19:55:54 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2013-10-29 21:26:22 +0100 |
| commit | 3aeb37bc4f32b5edc334f2ac7c5d3c7b0a121328 (patch) | |
| tree | cf2d430f2196108c1f0ae92f1871cbe2a8ae75a5 | |
| parent | d4bbdb77aff9abb1aaf13f1f92fb5f9513688ce1 (diff) | |
rtnl: move set_link_properties to rtnl-utils
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | src/systemd/sd-rtnl.h | 2 | ||||
| -rw-r--r-- | src/udev/net/link-config.c | 48 |
3 files changed, 8 insertions, 47 deletions
diff --git a/Makefile.am b/Makefile.am index a06a79b958..85b23250b1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -183,6 +183,7 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/udev/net \ -I $(top_builddir)/src/udev \ -I $(top_srcdir)/src/libsystemd-bus \ + -I $(top_srcdir)/src/libsystemd-rtnl \ $(OUR_CPPFLAGS) AM_CFLAGS = $(OUR_CFLAGS) @@ -627,7 +628,9 @@ libsystemd_rtnl_la_SOURCES = \ src/systemd/sd-rtnl.h \ src/libsystemd-rtnl/sd-rtnl.c \ src/libsystemd-rtnl/rtnl-internal.h \ - src/libsystemd-rtnl/rtnl-message.c + src/libsystemd-rtnl/rtnl-message.c \ + src/libsystemd-rtnl/rtnl-util.h \ + src/libsystemd-rtnl/rtnl-util.c test_rtnl_SOURCES = \ src/libsystemd-rtnl/test-rtnl.c diff --git a/src/systemd/sd-rtnl.h b/src/systemd/sd-rtnl.h index a2400d8485..ae0dcd803e 100644 --- a/src/systemd/sd-rtnl.h +++ b/src/systemd/sd-rtnl.h @@ -19,6 +19,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#pragma once + #include <linux/rtnetlink.h> #include <linux/netlink.h> #include <stdint.h> diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index f93a4d835d..cf966bfe37 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -37,6 +37,7 @@ #include "conf-files.h" #include "fileio.h" #include "hashmap.h" +#include "rtnl-util.h" struct link_config_ctx { LIST_HEAD(link_config, links); @@ -266,51 +267,6 @@ int link_config_get(link_config_ctx *ctx, struct udev_device *device, link_confi return -ENOENT; } -static int rtnl_set_properties(sd_rtnl *rtnl, int ifindex, const char *name, const struct ether_addr *mac, unsigned int mtu) { - _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *message; - bool need_update = false; - int r; - - assert(rtnl); - assert(ifindex > 0); - - r = sd_rtnl_message_link_new(RTM_NEWLINK, ifindex, 0, 0, &message); - if (r < 0) - return r; - - if (name) { - r = sd_rtnl_message_append(message, IFLA_IFNAME, name); - if (r < 0) - return r; - - need_update = true; - } - - if (mac) { - r = sd_rtnl_message_append(message, IFLA_ADDRESS, mac); - if (r < 0) - return r; - - need_update = true; - } - - if (mtu > 0) { - r = sd_rtnl_message_append(message, IFLA_MTU, &mtu); - if (r < 0) - return r; - - need_update = true; - } - - if (need_update) { - r = sd_rtnl_send_with_reply_and_block(rtnl, message, 0, NULL); - if (r < 0) - return r; - } - - return 0; -} - static bool enable_name_policy(void) { _cleanup_free_ char *line; char *w, *state; @@ -498,7 +454,7 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev mac = config->mac; } - r = rtnl_set_properties(ctx->rtnl, ifindex, new_name, mac, config->mtu); + r = rtnl_set_link_properties(ctx->rtnl, ifindex, new_name, mac, config->mtu); if (r < 0) { log_warning("Could not set Name, MACAddress or MTU on %s: %s", name, strerror(-r)); return r; |