Avoid casting function pointers.

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 3d6ac782735d4fd9254dbc78051ed5fe5616440a..a856180686de947c494e164ab47252a58aafb4cd 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -76,6 +76,15 @@ struct meshlink_open_params {
        size_t keylen;
 };
 
+/// Device class traits
+typedef struct {
+       int pinginterval;
+       int pingtimeout;
+       unsigned int min_connects;
+       unsigned int max_connects;
+       int edge_weight;
+} dev_class_traits_t;
+
 /// A handle for an instance of MeshLink.
 struct meshlink_handle {
        // public members
@@ -127,6 +136,7 @@ struct meshlink_handle {
 
        // Infrequently used callbacks
        meshlink_node_status_cb_t node_status_cb;
+       meshlink_node_pmtu_cb_t node_pmtu_cb;
        meshlink_channel_accept_cb_t channel_accept_cb;
        meshlink_node_duplicate_cb_t node_duplicate_cb;
        meshlink_connection_try_cb_t connection_try_cb;
@@ -141,11 +151,11 @@ struct meshlink_handle {
        dev_class_t devclass;
 
        int invitation_timeout;
-       int pinginterval;       /* seconds between pings */
-       int pingtimeout;        /* seconds to wait for response */
        int maxtimeout;
        int udp_choice;
 
+       dev_class_traits_t dev_class_traits[DEV_CLASS_COUNT];
+
        int netns;
 
        bool default_blacklist;
@@ -237,21 +247,12 @@ typedef struct meshlink_packethdr {
        uint8_t source[16];
 } __attribute__((__packed__)) meshlink_packethdr_t;
 
-extern void meshlink_send_from_queue(event_loop_t *el, meshlink_handle_t *mesh);
+extern void meshlink_send_from_queue(event_loop_t *loop, void *mesh);
 extern void update_node_status(meshlink_handle_t *mesh, struct node_t *n);
+extern void update_node_pmtu(meshlink_handle_t *mesh, struct node_t *n);
 extern meshlink_log_level_t global_log_level;
 extern meshlink_log_cb_t global_log_cb;
-extern int check_port(meshlink_handle_t *mesh);
 extern void handle_duplicate_node(meshlink_handle_t *mesh, struct node_t *n);
 extern void handle_network_change(meshlink_handle_t *mesh, bool online);
 
-/// Device class traits
-typedef struct {
-       unsigned int min_connects;
-       unsigned int max_connects;
-       int edge_weight;
-} dev_class_traits_t;
-
-extern const dev_class_traits_t dev_class_traits[];
-
 #endif