static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) {
_cleanup_link_unref_ Link *link = NULL;
uint16_t type;
- char *ifname;
+ const char *ifname;
int r, ifindex;
assert(manager);
for (i = 0; i < n; i++) {
_cleanup_route_free_ Route *route = NULL;
- r = route_new_dynamic(&route);
+ r = route_new_dynamic(&route, RTPROT_DHCP);
if (r < 0) {
log_error_link(link, "Could not allocate route: %s",
strerror(-r));
}
if (r != -ENOENT) {
- r = route_new_dynamic(&route);
+ r = route_new_dynamic(&route, RTPROT_STATIC);
if (r < 0) {
log_error_link(link, "Could not allocate route: %s",
strerror(-r));
}
if (r >= 0) {
- r = route_new_dynamic(&route);
+ r = route_new_dynamic(&route, RTPROT_DHCP);
if (r < 0) {
log_error_link(link, "Could not allocate route: %s",
strerror(-r));
return r;
}
- r = route_new_dynamic(&route_gw);
+ r = route_new_dynamic(&route_gw, RTPROT_DHCP);
if (r < 0) {
log_error_link(link, "Could not allocate route: %s",
strerror(-r));
for (i = 0; i < n; i++) {
_cleanup_route_free_ Route *route = NULL;
- r = route_new_dynamic(&route);
+ r = route_new_dynamic(&route, RTPROT_UNSPEC);
if (r >= 0) {
route->family = AF_INET;
route->in_addr.in = routes[i].gw_addr;
_cleanup_route_free_ Route *route_gw = NULL;
_cleanup_route_free_ Route *route = NULL;
- r = route_new_dynamic(&route_gw);
+ r = route_new_dynamic(&route_gw, RTPROT_UNSPEC);
if (r >= 0) {
route_gw->family = AF_INET;
route_gw->dst_addr.in = gateway;
route_drop(route_gw, link, &route_drop_handler);
}
- r = route_new_dynamic(&route);
+ r = route_new_dynamic(&route, RTPROT_UNSPEC);
if (r >= 0) {
route->family = AF_INET;
route->in_addr.in = gateway;
address_drop(address, link, &address_drop_handler);
- r = route_new_dynamic(&route);
+ r = route_new_dynamic(&route, RTPROT_UNSPEC);
if (r < 0) {
log_error_link(link, "Could not allocate route: %s",
strerror(-r));
"MESSAGE=%-*s: enslaving by '%s'",
IFNAMSIZ,
link->ifname, link->network->bond->ifname,
- NETDEV(link->network->bond),
+ NETDEVIF(link->network->bond),
NULL);
r = netdev_join(link->network->bond, link, &netdev_join_handler);
"MESSAGE=%-*s: could not join netdev '%s': %s",
IFNAMSIZ,
link->ifname, link->network->bond->ifname, strerror(-r),
- NETDEV(link->network->bond),
+ NETDEVIF(link->network->bond),
NULL);
link_enter_failed(link);
return r;
"MESSAGE=%-*s: enslaving by '%s'",
IFNAMSIZ,
link->ifname, link->network->bridge->ifname,
- NETDEV(link->network->bridge),
+ NETDEVIF(link->network->bridge),
NULL);
r = netdev_join(link->network->bridge, link, &netdev_join_handler);
"MESSAGE=%-*s: could not join netdev '%s': %s",
IFNAMSIZ,
link->ifname, link->network->bridge->ifname, strerror(-r),
- NETDEV(link->network->bridge),
+ NETDEVIF(link->network->bridge),
NULL);
link_enter_failed(link);
return r;
"MESSAGE=%-*s: enslaving by '%s'",
IFNAMSIZ,
link->ifname, link->network->tunnel->ifname,
- NETDEV(link->network->tunnel),
+ NETDEVIF(link->network->tunnel),
NULL);
r = netdev_join(link->network->tunnel, link, &netdev_join_handler);
"MESSAGE=%-*s: could not join netdev '%s': %s",
IFNAMSIZ,
link->ifname, link->network->tunnel->ifname, strerror(-r),
- NETDEV(link->network->tunnel),
+ NETDEVIF(link->network->tunnel),
NULL);
link_enter_failed(link);
return r;
log_struct_link(LOG_DEBUG, link,
"MESSAGE=%-*s: enslaving by '%s'",
IFNAMSIZ,
- link->ifname, vlan->ifname, NETDEV(vlan), NULL);
+ link->ifname, vlan->ifname, NETDEVIF(vlan), NULL);
r = netdev_join(vlan, link, &netdev_join_handler);
if (r < 0) {
"MESSAGE=%-*s: could not join netdev '%s': %s",
IFNAMSIZ,
link->ifname, vlan->ifname, strerror(-r),
- NETDEV(vlan), NULL);
+ NETDEVIF(vlan), NULL);
link_enter_failed(link);
return r;
}
log_struct_link(LOG_DEBUG, link,
"MESSAGE=%-*s: enslaving by '%s'",
IFNAMSIZ,
- link->ifname, macvlan->ifname, NETDEV(macvlan), NULL);
+ link->ifname, macvlan->ifname, NETDEVIF(macvlan), NULL);
r = netdev_join(macvlan, link, &netdev_join_handler);
if (r < 0) {
"MESSAGE=%-*s: could not join netdev '%s': %s",
IFNAMSIZ,
link->ifname, macvlan->ifname, strerror(-r),
- NETDEV(macvlan), NULL);
+ NETDEVIF(macvlan), NULL);
link_enter_failed(link);
return r;
}
log_struct_link(LOG_DEBUG, link,
"MESSAGE=%*s: enslaving by '%s'",
IFNAMSIZ,
- link->ifname, vxlan->ifname, NETDEV(vxlan), NULL);
+ link->ifname, vxlan->ifname, NETDEVIF(vxlan), NULL);
r = netdev_join(vxlan, link, &netdev_join_handler);
if (r < 0) {
"MESSAGE=%*s: could not join netdev '%s': %s",
IFNAMSIZ,
link->ifname, vxlan->ifname, strerror(-r),
- NETDEV(vxlan), NULL);
+ NETDEVIF(vxlan), NULL);
link_enter_failed(link);
return r;
}
int link_update(Link *link, sd_rtnl_message *m) {
struct ether_addr mac;
- char *ifname;
+ const char *ifname;
int r;
assert(link);
fprintf(f,
"# This is private data. Do not parse.\n"
"ADMIN_STATE=%s\n"
- "OPER_STATE=%s\n"
- "FLAGS=%u\n",
- admin_state, oper_state, link->flags);
+ "OPER_STATE=%s\n",
+ admin_state, oper_state);
if (link->network) {
serialize_addresses(f, "DNS", link->network->dns);