summaryrefslogtreecommitdiff
path: root/src/udev/net
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2013-10-26 18:54:16 +0200
committerTom Gundersen <teg@jklm.no>2013-10-27 22:23:58 +0100
commit43b3a5ef61859f06cdbaf26765cab8e1adac4296 (patch)
treeb2792cf4777a8a8ec53ca8f95739fe5154cdc85b /src/udev/net
parent65f568bbeb9b8c70200e44c19a797df3a0bfd485 (diff)
udev: link-config: add rtnl support
This adds support for setting the mac address, name and mtu. Example: [Link] MTU=1450 MACAddress=98:76:54:32:10:ab Name=wireless0
Diffstat (limited to 'src/udev/net')
-rw-r--r--src/udev/net/link-config-gperf.gperf3
-rw-r--r--src/udev/net/link-config.c77
-rw-r--r--src/udev/net/link-config.h3
3 files changed, 81 insertions, 2 deletions
diff --git a/src/udev/net/link-config-gperf.gperf b/src/udev/net/link-config-gperf.gperf
index 9e2f4d4f52..182a664192 100644
--- a/src/udev/net/link-config-gperf.gperf
+++ b/src/udev/net/link-config-gperf.gperf
@@ -19,6 +19,9 @@ Match.Path, config_parse_string, 0, offsetof(link
Match.Driver, config_parse_string, 0, offsetof(link_config, match_driver)
Match.Type, config_parse_string, 0, offsetof(link_config, match_type)
Link.Description, config_parse_string, 0, offsetof(link_config, description)
+Link.MACAddress, config_parse_string, 0, offsetof(link_config, mac)
+Link.Name, config_parse_string, 0, offsetof(link_config, name)
+Link.MTU, config_parse_unsigned, 0, offsetof(link_config, mtu)
Link.SpeedMBytes, config_parse_unsigned, 0, offsetof(link_config, speed)
Link.Duplex, config_parse_string, 0, offsetof(link_config, duplex)
Link.WakeOnLan, config_parse_string, 0, offsetof(link_config, wol)
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 3beb28acba..902ed0955d 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -19,10 +19,14 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include <netinet/ether.h>
+
#include "link-config.h"
#include "ethtool-util.h"
+#include "libudev-private.h"
+#include "sd-rtnl.h"
#include "util.h"
#include "log.h"
#include "strv.h"
@@ -35,6 +39,8 @@ struct link_config_ctx {
int ethtool_fd;
+ sd_rtnl *rtnl;
+
char **link_dirs;
usec_t *link_dirs_ts_usec;
};
@@ -56,6 +62,12 @@ int link_config_ctx_new(link_config_ctx **ret) {
return r;
}
+ r = sd_rtnl_open(0, &ctx->rtnl);
+ if (r < 0) {
+ link_config_ctx_free(ctx);
+ return r;
+ }
+
LIST_HEAD_INIT(ctx->links);
ctx->link_dirs = strv_new("/etc/net/links",
@@ -104,7 +116,11 @@ void link_config_ctx_free(link_config_ctx *ctx) {
if (!ctx)
return;
- close_nointr_nofail(ctx->ethtool_fd);
+ if (ctx->ethtool_fd >= 0)
+ close_nointr_nofail(ctx->ethtool_fd);
+
+ sd_rtnl_unref(ctx->rtnl);
+
strv_free(ctx->link_dirs);
free(ctx->link_dirs_ts_usec);
link_configs_free(ctx);
@@ -234,9 +250,54 @@ 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 char *mac, unsigned int mtu) {
+ _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *message;
+ bool need_update;
+ 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, ether_aton(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, 250 * USEC_PER_MSEC, NULL);
+ if (r < 0)
+ return r;
+ }
+
+ return 0;
+}
+
int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_device *device) {
const char *name;
- int r;
+ int r, ifindex;
name = udev_device_get_sysname(device);
if (!name)
@@ -275,5 +336,17 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev
log_info("Set WakeOnLan of %s to %s", name, config->wol);
}
+ ifindex = udev_device_get_ifindex(device);
+ if (ifindex <= 0) {
+ log_warning("Could not find ifindex");
+ return -ENODEV;
+ }
+
+ r = rtnl_set_properties(ctx->rtnl, ifindex, config->name, config->mac, config->mtu);
+ if (r < 0) {
+ log_warning("Could not set Name, MACAddress or MTU on %s", name);
+ return r;
+ }
+
return 0;
}
diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h
index 57d2c9c3cd..849e481520 100644
--- a/src/udev/net/link-config.h
+++ b/src/udev/net/link-config.h
@@ -38,6 +38,9 @@ struct link_config {
char *match_type;
char *description;
+ char *mac;
+ char *name;
+ unsigned int mtu;
unsigned int speed;
char *duplex;
char *wol;