/* -*-c-*-
*
- * $Id: tripe.h,v 1.20 2004/04/18 18:08:11 mdw Exp $
+ * $Id$
*
* Main header file for TrIPE
*
#include <assert.h>
#include <ctype.h>
#include <errno.h>
+#include <limits.h>
#include <signal.h>
#include <stdarg.h>
#include <stddef.h>
/*----- Magic numbers -----------------------------------------------------*/
-/* --- Tunnel types --- */
-
-#define TUN_NOTDEF 0
-#define TUN_UNET 1
-#define TUN_BSD 2
-#define TUN_LINUX 3
-
/* --- Trace flags --- */
#define T_TUNNEL 1u
* Used to maintain system-specific information about the tunnel interface.
*/
-#if TUN_TYPE == TUN_LINUX
-# include <linux/if.h>
-# include <linux/if_tun.h>
-#endif
+typedef struct tunnel tunnel;
+struct peer;
-typedef struct tunnel {
-#if TUN_TYPE == TUN_UNET
- sel_file f; /* Selector for Usernet device */
- struct peer *p; /* Pointer to my peer */
-#elif TUN_TYPE == TUN_LINUX
- sel_file f; /* Selector for TUN/TAP device */
- struct peer *p; /* Pointer to my peer */
- char ifn[IFNAMSIZ]; /* Interface name buffer */
-#elif TUN_TYPE == TUN_BSD
- sel_file f; /* Selector for tunnel device */
- struct peer *p; /* Pointer to my peer */
- unsigned n; /* Number of my tunnel device */
-#else
-# error "No support for this tunnel type"
+typedef struct tunnel_ops {
+ const char *name; /* Name of this tunnel driver */
+ void (*init)(void); /* Initializes the system */
+ tunnel *(*create)(struct peer */*p*/); /* Initializes a new tunnel */
+ const char *(*ifname)(tunnel */*t*/); /* Returns tunnel's interface name */
+ void (*inject)(tunnel */*t*/, buf */*b*/); /* Sends packet through if */
+ void (*destroy)(tunnel */*t*/); /* Destroys a tunnel */
+} tunnel_ops;
+
+#ifndef TUN_INTERNALS
+struct tunnel { const tunnel_ops *ops; };
#endif
-} tunnel;
/* --- Peer statistics --- *
*
unsigned long sz_in, sz_out; /* Size of all data in and out */
unsigned long sz_kxin, sz_kxout; /* Size of key exchange messages */
unsigned long sz_ipin, sz_ipout; /* Size of encapsulated IP packets */
- time_t t_start, t_last; /* Time peer created, last recv */
+ time_t t_start, t_last, t_kx; /* Time peer created, last pk, kx */
unsigned long n_reject; /* Number of rejected packets */
unsigned long n_in, n_out; /* Number of packets in and out */
unsigned long n_kxin, n_kxout; /* Number of key exchange packets */
typedef struct peer {
struct peer *next, *prev; /* Links to next and previous */
char *name; /* Name of this peer */
- tunnel t; /* Tunnel for local packets */
+ tunnel *t; /* Tunnel for local packets */
keyset *ks; /* List head for keysets */
buf b; /* Buffer for sending packets */
addr peer; /* Peer socket address */
sel_file w; /* Selector for write buffering */
bres_client r; /* Background resolver task */
sel_timer t; /* Timer for resolver */
+ const tunnel_ops *tops; /* Tunnel to use */
addr peer; /* Address to set */
size_t sasz; /* Size of the address */
} admin;
#define AF_DEAD 1u /* Destroy this admin block */
#define AF_LOCK 2u /* Don't destroy it yet */
+#define AF_NOTE 4u /* Catch notifications */
+#ifndef NTRACE
+ #define AF_TRACE 8u /* Catch tracing */
+#endif
+#define AF_WARN 16u /* Catch warning messages */
+
+#ifndef NTRACE
+# define AF_ALLMSGS (AF_NOTE | AF_TRACE | AF_WARN)
+#else
+# define AF_ALLMSGS (AF_NOTE | AF_WARN)
+#endif
/*----- Global variables --------------------------------------------------*/
extern group *gg; /* The group we work in */
extern mp *kpriv; /* Our private key */
extern octet buf_i[PKBUFSZ], buf_o[PKBUFSZ], buf_t[PKBUFSZ];
+extern const tunnel_ops *tunnels[]; /* Table of tunnels (0-term) */
+extern const tunnel_ops *tun_default; /* Default tunnel to use */
#ifndef NTRACE
extern const trace_opt tr_opts[]; /* Trace options array */
extern void a_warn(const char */*fmt*/, ...);
+/* --- @a_notify@ --- *
+ *
+ * Arguments: @const char *fmt@ = pointer to format string
+ * @...@ = other arguments
+ *
+ * Returns: ---
+ *
+ * Use: Sends a notification to interested admin connections.
+ */
+
+extern void a_notify(const char */*fmt*/, ...);
+
/* --- @a_create@ --- *
*
* Arguments: @int fd_in, fd_out@ = file descriptors to use
+ * @unsigned f@ = initial flags to set
*
* Returns: ---
*
* Use: Creates a new admin connection.
*/
-extern void a_create(int /*fd_in*/, int /*fd_out*/);
+extern void a_create(int /*fd_in*/, int /*fd_out*/, unsigned /*f*/);
/* --- @a_quit@ --- *
*
/* --- @p_create@ --- *
*
* Arguments: @const char *name@ = name for this peer
+ * @const tunnel_ops *tops@ = tunnel to use
* @struct sockaddr *sa@ = socket address of peer
* @size_t sz@ = size of socket address
*
* by this point.
*/
-extern peer *p_create(const char */*name*/,
+extern peer *p_create(const char */*name*/, const tunnel_ops */*tops*/,
struct sockaddr */*sa*/, size_t /*sz*/);
/* --- @p_name@ --- *
extern peer *p_first(void);
extern peer *p_next(peer */*p*/);
-/*----- Tunnel interface --------------------------------------------------*/
-
-/* --- @tun_init@ --- *
- *
- * Arguments: ---
- *
- * Returns: ---
- *
- * Use: Initializes the tunneling system. Maybe this will require
- * opening file descriptors or something.
- */
-
-extern void tun_init(void);
+/*----- Tunnel drivers ----------------------------------------------------*/
-/* --- @tun_create@ --- *
- *
- * Arguments: @tunnel *t@ = pointer to tunnel block
- * @peer *p@ = pointer to peer block
- *
- * Returns: Zero if it worked, nonzero on failure.
- *
- * Use: Initializes a new tunnel.
- */
-
-extern int tun_create(tunnel */*t*/, peer */*p*/);
-
-/* --- @tun_ifname@ --- *
- *
- * Arguments: @tunnel *t@ = pointer to tunnel block
- *
- * Returns: A pointer to the tunnel's interface name.
- */
-
-extern const char *tun_ifname(tunnel */*t*/);
-
-/* --- @tun_inject@ --- *
- *
- * Arguments: @tunnel *t@ = pointer to tunnel block
- * @buf *b@ = buffer to send
- *
- * Returns: ---
- *
- * Use: Injects a packet into the local network stack.
- */
+#ifdef TUN_LINUX
+ extern const tunnel_ops tun_linux;
+#endif
-extern void tun_inject(tunnel */*t*/, buf */*b*/);
+#ifdef TUN_UNET
+ extern const tunnel_ops tun_unet;
+#endif
-/* --- @tun_destroy@ --- *
- *
- * Arguments: @tunnel *t@ = pointer to tunnel block
- *
- * Returns: ---
- *
- * Use: Destroys a tunnel.
- */
+#ifdef TUN_BSD
+ extern const tunnel_ops tun_bsd;
+#endif
-extern void tun_destroy(tunnel */*t*/);
+extern const tunnel_ops tun_slip;
/*----- Other handy utilities ---------------------------------------------*/
extern const char *timestr(time_t /*t*/);
+/* --- @mystrieq@ --- *
+ *
+ * Arguments: @const char *x, *y@ = two strings
+ *
+ * Returns: True if @x@ and @y are equal, up to case.
+ */
+
+extern int mystrieq(const char */*x*/, const char */*y*/);
+
/*----- That's all, folks -------------------------------------------------*/
#ifdef __cplusplus