return (done);
}
-/* --- @dosend@ --- *
+/* --- @doqueue@ -- *
*
- * Arguemnts: @admin *a@ = pointer to an admin block
+ * Arguments: @oqueue *q@ = pointer to output queue
* @const char *p@ = pointer to buffer to write
- * @size_t sz@ = size of data to write
+ * @size_t sz@ = size of buffer
*
- * Returns: ---
+ * Returns: Nonzero if the queue was previously empty.
*
- * Use: Sends data to an admin client.
+ * Use: Queues data to be written later.
*/
-static void dosend(admin *a, const char *p, size_t sz)
+static int doqueue(oqueue *q, const char *p, size_t sz)
{
- ssize_t n;
obuf *o;
+ int rc = 0;
+ size_t n;
- if (a->f & AF_DEAD)
- return;
-
- /* --- Try to send the data immediately --- */
-
- if (!a->o_head) {
- if ((n = trywrite(a, p, sz)) < 0)
- return;
- p += n;
- sz -= n;
- if (!sz)
- return;
- }
-
- /* --- Fill buffers with the data until it's all gone --- */
-
- o = a->o_tail;
+ o = q->tl;
if (!o)
- sel_addfile(&a->w);
+ rc = 1;
else if (o->p_in < o->buf + OBUFSZ)
goto noalloc;
o = xmalloc(sizeof(obuf));
o->next = 0;
o->p_in = o->p_out = o->buf;
- if (a->o_tail)
- a->o_tail->next = o;
+ if (q->tl)
+ q->tl->next = o;
else
- a->o_head = o;
- a->o_tail = o;
+ q->hd = o;
+ q->tl = o;
noalloc:
n = o->buf + OBUFSZ - o->p_in;
p += n;
sz -= n;
} while (sz);
+
+ return (rc);
+}
+
+/* --- @dosend@ --- *
+ *
+ * Arguemnts: @admin *a@ = pointer to an admin block
+ * @const char *p@ = pointer to buffer to write
+ * @size_t sz@ = size of data to write
+ *
+ * Returns: ---
+ *
+ * Use: Sends data to an admin client.
+ */
+
+static void dosend(admin *a, const char *p, size_t sz)
+{
+ ssize_t n;
+
+ if (a->f & AF_DEAD)
+ return;
+ if (!a->out.hd) {
+ if ((n = trywrite(a, p, sz)) < 0)
+ return;
+ p += n;
+ sz -= n;
+ if (!sz)
+ return;
+ }
+ if (doqueue(&a->out, p, sz))
+ sel_addfile(&a->w);
}
/* --- @a_flush@ --- *
obuf *o, *oo;
ssize_t n;
- o = a->o_head;
+ o = a->out.hd;
while (o) {
if ((n = trywrite(a, o->p_out, o->p_in - o->p_out)) < 0)
return;
o = o->next;
xfree(oo);
}
- a->o_head = o;
+ a->out.hd = o;
if (!o) {
- a->o_tail = 0;
+ a->out.tl = 0;
sel_rmfile(&a->w);
}
}
/* --- @a_write@, @a_vwrite@ --- *
*
* Arguments: @admin *a@ = admin connection to write to
- * @const char *tag@ = tag prefix string, or null
+ * @const char *status@ = status code to report
+ * @const char *tag@ = tag string, or null
* @const char *fmt@ = pointer to format string
* @va_list ap@ = arguments in list
* @...@ = other arguments
* Use: Sends a message to an admin connection.
*/
-static void a_vwrite(admin *a, const char *tag, const char *fmt, va_list ap)
+static void a_vwrite(admin *a, const char *status, const char *tag,
+ const char *fmt, va_list ap)
{
dstr d = DSTR_INIT;
+
+ if (tag) dstr_puts(&d, "BG");
+ dstr_puts(&d, status);
if (tag) {
+ dstr_putc(&d, ' ');
dstr_puts(&d, tag);
- if (fmt)
- dstr_putc(&d, ' ');
}
- if (fmt)
+ if (fmt) {
+ dstr_putc(&d, ' ');
dstr_vputf(&d, fmt, &ap);
+ }
dstr_putc(&d, '\n');
dosend(a, d.buf, d.len);
dstr_destroy(&d);
}
-static void a_write(admin *a, const char *tag, const char *fmt, ...)
+static void a_write(admin *a, const char *status, const char *tag,
+ const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
- a_vwrite(a, tag, fmt, ap);
+ a_vwrite(a, status, tag, fmt, ap);
va_end(ap);
}
* Use: Convenience functions for @a_write@.
*/
-static void a_ok(admin *a) { a_write(a, "OK", 0); }
+static void a_ok(admin *a) { a_write(a, "OK", 0, 0); }
static void a_info(admin *a, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
- a_vwrite(a, "INFO", fmt, ap);
+ a_vwrite(a, "INFO", 0, fmt, ap);
va_end(ap);
}
{
va_list ap;
va_start(ap, fmt);
- a_vwrite(a, "FAIL", fmt, ap);
+ a_vwrite(a, "FAIL", 0, fmt, ap);
va_end(ap);
}
/* --- @a_alert@, @a_valert@, @a_rawalert@ --- *
*
* Arguments: @unsigned f_and, f_eq@ = filter for connections
- * @const char *tag@ = tag prefix string
+ * @const char *status@ = status string
* @const char *fmt@ = pointer to format string
- @ @const char *p@ = pointer to raw string
+ * @const char *p@ = pointer to raw string
* @size_t sz@ = size of raw string
* @va_list ap@ = arguments in list
* @...@ = other arguments
* filter.
*/
-static void a_rawalert(unsigned f_and, unsigned f_eq, const char *tag,
+static void a_rawalert(unsigned f_and, unsigned f_eq, const char *status,
const char *p, size_t sz)
{
admin *a, *aa;
if (!(flags & F_INIT))
return;
- if (tag) {
- dstr_puts(&d, tag);
- if (p)
- dstr_putc(&d, ' ');
- }
- if (p)
+ dstr_puts(&d, status);
+ if (p) {
+ dstr_putc(&d, ' ');
dstr_putm(&d, p, sz);
+ }
dstr_putc(&d, '\n');
p = d.buf;
sz = d.len;
#ifndef NTRACE
static void a_trace(const char *p, size_t sz, void *v)
-{
- a_rawalert(AF_TRACE, AF_TRACE, "TRACE", p, sz);
-}
+ { a_rawalert(AF_TRACE, AF_TRACE, "TRACE", p, sz); }
#endif
/* --- @a_notify@ --- *
{
peer *p;
- while ((p = p_first()) != 0)
- p_destroy(p);
close(sock.fd);
unlink(sockname);
+ while ((p = p_first()) != 0)
+ p_destroy(p);
exit(0);
}
return (t);
}
+/*----- Backgrounded operations -------------------------------------------*/
+
+/* --- @a_bgrelease@ --- *
+ *
+ * Arguments: @admin_bgop *bg@ = backgrounded operation
+ *
+ * Returns: ---
+ *
+ * Use: Removes a backgrounded operation from the queue, since
+ * (presumably) it's done.
+ */
+
+static void a_bgrelease(admin_bgop *bg)
+{
+ admin *a = bg->a;
+
+ if (bg->tag)
+ xfree(bg->tag);
+ else
+ selbuf_enable(&a->b);
+ if (bg->next)
+ bg->next->prev = bg->prev;
+ if (bg->prev)
+ bg->prev->next = bg->next;
+ else
+ a->bg = bg->next;
+ xfree(bg);
+ if (a->f & AF_CLOSE)
+ a_destroy(a);
+}
+
+/* --- @a_bgok@, @a_bginfo@, @a_bgfail@ --- *
+ *
+ * Arguments: @admin_bgop *bg@ = backgrounded operation
+ * @const char *fmt@ = format string
+ * @...@ = other arguments
+ *
+ * Returns: ---
+ *
+ * Use: Convenience functions for @a_write@.
+ */
+
+static void a_bgok(admin_bgop *bg)
+ { a_write(bg->a, "OK", bg->tag, 0); }
+
+static void a_bginfo(admin_bgop *bg, const char *fmt, ...)
+{
+ va_list ap;
+ va_start(ap, fmt);
+ a_vwrite(bg->a, "INFO", bg->tag, fmt, ap);
+ va_end(ap);
+}
+
+static void a_bgfail(admin_bgop *bg, const char *fmt, ...)
+{
+ va_list ap;
+ va_start(ap, fmt);
+ a_vwrite(bg->a, "FAIL", bg->tag, fmt, ap);
+ va_end(ap);
+}
+
+/* --- @a_bgadd@ --- *
+ *
+ * Arguments: @admin *a@ = administration connection
+ * @admin_bgop *bg@ = pointer to background operation
+ * @const char *tag@ = background tag, or null for foreground
+ * @void (*cancel)(admin_bgop *)@ = cancel function
+ *
+ * Returns: ---
+ *
+ * Use: Links a background job into the list.
+ */
+
+static void a_bgadd(admin *a, admin_bgop *bg, const char *tag,
+ void (*cancel)(admin_bgop *))
+{
+ if (tag)
+ bg->tag = xstrdup(tag);
+ else {
+ bg->tag = 0;
+ selbuf_disable(&a->b);
+ }
+ bg->a = a;
+ bg->cancel = cancel;
+ bg->next = a->bg;
+ bg->prev = 0;
+ a->bg = bg;
+ if (tag) a_write(a, "DETACH", tag, 0);
+}
+
/*----- Adding peers ------------------------------------------------------*/
+
+/* --- @a_addfree@ --- *
+ *
+ * Arguments: @admin_addop *add@ = operation block
+ *
+ * Returns: ---
+ *
+ * Use: Frees an add operation.
+ */
+
+static void a_addfree(admin_addop *add)
+{
+ if (add->peer.name) xfree(add->peer.name);
+ if (add->paddr) xfree(add->paddr);
+}
+
+/* --- @a_addcancel@ --- *
+ *
+ * Arguments: @admin_bgop *bg@ = background operation
+ *
+ * Returns: ---
+ *
+ * Use: Cancels an add operation.
+ */
+
+static void a_addcancel(admin_bgop *bg)
+{
+ admin_addop *add = (admin_addop *)bg;
+
+ sel_rmtimer(&add->t);
+ bres_abort(&add->r);
+ a_addfree(add);
+}
+
+/* --- @a_doadd@ --- *
+ *
+ * Arguments: @admin_addop *add@ = operation block
+ *
+ * Returns: ---
+ *
+ * Use: Does the peer add thing.
+ */
+
+static void a_doadd(admin_addop *add)
+{
+ if (p_find(add->peer.name))
+ a_bgfail(&add->bg, "peer-exists %s", add->peer.name);
+ else if (!p_create(&add->peer))
+ a_bgfail(&add->bg, "peer-create-fail %s", add->peer.name);
+ else
+ a_bgok(&add->bg);
+}
-/* --- @a_resolve@ --- *
+/* --- @a_addresolve@ --- *
*
* Arguments: @struct hostent *h@ = pointer to resolved hostname
- * @void *v@ = pointer to admin block
+ * @void *v@ = pointer to add operation
*
* Returns: ---
*
* Use: Handles a completed name resolution.
*/
-static void a_resolve(struct hostent *h, void *v)
+static void a_addresolve(struct hostent *h, void *v)
{
- admin *a = v;
+ admin_addop *add = v;
- a_lock(a);
- T( trace(T_ADMIN, "admin: %u resolved", a->seq); )
+ a_lock(add->bg.a);
+ T( trace(T_ADMIN, "admin: %u resolved", add->bg.a->seq); )
TIMER;
- sel_rmtimer(&a->t);
if (!h)
- a_fail(a, "resolve-error %s", a->paddr);
- else if (p_find(a->peer.name))
- a_fail(a, "peer-exists %s", a->peer.name);
+ a_bgfail(&add->bg, "resolve-error %s", add->paddr);
else {
- memcpy(&a->peer.sa.sin.sin_addr, h->h_addr, sizeof(struct in_addr));
- if (!p_create(&a->peer))
- a_fail(a, "peer-create-fail %s", a->peer.name);
- else
- a_ok(a);
+ memcpy(&add->peer.sa.sin.sin_addr, h->h_addr, sizeof(struct in_addr));
+ a_doadd(add);
}
- xfree(a->peer.name);
- xfree(a->paddr);
- a->peer.name = 0;
- selbuf_enable(&a->b);
- a_unlock(a);
+ sel_rmtimer(&add->t);
+ a_addfree(add);
+ a_bgrelease(&add->bg);
+ a_unlock(add->bg.a);
}
-/* --- @a_timer@ --- *
+/* --- @a_addtimer@ --- *
*
* Arguments: @struct timeval *tv@ = timer
- * @void *v@ = pointer to admin block
+ * @void *v@ = pointer to add operation
*
* Returns: ---
*
* Use: Times out a resolver.
*/
-static void a_timer(struct timeval *tv, void *v)
+static void a_addtimer(struct timeval *tv, void *v)
{
- admin *a = v;
-
- a_lock(a);
- T( trace(T_ADMIN, "admin: %u resolver timeout", a->seq); )
- bres_abort(&a->r);
- a_fail(a, "resolver-timeout %s\n", a->paddr);
- xfree(a->peer.name);
- xfree(a->paddr);
- a->peer.name = 0;
- selbuf_enable(&a->b);
- a_unlock(a);
+ admin_addop *add = v;
+
+ a_lock(add->bg.a);
+ T( trace(T_ADMIN, "admin: %u resolver timeout", add->bg.a->seq); )
+ a_bgfail(&add->bg, "resolver-timeout %s\n", add->paddr);
+ bres_abort(&add->r);
+ a_addfree(add);
+ a_bgrelease(&add->bg);
+ a_unlock(add->bg.a);
}
/* --- @acmd_add@ --- *
struct timeval tv;
unsigned i, j;
char *p;
+ const char *tag = 0;
+ admin_addop *add = 0;
/* --- Make sure someone's not got there already --- */
if (p_find(av[0])) {
a_fail(a, "peer-exists %s", av[0]);
- return;
+ goto fail;
}
/* --- Set stuff up --- */
- a->peer.name = av[0];
- a->peer.t_ka = 0;
- a->peer.tops = tun_default;
+ add = xmalloc(sizeof(*add));
+ add->peer.name = xstrdup(av[0]);
+ add->peer.t_ka = 0;
+ add->peer.tops = tun_default;
+ add->paddr = 0;
/* --- Parse options --- */
for (;;) {
if (!av[i])
goto bad_syntax;
- if (mystrieq(av[i], "-tunnel")) {
+ if (mystrieq(av[i], "-background")) {
+ if (!av[++i]) goto bad_syntax;
+ tag = av[i];
+ } else if (mystrieq(av[i], "-tunnel")) {
if (!av[++i]) goto bad_syntax;
for (j = 0;; j++) {
if (!tunnels[j]) {
return;
}
if (mystrieq(av[i], tunnels[j]->name)) {
- a->peer.tops = tunnels[j];
+ add->peer.tops = tunnels[j];
break;
}
}
a_fail(a, "bad-time-spec %s", av[i]);
return;
}
- a->peer.t_ka = t;
+ add->peer.t_ka = t;
} else if (mystrieq(av[i], "--")) {
i++;
break;
if (mystrieq(av[i], "inet")) i++;
if (ac - i != 2) {
a_fail(a, "bad-syntax -- add PEER [OPTIONS] [inet] ADDRESS PORT");
- return;
+ goto fail;
}
- a->peer.sa.sin.sin_family = AF_INET;
- a->peer.sasz = sizeof(a->peer.sa.sin);
+ add->peer.sa.sin.sin_family = AF_INET;
+ add->peer.sasz = sizeof(add->peer.sa.sin);
+ add->paddr = xstrdup(av[i]);
pt = strtoul(av[i + 1], &p, 0);
if (*p) {
struct servent *s = getservbyname(av[i + 1], "udp");
if (!s) {
a_fail(a, "unknown-service %s", av[i + 1]);
- return;
+ goto fail;
}
pt = ntohs(s->s_port);
}
if (pt == 0 || pt >= 65536) {
a_fail(a, "invalid-port %lu", pt);
- return;
+ goto fail;
}
- a->peer.sa.sin.sin_port = htons(pt);
+ add->peer.sa.sin.sin_port = htons(pt);
+
+ /* --- Report backgrounding --- *
+ *
+ * Do this for consistency of interface, even if we're going to get the
+ * answer straight away.
+ */
+
+ a_bgadd(a, &add->bg, tag, a_addcancel);
/* --- If the name is numeric, do it the easy way --- */
- if (inet_aton(av[i], &a->peer.sa.sin.sin_addr)) {
- if (!p_create(&a->peer))
- a_fail(a, "peer-create-fail %s", av[0]);
- else
- a_ok(a);
- a->peer.name = 0;
+ if (inet_aton(av[i], &add->peer.sa.sin.sin_addr)) {
+ a_doadd(add);
+ a_addfree(add);
+ a_bgrelease(&add->bg);
return;
}
- /* --- Store everything for later and crank up the resolver --- *
- *
- * We disable the line buffer until the resolver completes (or times out).
- * This prevents other commands on the same connection (though the rest of
- * the system continues regardless), but makes life simpler for the client.
- */
+ /* --- Store everything for later and crank up the resolver --- */
- a->peer.name = xstrdup(av[0]);
- a->paddr = xstrdup(av[i]);
- selbuf_disable(&a->b);
gettimeofday(&tv, 0);
tv.tv_sec += T_RESOLVE;
- sel_addtimer(&sel, &a->t, &tv, a_timer, a);
- bres_byname(&a->r, a->paddr, a_resolve, a);
+ sel_addtimer(&sel, &add->t, &tv, a_addtimer, add);
+ bres_byname(&add->r, add->paddr, a_addresolve, add);
T( trace(T_ADMIN, "admin: %u resolving hostname `%s'",
- a->seq, a->paddr); )
+ a->seq, add->paddr); )
return;
bad_syntax:
a_fail(a, "bad-syntax -- add PEER [OPTIONS] ADDR ...");
+fail:
+ if (add) {
+ a_addfree(add);
+ xfree(add);
+ }
return;
}
/*----- Ping --------------------------------------------------------------*/
+/* --- @a_pingcancel@ --- *
+ *
+ * Arguments: @admin_bgop *bg@ = background operation block
+ *
+ * Returns: ---
+ *
+ * Use: Cancels a running ping.
+ */
+
+static void a_pingcancel(admin_bgop *bg)
+{
+ admin_pingop *pg = (admin_pingop *)bg;
+ p_pingdone(&pg->ping, PING_NONOTIFY);
+}
+
/* --- @a_pong@ --- *
*
* Arguments: @int rc@ = return code
- * @void *av@ = admin connection which requested the ping
+ * @void *v@ = ping operation block
*
* Returns: ---
*
* Use: Collects what happened to a ping message.
*/
-static void a_pong(int rc, void *av)
+static void a_pong(int rc, void *v)
{
- admin *a = av;
+ admin_pingop *pg = v;
struct timeval tv;
double millis;
- a_lock(a);
+ a_lock(pg->bg.a);
switch (rc) {
case PING_OK:
gettimeofday(&tv, 0);
- tv_sub(&tv, &tv, &a->pingtime);
+ tv_sub(&tv, &tv, &pg->pingtime);
millis = (double)tv.tv_sec * 1000 + (double)tv.tv_usec/1000;
- a_info(a, "ping-ok %.1f", millis);
- a_ok(a);
+ a_bginfo(&pg->bg, "ping-ok %.1f", millis);
+ a_bgok(&pg->bg);
break;
case PING_TIMEOUT:
- a_info(a, "ping-timeout");
- a_ok(a);
+ a_bginfo(&pg->bg, "ping-timeout");
+ a_bgok(&pg->bg);
break;
case PING_PEERDIED:
- a_info(a, "ping-peer-died");
- a_ok(a);
+ a_bginfo(&pg->bg, "ping-peer-died");
+ a_bgok(&pg->bg);
break;
default:
abort();
}
- a_unlock(a);
+ a_bgrelease(&pg->bg);
+ a_unlock(pg->bg.a);
}
/* --- @acmd_ping@, @acmd_eping@ --- *
long t = T_PING;
int i;
peer *p;
+ admin_pingop *pg = 0;
+ const char *tag = 0;
i = 0;
for (;;) {
if (!av[i])
goto bad_syntax;
- if (mystrieq(av[i], "-timeout")) {
+ if (mystrieq(av[i], "-background")) {
+ if (!av[++i]) goto bad_syntax;
+ tag = av[i];
+ } else if (mystrieq(av[i], "-timeout")) {
if (!av[++i]) goto bad_syntax;
if ((t = a_parsetime(av[i])) < 0) {
a_fail(a, "bad-time-spec %s", av[i]);
a_fail(a, "unknown-peer %s", av[i]);
return;
}
- gettimeofday(&a->pingtime, 0);
- if (p_pingsend(p, &a->ping, msg, t, a_pong, a))
- a_fail(a, "ping-send-failed");
+ pg = xmalloc(sizeof(*pg));
+ gettimeofday(&pg->pingtime, 0);
+ a_bgadd(a, &pg->bg, tag, a_pingcancel);
+ if (p_pingsend(p, &pg->ping, msg, t, a_pong, pg)) {
+ a_bgfail(&pg->bg, "ping-send-failed");
+ a_bgrelease(&pg->bg);
+ }
return;
bad_syntax:
{ a_ping(a, ac, av, "ping", MISC_PING); }
static void acmd_eping(admin *a, unsigned ac, char *av[])
{ a_ping(a, ac, av, "eping", MISC_EPING); }
-
/*----- Administration commands -------------------------------------------*/
if ((p = p_find(av[0])) == 0)
a_fail(a, "unknown-peer %s", av[0]);
else {
- kx_start(&p->kx);
+ kx_start(&p->kx, 1);
a_ok(a);
}
}
+static void acmd_reload(admin *a, unsigned ac, char *av[])
+ { p_keyreload(); a_ok(a); }
+
static void acmd_quit(admin *a, unsigned ac, char *av[])
{
a_warn("SERVER quit admin-request");
a_ok(a);
+ a_unlock(a);
a_quit();
}
static void acmd_help(admin */*a*/, unsigned /*ac*/, char */*av*/[]);
static const acmd acmdtab[] = {
+ { "add", "add PEER [OPTIONS] ADDR ...",
+ 2, 0xffff, acmd_add },
+ { "addr", "addr PEER", 1, 1, acmd_addr },
+ { "daemon", "daemon", 0, 0, acmd_daemon },
+ { "eping", "eping [OPTIONS] PEER", 1, 0xffff, acmd_eping },
+ { "forcekx", "forcekx PEER", 1, 1, acmd_forcekx },
{ "help", "help", 0, 0, acmd_help },
- { "version", "version", 0, 0, acmd_version },
-#ifndef NTRACE
- { "trace", "trace [OPTIONS]", 0, 1, acmd_trace },
-#endif
- { "watch", "watch [OPTIONS]", 0, 1, acmd_watch },
+ { "ifname", "ifname PEER", 1, 1, acmd_ifname },
+ { "kill", "kill PEER", 1, 1, acmd_kill },
+ { "list", "list", 0, 0, acmd_list },
{ "notify", "notify MESSAGE ...", 1, 0xffff, acmd_notify },
- { "warn", "warn MESSAGE ...", 1, 0xffff, acmd_warn },
+ { "ping", "ping [OPTIONS] PEER", 1, 0xffff, acmd_ping },
{ "port", "port", 0, 0, acmd_port },
- { "daemon", "daemon", 0, 0, acmd_daemon },
- { "list", "list", 0, 0, acmd_list },
- { "ifname", "ifname PEER", 1, 1, acmd_ifname },
- { "addr", "addr PEER", 1, 1, acmd_addr },
+ { "quit", "quit", 0, 0, acmd_quit },
+ { "reload", "reload", 0, 0, acmd_reload },
{ "stats", "stats PEER", 1, 1, acmd_stats },
- { "ping", "ping [OPTIONS] PEER", 1, 0xffff, acmd_ping },
- { "eping", "eping [OPTIONS] PEER", 1, 0xffff, acmd_eping },
- { "kill", "kill PEER", 1, 1, acmd_kill },
- { "forcekx", "forcekx PEER", 1, 1, acmd_forcekx },
- { "add", "add PEER [OPTIONS] ADDR ...",
- 2, 0xffff, acmd_add },
+#ifndef NTRACE
+ { "trace", "trace [OPTIONS]", 0, 1, acmd_trace },
+#endif
{ "tunnels", "tunnels", 0, 0, acmd_tunnels },
- { "quit", "quit", 0, 0, acmd_quit },
+ { "version", "version", 0, 0, acmd_version },
+ { "warn", "warn MESSAGE ...", 1, 0xffff, acmd_warn },
+ { "watch", "watch [OPTIONS]", 0, 1, acmd_watch },
{ 0, 0, 0, 0, 0 }
};
static void a_unlock(admin *a)
{
+ admin_bgop *bg, *bbg;
+
assert(a->f & AF_LOCK);
+
+ /* --- If we're not dead, that's fine --- */
+
if (!(a->f & AF_DEAD)) {
a->f &= ~AF_LOCK;
return;
}
+ /* --- If we are, then destroy the rest of the block --- */
+
T( trace(T_ADMIN, "admin: completing destruction of connection %u",
a->seq); )
selbuf_destroy(&a->b);
- if (a->peer.name) {
- xfree(a->peer.name);
- xfree(a->paddr);
- bres_abort(&a->r);
- sel_rmtimer(&a->t);
+ for (bg = a->bg; bg; bg = bbg) {
+ bbg = bg->next;
+ bg->cancel(bg);
+ if (bg->tag) xfree(bg->tag);
+ xfree(bg);
}
- if (a->ping.p)
- p_pingdone(&a->ping, PING_NONOTIFY);
- if (a->b.reader.fd != a->w.fd)
- close(a->b.reader.fd);
+ if (a->b.reader.fd != a->w.fd) close(a->b.reader.fd);
close(a->w.fd);
if (a_stdin == a)
* care.
*/
+static void freequeue(oqueue *q)
+{
+ obuf *o, *oo;
+
+ for (o = q->hd; o; o = oo) {
+ oo = o->next;
+ xfree(o);
+ }
+ q->hd = q->tl = 0;
+}
+
static void a_destroy(admin *a)
{
/* --- Don't multiply destroy admin blocks --- */
/* --- Free the output buffers --- */
- if (a->o_head) {
- obuf *o, *oo;
+ if (a->out.hd)
sel_rmfile(&a->w);
- for (o = a->o_head; o; o = oo) {
- oo = o->next;
- xfree(o);
- }
- a->o_head = 0;
- }
+ freequeue(&a->out);
/* --- If the block is locked, that's all we can manage --- */
if (a->f & AF_DEAD)
return;
if (!p) {
- a_destroy(a);
+ if (!a->bg)
+ a_destroy(a);
+ else {
+ a->f |= AF_CLOSE;
+ selbuf_disable(&a->b);
+ }
return;
}
ac = str_qsplit(p, av, 16, 0, STRF_QUOTE);
T( static unsigned seq = 0;
a->seq = seq++; )
T( trace(T_ADMIN, "admin: accepted connection %u", a->seq); )
- a->peer.name = 0;
- a->ping.p = 0;
+ a->bg = 0;
a->f = f;
- if (fd_in == STDIN_FILENO)
- a_stdin = a;
+ if (fd_in == STDIN_FILENO) a_stdin = a;
fdflags(fd_in, O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC);
if (fd_out != fd_in)
fdflags(fd_out, O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC);
selbuf_init(&a->b, &sel, fd_in, a_line, a);
sel_initfile(&sel, &a->w, fd_out, SEL_WRITE, a_flush, a);
- a->o_head = 0;
- a->o_tail = 0;
+ a->out.hd = a->out.tl = 0;
a->next = admins;
a->prev = 0;
- if (admins)
- admins->prev = a;
+ if (admins) admins->prev = a;
admins = a;
}
~mdw / tripe / blobdiff