shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Code

sd-ipv4ll: don't allow changing MAC address whilst running

Browse Source 
This requires the caller to stop and restart the statemachine if they want to
change the MAC address.
This commit is contained in:
Tom Gundersen 2015-08-20 11:26:57 +02:00
parent 94a355a130
commit 5707940ed3
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libsystemd-network/sd-ipv4ll.c
View File

@ -2,6 +2,7 @@
This file is part of systemd. This file is part of systemd.
Copyright (C) 2014 Axis Communications AB. All rights reserved. Copyright (C) 2014 Axis Communications AB. All rights reserved.
Copyright (C) 2015 Tom Gundersen
systemd is free software; you can redistribute it and/or modify it systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by under the terms of the GNU Lesser General Public License as published by
@ -395,29 +396,15 @@ int sd_ipv4ll_set_index(sd_ipv4ll *ll, int interface_index) {
} }
int sd_ipv4ll_set_mac(sd_ipv4ll *ll, const struct ether_addr *addr) { int sd_ipv4ll_set_mac(sd_ipv4ll *ll, const struct ether_addr *addr) {
bool need_restart = false;
assert_return(ll, -EINVAL); assert_return(ll, -EINVAL);
assert_return(addr, -EINVAL); assert_return(addr, -EINVAL);
assert_return(IN_SET(ll->state, IPV4LL_STATE_INIT, IPV4LL_STATE_STOPPED), -EBUSY);
if (memcmp(&ll->mac_addr, addr, ETH_ALEN) == 0) if (memcmp(&ll->mac_addr, addr, ETH_ALEN) == 0)
return 0; return 0;
if (!IN_SET(ll->state, IPV4LL_STATE_INIT, IPV4LL_STATE_STOPPED)) {
log_ipv4ll(ll, "Changing MAC address on running IPv4LL "
"client, restarting");
ll = ipv4ll_stop(ll, IPV4LL_EVENT_STOP);
need_restart = true;
}
if (!ll)
return 0;
memcpy(&ll->mac_addr, addr, ETH_ALEN); memcpy(&ll->mac_addr, addr, ETH_ALEN);
if (need_restart)
sd_ipv4ll_start(ll);
return 0; return 0;
} }