return 0;
}
-static struct interface_proto_state *get_default_proto(void)
+static struct interface_proto_state *
+default_proto_attach(const struct proto_handler *h,
+ struct interface *iface,
+ struct uci_section *s)
{
struct interface_proto_state *proto;
proto = calloc(1, sizeof(*proto));
proto->free = default_proto_free;
proto->flags = PROTO_FLAG_IMMEDIATE;
+ proto->handler = no_proto_handler;
return proto;
}
-void proto_attach_interface(struct interface *iface, struct uci_section *s)
+static const struct proto_handler no_proto = {
+ .name = "none",
+ .attach = default_proto_attach,
+};
+
+static const struct proto_handler *
+get_proto_handler(const char *name)
{
- struct interface_proto_state *state = NULL;
- struct proto_handler *proto = NULL;
- const char *proto_name;
- const char *error = NULL;
+ struct proto_handler *proto;
- proto_name = uci_lookup_option_string(uci_ctx, s, "proto");
- if (!proto_name) {
- error = "NO_PROTO";
- goto error;
- }
+ if (!strcmp(name, "none"))
+ return &no_proto;
- if (!strcmp(proto_name, "none")) {
- state = get_default_proto();
- state->handler = no_proto_handler;
- goto out;
- }
+ if (!handlers.comp)
+ return NULL;
- if (handlers.comp)
- proto = avl_find_element(&handlers, proto_name, proto, avl);
+ return avl_find_element(&handlers, name, proto, avl);
+}
- if (!proto) {
- error = "INVALID_PROTO";
- goto error;
- }
+void
+proto_init_interface(struct interface *iface, struct uci_section *s)
+{
+ const struct proto_handler *proto = iface->proto_handler;
+ struct interface_proto_state *state = NULL;
- state = proto->attach(proto, iface, s);
+ if (proto)
+ state = proto->attach(proto, iface, s);
-error:
- if (error) {
- interface_add_error(iface, "proto", error, NULL, 0);
- state = get_default_proto();
+ if (!state) {
+ state = no_proto.attach(&no_proto, iface, s);
state->handler = invalid_proto_handler;
}
-out:
interface_set_proto_state(iface, state);
}
+void
+proto_attach_interface(struct interface *iface, const char *proto_name)
+{
+ const struct proto_handler *proto = NULL;
+
+ if (!proto_name) {
+ interface_add_error(iface, "proto", "NO_PROTO", NULL, 0);
+ return;
+ }
+
+ proto = get_proto_handler(proto_name);
+ if (!proto)
+ interface_add_error(iface, "proto", "INVALID_PROTO", NULL, 0);
-int interface_proto_event(struct interface_proto_state *proto,
- enum interface_proto_cmd cmd, bool force)
+ iface->proto_handler = proto;
+}
+
+int
+interface_proto_event(struct interface_proto_state *proto,
+ enum interface_proto_cmd cmd, bool force)
{
enum interface_event ev;
int ret;