struct ping *pings; /* Pings we're waiting for */
peerspec spec; /* Specifications for this peer */
tunnel *t; /* Tunnel for local packets */
+ char *ifname; /* Interface name for tunnel */
keyset *ks; /* List head for keysets */
buf b; /* Buffer for sending packets */
stats st; /* Statistics */
admin_bgop bg; /* Background operation header */
ping ping; /* Ping pending response */
struct timeval pingtime; /* Time last ping was sent */
-} admin_pingop;
+} admin_pingop;
+
+typedef struct admin_service {
+ sym_base _b; /* Hash table base structure */
+ char *version; /* The provided version */
+ struct admin *prov; /* Which client provides me */
+ struct admin_service *next, *prev; /* Client's list of services */
+} admin_service;
+
+typedef struct admin_svcop {
+ admin_bgop bg; /* Background operation header */
+ struct admin *prov; /* Client servicing this job */
+ unsigned short index; /* This job's index */
+ struct admin_svcop *next, *prev; /* Links for provider's jobs */
+} admin_svcop;
+
+typedef struct admin_jobentry {
+ unsigned short seq; /* Zero if unused */
+ union {
+ admin_svcop *op; /* Operation, if slot in use, ... */
+ uint32 next; /* ... or index of next free slot */
+ } u;
+} admin_jobentry;
+
+typedef struct admin_jobtable {
+ uint32 n, sz; /* Used slots and table size */
+ admin_svcop *active; /* List of active jobs */
+ uint32 free; /* Index of first free slot */
+ admin_jobentry *v; /* And the big array of entries */
+} admin_jobtable;
typedef struct admin {
struct admin *next, *prev; /* Links to next and previous */
oqueue out; /* Output buffer list */
oqueue delay; /* Delayed output buffer list */
admin_bgop *bg; /* Backgrounded operations */
+ admin_service *svcs; /* Which services I provide */
+ admin_jobtable j; /* Table of outstanding jobs */
selbuf b; /* Line buffer for commands */
sel_file w; /* Selector for write buffering */
} admin;
extern void a_quit(void);
+/* --- @a_preselect@ --- *
+ *
+ * Arguments: ---
+ *
+ * Returns: ---
+ *
+ * Use: Informs the admin module that we're about to select again,
+ * and that it should do cleanup things it has delayed until a
+ * `safe' time.
+ */
+
+extern void a_preselect(void);
+
/* --- @a_daemon@ --- *
*
* Arguments: ---
extern const char *p_ifname(peer */*p*/);
+/* --- @p_setifname@ --- *
+ *
+ * Arguments: @peer *p@ = pointer to a peer block
+ * @const char *name@ = pointer to the new name
+ *
+ * Returns: ---
+ *
+ * Use: Changes the name held for a peer's interface.
+ */
+
+extern void p_setifname(peer */*p*/, const char */*name*/);
+
/* --- @p_addr@ --- *
*
* Arguments: @peer *p@ = pointer to a peer block
extern int seq_check(seqwin */*s*/, uint32 /*q*/, const char */*service*/);
+/* --- @versioncmp@ --- *
+ *
+ * Arguments: @const char *va, *vb@ = two version strings
+ *
+ * Returns: Less than, equal to, or greater than zero, according to
+ * whether @va@ is less than, equal to, or greater than @vb@.
+ *
+ * Use: Compares version number strings.
+ *
+ * The algorithm is an extension of the Debian version
+ * comparison algorithm. A version number consists of three
+ * components:
+ *
+ * [EPOCH :] MAIN [- SUB]
+ *
+ * The MAIN part may contain colons or hyphens if there is an
+ * EPOCH or SUB, respectively. Version strings are compared
+ * componentwise: first epochs, then main parts, and finally
+ * subparts.
+ *
+ * The component comparison is done as follows. First, the
+ * initial subsequence of nondigit characters is extracted from
+ * each string, and these are compared lexicographically, using
+ * ASCII ordering, except that letters precede non-letters. If
+ * both are the same, an initial sequence of digits is extracted
+ * from the remaining parts of the version strings, and these
+ * are compared numerically (an empty sequence being considered
+ * to have the value zero). This process is repeated until we
+ * have a winner or until both strings are exhausted.
+ */
+
+extern int versioncmp(const char */*va*/, const char */*vb*/);
+
/*----- That's all, folks -------------------------------------------------*/
#ifdef __cplusplus