proto-shell: rework task statemachine

[project/netifd.git] / proto.h

diff --git a/proto.h b/proto.h
index 776cc36..c401d6f 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -1,11 +1,14 @@
 #ifndef __NETIFD_PROTO_H
 #define __NETIFD_PROTO_H
 
+struct interface;
 struct interface_proto_state;
+struct proto_handler;
 
 enum interface_proto_event {
        IFPEV_UP,
        IFPEV_DOWN,
+       IFPEV_LINK_LOST,
 };
 
 enum interface_proto_cmd {
@@ -15,30 +18,42 @@ enum interface_proto_cmd {
 
 enum {
        PROTO_FLAG_IMMEDIATE = (1 << 0),
+       PROTO_FLAG_NODEV = (1 << 1),
+       PROTO_FLAG_INIT_AVAILABLE = (1 << 2),
 };
 
 struct interface_proto_state {
+       const struct proto_handler *handler;
        struct interface *iface;
-       unsigned int flags;
 
        /* filled in by the protocol user */
        void (*proto_event)(struct interface_proto_state *, enum interface_proto_event ev);
 
        /* filled in by the protocol handler */
-       int (*handler)(struct interface_proto_state *, enum interface_proto_cmd cmd, bool force);
+       int (*notify)(struct interface_proto_state *, struct blob_attr *data);
+       int (*cb)(struct interface_proto_state *, enum interface_proto_cmd cmd, bool force);
        void (*free)(struct interface_proto_state *);
 };
 
+
 struct proto_handler {
        struct avl_node avl;
 
+       unsigned int flags;
+
        const char *name;
-       struct interface_proto_state * (*attach)(struct proto_handler *h, struct interface *);
+       const struct config_param_list *config_params;
+
+       struct interface_proto_state *(*attach)(const struct proto_handler *h,
+               struct interface *iface, struct blob_attr *attr);
 };
 
 void add_proto_handler(struct proto_handler *p);
-void proto_attach_interface(struct interface *iface, struct uci_section *s);
+void proto_init_interface(struct interface *iface, struct blob_attr *attr);
+void proto_attach_interface(struct interface *iface, const char *proto_name);
 int interface_proto_event(struct interface_proto_state *proto,
                          enum interface_proto_cmd cmd, bool force);
+struct device_addr *proto_parse_ip_addr_string(const char *str, bool v6, int mask);
+unsigned int parse_netmask_string(const char *str, bool v6);
 
 #endif