va_end(ap);
}
-/* --- @a_quit@ --- *
- *
- * Arguments: ---
- *
- * Returns: ---
- *
- * Use: Shuts things down nicely.
- */
-
-void a_quit(void)
-{
- a_unlisten();
- FOREACH_PEER(p, { p_destroy(p, 1); });
- ps_quit();
- exit(0);
-}
-
/* --- @a_sigdie@ --- *
*
* Arguments: @int sig@ = signal number
break;
}
a_warn("SERVER", "quit", "signal", "%s", p, A_END);
- a_quit();
+ lp_end();
}
/* --- @a_sighup@ --- *
IF_TRACING(T_ADMIN, {
trace(T_ADMIN, "admin: destroying job %s (%u)", a_jobidencode(svc), i);
})
- assert(j->v[i].u.op = svc);
+ assert(j->v[i].u.op == svc);
j->v[i].u.next = j->free;
j->v[i].seq++;
j->free = i;
{
const char *tag = 0;
admin_addop *add;
+ const tunnel_ops *tops;
/* --- Set stuff up --- */
add->peer.privtag = 0;
add->peer.knock = 0;
add->peer.t_ka = 0;
- add->peer.tops = tun_default;
+ add->peer.tops = p_dflttun();
add->peer.f = 0;
/* --- Parse options --- */
OPTIONS(ac, av, {
OPTARG("-background", arg, { tag = arg; })
OPTARG("-tunnel", arg, {
- unsigned i;
- for (i = 0;; i++) {
- if (!tunnels[i]) {
- a_fail(a, "unknown-tunnel", "%s", arg, A_END);
- goto fail;
- }
- if (mystrieq(arg, tunnels[i]->name)) {
- add->peer.tops = tunnels[i];
- break;
- }
- }
+ if ((tops = p_findtun(arg)) == 0)
+ { a_fail(a, "unknown-tunnel", "%s", arg, A_END); goto fail; }
+ add->peer.tops = tops;
})
OPTTIME("-keepalive", t, { add->peer.t_ka = t; })
OPT("-cork", { add->peer.f |= KXF_CORK; })
if (add->peer.tag) xfree(add->peer.tag);
add->peer.tag = xstrdup(arg);
})
- OPT("-mobile", { add->peer.f |= PSF_MOBILE | PSF_EPHEM; })
+ OPT("-mobile", { add->peer.f |= PSF_MOBILE; })
OPTARG("-priv", arg, {
if (add->peer.privtag) xfree(add->peer.privtag);
add->peer.privtag = xstrdup(arg);
OPTARG("-knock", arg, {
if (add->peer.knock) xfree(add->peer.knock);
add->peer.knock = xstrdup(arg);
- add->peer.f |= PSF_EPHEM;
})
});
return;
bad_syntax:
- a_fail(a, "bad-syntax", "%s", cmd, "[OPTIONS] PEER", cmd, A_END);
+ a_fail(a, "bad-syntax", "%s", cmd, "[OPTIONS] PEER", A_END);
fail:
if (pg) xfree(pg);
return;
{
a_warn("SERVER", "quit", "admin-request", A_END);
a_ok(a);
- a_quit();
+ lp_end();
}
static void acmd_version(admin *a, unsigned ac, char *av[])
static void acmd_tunnels(admin *a, unsigned ac, char *av[])
{
- int i;
-
- for (i = 0; tunnels[i]; i++)
- a_info(a, "%s", tunnels[i]->name, A_END);
+ FOREACH_TUN(tops, { a_info(a, "%s", tops->name, A_END); });
a_ok(a);
}
if (a->f & AF_FOREGROUND) {
T( trace(T_ADMIN, "admin: foreground client quit: shutting down"); )
a_warn("SERVER", "quit", "foreground-eof", A_END);
- a_quit();
+ lp_end();
}
/* --- Abort any background jobs in progress --- */
* @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.
*/
-void a_listen(const char *name, uid_t u, gid_t g, mode_t m)
+int a_listen(const char *name, uid_t u, gid_t g, mode_t m)
{
int fd;
int n = 5;
sz = strlen(name) + 1;
if (sz > sizeof(sun.sun_path)) {
a_warn("ADMIN", "admin-socket", "%s", name, "name-too-long", A_END);
- exit(EXIT_FAILURE);
+ goto fail_0;
}
BURN(sun);
sun.sun_family = AF_UNIX;
if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
a_warn("ADMIN", "admin-socket", "%s", sun.sun_path,
"create-failed", "?ERRNO", A_END);
- exit(EXIT_FAILURE);
+ goto fail_1;
}
if (bind(fd, (struct sockaddr *)&sun, sz) < 0) {
struct stat st;
if (errno != EADDRINUSE) {
a_warn("ADMIN", "admin-socket", "%s", sun.sun_path,
"bind-failed", "?ERRNO", A_END);
- exit(EXIT_FAILURE);
+ goto fail_2;
}
if (!n) {
a_warn("ADMIN", "admin-socket", "%s", sun.sun_path,
"too-many-retries", A_END);
- exit(EXIT_FAILURE);
+ goto fail_2;
}
n--;
if (!connect(fd, (struct sockaddr *)&sun, sz)) {
a_warn("ADMIN", "admin-socket", "%s", sun.sun_path,
"already-in-use", A_END);
- exit(EXIT_FAILURE);
+ goto fail_2;
}
if (errno != ECONNREFUSED) {
a_warn("ADMIN", "admin-socket", "%s", sun.sun_path,
"bind-failed", "?ERR", e, A_END);
- exit(EXIT_FAILURE);
+ goto fail_2;
}
if (stat(sun.sun_path, &st)) {
if (errno == ENOENT) { close(fd); goto again; }
a_warn("ADMIN", "admin-socket", "%s", sun.sun_path,
"stat-failed", "?ERRNO", A_END);
- exit(EXIT_FAILURE);
+ goto fail_2;
}
if (!S_ISSOCK(st.st_mode)) {
a_warn("ADMIN", "admin-socket", "%s", sun.sun_path,
"not-a-socket", A_END);
- exit(EXIT_FAILURE);
+ goto fail_2;
}
T( trace(T_ADMIN, "admin: stale socket found; removing it"); )
unlink(sun.sun_path);
if (chown(sun.sun_path, u, g)) {
a_warn("ADMIN", "admin-socket", "%s", sun.sun_path,
"chown-failed", "?ERRNO", A_END);
- exit(EXIT_FAILURE);
+ goto fail_3;
}
if (chmod(sun.sun_path, m)) {
a_warn("ADMIN", "admin-socket", "%s", sun.sun_path,
"chmod-failed", "?ERRNO", A_END);
- exit(EXIT_FAILURE);
+ goto fail_3;
}
- umask(omask);
fdflags(fd, O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC);
if (listen(fd, 5)) {
a_warn("ADMIN", "admin-socket", "%s", sun.sun_path,
"listen-failed", "?ERRNO", A_END);
- exit(EXIT_FAILURE);
+ goto fail_3;
}
+ umask(omask);
/* --- Listen to the socket --- */
sel_initfile(&sel, &sock, fd, SEL_READ, a_accept, 0);
sel_addfile(&sock);
sockname = name;
+
+ return (0);
+
+ /* --- Clean up if things go sideways --- */
+
+fail_3:
+ unlink(sun.sun_path);
+fail_2:
+ close(fd);
+fail_1:
+ umask(omask);
+fail_0:
+ return (-1);
}
/* --- @a_unlisten@ --- *
*
* Arguments: ---
*
- * Returns: ---
+ * Returns: Zero on success, @-1@ on failure.
*
* Use: Creates the admin listening socket.
*/
-void a_init(void)
+int a_init(void)
{
#ifdef HAVE_LIBADNS
int err;
#endif
- /* --- Create services table --- */
-
- sym_create(&a_svcs);
-
/* --- Prepare the background name resolver --- */
#ifdef HAVE_LIBADNS
adns_if_noautosys),
0)) != 0) {
a_warn("ADMIN", "adns-init-failed", "?ERRNO", A_END);
- exit(EXIT_FAILURE);
+ return (-1);
}
sel_addhook(&sel, &hook, before_select, after_select, 0);
#else
bres_init(&sel);
#endif
+
+ /* --- Create services table --- */
+
+ sym_create(&a_svcs);
+
+ /* --- All done --- */
+
+ return (0);
}
/*----- That's all, folks -------------------------------------------------*/
~mdw / tripe / blobdiff