X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnet.h;h=cae63bf12a33795bf763d72fbf3a33e32df676ea;hp=6a361a05d18722af781262d6ad96b35fc281ac0a;hb=b70b090a28ff4cbdce29a3ad030f7d51ce9079b2;hpb=5d9f6c8f2b855cd03a491988c1d4487ffbbc9dd4 diff --git a/src/net.h b/src/net.h index 6a361a05..cae63bf1 100644 --- a/src/net.h +++ b/src/net.h @@ -1,6 +1,9 @@ +#ifndef MESHLINK_NET_H +#define MESHLINK_NET_H + /* net.h -- header for net.c - Copyright (C) 2014 Guus Sliepen + Copyright (C) 2014, 2017 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +20,6 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __MESHLINK_NET_H__ -#define __MESHLINK_NET_H__ - #include "event.h" #include "sockaddr.h" @@ -36,10 +36,8 @@ #define MAXBUFSIZE ((MAXSIZE > 2048 ? MAXSIZE : 2048) + 128) typedef struct vpn_packet_t { - struct { - unsigned int probe:1; - unsigned int tcp:1; - }; + uint16_t probe: 1; + int16_t tcp: 1; uint16_t len; /* the actual number of bytes in the `data' field */ uint8_t data[MAXSIZE]; } vpn_packet_t; @@ -59,59 +57,59 @@ typedef enum packet_type_t { #include "list.h" typedef struct outgoing_t { - char *name; + struct node_t *node; + enum { + OUTGOING_START, + OUTGOING_CANONICAL, + OUTGOING_RECENT, + OUTGOING_KNOWN, + OUTGOING_END, + OUTGOING_NO_KNOWN_ADDRESSES, + } state; int timeout; - struct splay_tree_t *config_tree; - struct config_t *cfg; + timeout_t ev; struct addrinfo *ai; struct addrinfo *aip; - timeout_t ev; - struct meshlink_handle *mesh; } outgoing_t; -extern int maxoutbufsize; -extern int addressfamily; - -extern int keylifetime; -extern int max_connection_burst; -extern bool do_prune; - /* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */ #include "connection.h" #include "node.h" +extern void init_outgoings(struct meshlink_handle *mesh); +extern void exit_outgoings(struct meshlink_handle *mesh); + extern void retry_outgoing(struct meshlink_handle *mesh, outgoing_t *); extern void handle_incoming_vpn_data(struct event_loop_t *loop, void *, int); extern void finish_connecting(struct meshlink_handle *mesh, struct connection_t *); -extern bool do_outgoing_connection(struct meshlink_handle *mesh, struct outgoing_t *); +extern void do_outgoing_connection(struct meshlink_handle *mesh, struct outgoing_t *); extern void handle_new_meta_connection(struct event_loop_t *loop, void *, int); -extern int setup_listen_socket(const sockaddr_t *); -extern int setup_vpn_in_socket(struct meshlink_handle *mesh, const sockaddr_t *); +extern int setup_tcp_listen_socket(struct meshlink_handle *mesh, const struct addrinfo *aip) __attribute__((__warn_unused_result__)); +extern int setup_udp_listen_socket(struct meshlink_handle *mesh, const struct addrinfo *aip) __attribute__((__warn_unused_result__)); extern bool send_sptps_data(void *handle, uint8_t type, const void *data, size_t len); -extern bool receive_sptps_record(void *handle, uint8_t type, const void *data, uint16_t len); +extern bool receive_sptps_record(void *handle, uint8_t type, const void *data, uint16_t len) __attribute__((__warn_unused_result__)); extern void send_packet(struct meshlink_handle *mesh, struct node_t *, struct vpn_packet_t *); -extern void receive_tcppacket(struct meshlink_handle *mesh, struct connection_t *, const char *, int); -extern void broadcast_packet(struct meshlink_handle *mesh, const struct node_t *, struct vpn_packet_t *); -extern char *get_name(struct meshlink_handle *mesh); +extern char *get_name(struct meshlink_handle *mesh) __attribute__((__warn_unused_result__)); extern void load_all_nodes(struct meshlink_handle *mesh); -extern bool setup_myself_reloadable(struct meshlink_handle *mesh); -extern bool setup_network(struct meshlink_handle *mesh); +extern bool setup_myself_reloadable(struct meshlink_handle *mesh) __attribute__((__warn_unused_result__)); +extern bool setup_network(struct meshlink_handle *mesh) __attribute__((__warn_unused_result__)); +extern void reset_outgoing(struct outgoing_t *); extern void setup_outgoing_connection(struct meshlink_handle *mesh, struct outgoing_t *); -extern void try_outgoing_connections(struct meshlink_handle *mesh); extern void close_network_connections(struct meshlink_handle *mesh); -extern int main_loop(struct meshlink_handle *mesh); +extern void main_loop(struct meshlink_handle *mesh); extern void terminate_connection(struct meshlink_handle *mesh, struct connection_t *, bool); -extern bool node_read_ecdsa_public_key(struct meshlink_handle *mesh, struct node_t *); -extern bool read_ecdsa_public_key(struct meshlink_handle *mesh, struct connection_t *); -extern bool read_ecdsa_private_key(struct meshlink_handle *mesh); +extern bool node_read_public_key(struct meshlink_handle *mesh, struct node_t *) __attribute__((__warn_unused_result__)); +extern bool node_read_from_config(struct meshlink_handle *mesh, struct node_t *, const config_t *config) __attribute__((__warn_unused_result__)); +extern bool read_ecdsa_public_key(struct meshlink_handle *mesh, struct connection_t *) __attribute__((__warn_unused_result__)); +extern bool read_ecdsa_private_key(struct meshlink_handle *mesh) __attribute__((__warn_unused_result__)); +extern bool node_write_config(struct meshlink_handle *mesh, struct node_t *) __attribute__((__warn_unused_result__)); extern void send_mtu_probe(struct meshlink_handle *mesh, struct node_t *); extern void handle_meta_connection_data(struct meshlink_handle *mesh, struct connection_t *); extern void retry(struct meshlink_handle *mesh); +extern int check_port(struct meshlink_handle *mesh); #ifndef HAVE_MINGW #define closesocket(s) close(s) -#else -extern CRITICAL_SECTION mutex; #endif -#endif /* __MESHLINK_NET_H__ */ +#endif