projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix a logic error leading to segfaults on updates
[project/netifd.git]
/
proto-static.c
diff --git
a/proto-static.c
b/proto-static.c
index
b8f3412
..
ca39b7c
100644
(file)
--- a/
proto-static.c
+++ b/
proto-static.c
@@
-58,7
+58,7
@@
parse_addr(struct interface *iface, const char *str, bool v6, int mask)
interface_add_error(iface, "proto-static", "INVALID_ADDRESS", &str, 1);
return false;
}
interface_add_error(iface, "proto-static", "INVALID_ADDRESS", &str, 1);
return false;
}
- vlist_add(&iface->proto_addr, &addr->node);
+ vlist_add(&iface->proto_
ip.
addr, &addr->node);
return true;
}
return true;
}
@@
-94,7
+94,7
@@
parse_gateway_option(struct interface *iface, struct blob_attr *attr, bool v6)
}
route->mask = 0;
route->flags = DEVADDR_DEVICE | (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
}
route->mask = 0;
route->flags = DEVADDR_DEVICE | (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
- vlist_add(&iface->proto_route, &route->node);
+ vlist_add(&iface->proto_
ip.
route, &route->node);
return true;
}
return true;
}
@@
-142,7
+142,7
@@
proto_apply_static_settings(struct interface *iface, struct blob_attr *attr)
}
if (tb[OPT_DNS])
}
if (tb[OPT_DNS])
- interface_add_dns_server_list(
iface
, tb[OPT_DNS]);
+ interface_add_dns_server_list(
&iface->proto_ip
, tb[OPT_DNS]);
return 0;
return 0;
@@
-189,7
+189,7
@@
static_free(struct interface_proto_state *proto)
free(state);
}
free(state);
}
-struct interface_proto_state *
+st
atic st
ruct interface_proto_state *
static_attach(const struct proto_handler *h, struct interface *iface,
struct blob_attr *attr)
{
static_attach(const struct proto_handler *h, struct interface *iface,
struct blob_attr *attr)
{