X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/2173bd49888d210eabcdbb0a7552789a5ad26507..HEAD:/server/tripe.h diff --git a/server/tripe.h b/server/tripe.h index 720da1b5..ea980c6b 100644 --- a/server/tripe.h +++ b/server/tripe.h @@ -99,9 +99,11 @@ #include #include +#include #include #include #include +#include #include #include #include @@ -598,7 +600,7 @@ typedef struct tunnel_ops { const char *name; /* Name of this tunnel driver */ unsigned flags; /* Various interesting flags */ #define TUNF_PRIVOPEN 1u /* Need helper to open file */ - void (*init)(void); /* Initializes the system */ + int (*init)(void); /* Initializes the system */ tunnel *(*create)(struct peer */*p*/, int /*fd*/, char **/*ifn*/); /* Initializes a new tunnel */ void (*setifname)(tunnel */*t*/, const char */*ifn*/); @@ -611,6 +613,10 @@ typedef struct tunnel_ops { struct tunnel { const tunnel_ops *ops; }; #endif +typedef struct tun_iter { + const struct tunnel_node *next; +} tun_iter; + /* --- Peer statistics --- * * * Contains various interesting and not-so-interesting statistics about a @@ -815,11 +821,9 @@ struct admin { extern sel_state sel; /* Global I/O event state */ extern octet buf_i[PKBUFSZ], buf_o[PKBUFSZ], buf_t[PKBUFSZ], buf_u[PKBUFSZ]; -extern const tunnel_ops *tunnels[]; /* Table of tunnels (0-term) */ -extern const tunnel_ops *tun_default; /* Default tunnel to use */ extern udpsocket udpsock[NADDRFAM]; /* The master UDP sockets */ extern kdata *master; /* Default private key */ -extern const char *tag_priv; /* Default private key tag */ +extern char *tag_priv; /* Default private key tag */ #ifndef NTRACE extern const trace_opt tr_opts[]; /* Trace options array */ @@ -839,14 +843,14 @@ extern unsigned tr_flags; /* Trace options flags */ * @const char *pubkr@ = public keyring file * @const char *ptag@ = default private-key tag * - * Returns: --- + * Returns: Zero on success, @-1@ on failure. * * Use: Initializes the key-management machinery, loading the * keyrings and so on. */ -extern void km_init(const char */*privkr*/, const char */*pubkr*/, - const char */*ptag*/); +extern int km_init(const char */*privkr*/, const char */*pubkr*/, + const char */*ptag*/); /* --- @km_reload@ --- * * @@ -859,6 +863,20 @@ extern void km_init(const char */*privkr*/, const char */*pubkr*/, extern int km_reload(void); +/* --- @km_clear@ --- * + * + * Arguments: --- + * + * Returns: --- + * + * Use: Forget the currently loaded keyrings. The @master@ key will + * be cleared, but other keys already loaded will continue to + * exist until their reference count drops to zero. Call + * @km_init@ to make everything work again. + */ + +extern void km_clear(void); + /* --- @km_findpub@, @km_findpriv@ --- * * * Arguments: @const char *tag@ = key tag to load @@ -1338,13 +1356,13 @@ extern void a_daemon(void); * @gid_t g@ = group to own the socket * @mode_t m@ = permissions to set on the socket * - * Returns: --- + * Returns: Zero on success, @-1@ on failure. * * Use: Creates the admin listening socket. */ -extern void a_listen(const char */*sock*/, - uid_t /*u*/, gid_t /*g*/, mode_t /*m*/); +extern int a_listen(const char */*sock*/, + uid_t /*u*/, gid_t /*g*/, mode_t /*m*/); /* --- @a_unlisten@ --- * * @@ -1393,12 +1411,12 @@ extern void a_signals(void); * @gid_t g@ = group to own the socket * @mode_t m@ = permissions to set on the socket * - * Returns: --- + * Returns: Zero on success, @-1@ on failure. * * Use: Creates the admin listening socket. */ -extern void a_init(void); +extern int a_init(void); /*----- Mapping with addresses as keys ------------------------------------*/ @@ -1498,13 +1516,13 @@ extern int ps_tunfd(const tunnel_ops */*tops*/, char **/*ifn*/); * * Arguments: @int detachp@ = whether to detach the child from its terminal * - * Returns: --- + * Returns: Zero on success, @-1@ on failure. * * Use: Separates off the privileged tunnel-opening service from the * rest of the server. */ -extern void ps_split(int /*detachp*/); +extern int ps_split(int /*detachp*/); /* --- @ps_quit@ --- * * @@ -1691,12 +1709,24 @@ extern const addr *p_addr(peer */*p*/); * * Arguments: @struct addrinfo *ailist@ = addresses to bind to * - * Returns: --- + * Returns: Zero on success, @-1@ on failure. * * Use: Binds to the main UDP sockets. */ -extern void p_bind(struct addrinfo */*ailist*/); +extern int p_bind(struct addrinfo */*ailist*/); + +/* --- @p_unbind@ --- * + * + * Arguments: --- + * + * Returns: --- + * + * Use: Unbinds the UDP sockets. There must not be any active peers, + * and none can be created until the sockets are rebound. + */ + +extern void p_unbind(void); /* --- @p_init@ --- * * @@ -1709,6 +1739,90 @@ extern void p_bind(struct addrinfo */*ailist*/); extern void p_init(void); +/* --- @p_addtun@ --- * + * + * Arguments: @const tunnel_ops *tops@ = tunnel ops to add + * + * Returns: Zero on success, @-1@ on failure. + * + * Use: Adds a tunnel class to the list of known classes, if it + * initializes properly. If there is no current default tunnel, + * then this one is made the default. + * + * Does nothing if the tunnel class is already known. So adding + * a bunch of tunnels takes quadratic time, but there will be + * too few to care about. + */ + +extern int p_addtun(const tunnel_ops */*tops*/); + +/* --- @p_setdflttun@ --- * + * + * Arguments: @const tunnel_ops *tops@ = tunnel ops to set + * + * Returns: --- + * + * Use: Sets the default tunnel. It must already be registered. The + * old default is forgotten. + */ + +extern void p_setdflttun(const tunnel_ops */*tops*/); + +/* --- @p_dflttun@ --- * + * + * Arguments: --- + * + * Returns: A pointer to the current default tunnel operations, or null + * if no tunnels are defined. + */ + +extern const tunnel_ops *p_dflttun(void); + +/* --- @p_findtun@ --- * + * + * Arguments: @const char *name@ = tunnel name + * + * Returns: Pointer to the tunnel operations, or null. + * + * Use: Finds the operations for a named tunnel class. + */ + +extern const tunnel_ops *p_findtun(const char */*name*/); + +/* --- @p_mktuniter@ --- * + * + * Arguments: @tuniter *i@ = pointer to iterator to initialize + * + * Returns: --- + * + * Use: Initializes a tunnel iterator. + */ + +extern void p_mktuniter(tun_iter */*i*/); + +/* --- @p_nexttun@ --- * + * + * Arguments: @tuniter *i@ = pointer to iterator + * + * Returns: Pointer to the next tunnel's operations, or null. + */ + +extern const tunnel_ops *p_nexttun(tun_iter */*i*/); + +/* --- @FOREACH_TUN@ --- * + * + * Arguments: @tops@ = name to bind to each tunnel + * @stuff@ = thing to do for each item + * + * Use: Does something for each known tunnel class. + */ + +#define FOREACH_TUN(tops, stuff) do { \ + tun_iter i_; \ + const tunnel_ops *tops; \ + for (p_mktuniter(&i_); (tops = p_nexttun(&i_)) != 0; ) stuff; \ +} while (0) + /* --- @p_create@ --- * * * Arguments: @peerspec *spec@ = information about this peer