static admin *admins;
static admin *a_dead;
static sel_file sock;
-static const char *sockname;
+static const char *sockname = 0;
static sym_table a_svcs;
static unsigned flags = 0;
static admin *a_stdin = 0;
void a_quit(void)
{
close(sock.fd);
- unlink(sockname);
+ if (sockname) unlink(sockname);
FOREACH_PEER(p, { p_destroy(p, 1); });
ps_quit();
exit(0);
* Returns: ---
*
* Use: Creates a new admin connection. It's safe to call this
- * before @a_init@.
+ * before @a_init@ -- and, indeed, this makes sense if you also
+ * call @a_switcherr@ to report initialization errors through
+ * the administration machinery.
*/
void a_create(int fd_in, int fd_out, unsigned f)
void a_daemon(void) { flags |= F_DAEMON; }
-/* --- @a_init@ --- *
+/* --- @a_listen@ --- *
*
* Arguments: @const char *name@ = socket name to create
* @uid_t u@ = user to own the socket
* Use: Creates the admin listening socket.
*/
-void a_init(const char *name, uid_t u, gid_t g, mode_t m)
+void a_listen(const char *name, uid_t u, gid_t g, mode_t m)
{
int fd;
int n = 5;
struct sockaddr_un sun;
- struct sigaction sa;
size_t sz;
mode_t omask;
-#ifdef HAVE_LIBADNS
- int err;
-#endif
-
- /* --- Create services table --- */
-
- sym_create(&a_svcs);
/* --- Set up the socket address --- */
sel_initfile(&sel, &sock, fd, SEL_READ, a_accept, 0);
sel_addfile(&sock);
sockname = name;
+}
+
+/* --- @a_switcherr@ --- *
+ *
+ * Arguments: ---
+ *
+ * Returns: ---
+ *
+ * Use: Arrange to report warnings, trace messages, etc. to
+ * administration clients rather than the standard-error stream.
+ *
+ * Obviously this makes no sense unless there is at least one
+ * client established. Calling @a_listen@ won't help with this,
+ * because the earliest a new client can connect is during the
+ * first select-loop iteration, which is too late: some initial
+ * client must have been added manually using @a_create@.
+ */
+
+void a_switcherr(void)
+{
+ T( trace_custom(a_trace, 0);
+ trace(T_ADMIN, "admin: enabled custom tracing"); )
+ flags |= F_INIT;
+}
+
+/* --- @a_signals@ --- *
+ *
+ * Arguments: ---
+ *
+ * Returns: ---
+ *
+ * Use: Establishes handlers for the obvious signals.
+ */
+
+void a_signals(void)
+{
+ struct sigaction sa;
+
+ sig_add(&s_term, SIGTERM, a_sigdie, 0);
+ sig_add(&s_hup, SIGHUP, a_sighup, 0);
+ sigaction(SIGINT, 0, &sa);
+ if (sa.sa_handler != SIG_IGN)
+ sig_add(&s_int, SIGINT, a_sigdie, 0);
+}
+
+/* --- @a_init@ --- *
+ *
+ * Arguments: ---
+ *
+ * Returns: ---
+ *
+ * Use: Creates the admin listening socket.
+ */
+
+void a_init(void)
+{
+#ifdef HAVE_LIBADNS
+ int err;
+#endif
+
+ /* --- Create services table --- */
+
+ sym_create(&a_svcs);
+
+ /* --- Prepare the background name resolver --- */
+
#ifdef HAVE_LIBADNS
if ((err = adns_init(&ads,
(adns_if_permit_ipv4 | adns_if_permit_ipv6 |
#else
bres_init(&sel);
#endif
- T( trace_custom(a_trace, 0);
- trace(T_ADMIN, "admin: enabled custom tracing"); )
- flags |= F_INIT;
-
- /* --- Set up signal handlers --- */
-
- sig_add(&s_term, SIGTERM, a_sigdie, 0);
- sig_add(&s_hup, SIGHUP, a_sighup, 0);
- sigaction(SIGINT, 0, &sa);
- if (sa.sa_handler != SIG_IGN)
- sig_add(&s_int, SIGINT, a_sigdie, 0);
}
/*----- That's all, folks -------------------------------------------------*/
* Returns: ---
*
* Use: Creates a new admin connection. It's safe to call this
- * before @a_init@.
+ * before @a_init@ -- and, indeed, this makes sense if you also
+ * call @a_switcherr@ to report initialization errors through
+ * the administration machinery.
*/
extern void a_create(int /*fd_in*/, int /*fd_out*/, unsigned /*f*/);
extern void a_daemon(void);
+/* --- @a_listen@ --- *
+ *
+ * Arguments: @const char *name@ = socket name to create
+ * @uid_t u@ = user to own the socket
+ * @gid_t g@ = group to own the socket
+ * @mode_t m@ = permissions to set on the socket
+ *
+ * Returns: ---
+ *
+ * Use: Creates the admin listening socket.
+ */
+
+extern void a_listen(const char */*sock*/,
+ uid_t /*u*/, gid_t /*g*/, mode_t /*m*/);
+
+/* --- @a_switcherr@ --- *
+ *
+ * Arguments: ---
+ *
+ * Returns: ---
+ *
+ * Use: Arrange to report warnings, trace messages, etc. to
+ * administration clients rather than the standard-error stream.
+ *
+ * Obviously this makes no sense unless there is at least one
+ * client established. Calling @a_listen@ won't help with this,
+ * because the earliest a new client can connect is during the
+ * first select-loop iteration, which is too late: some initial
+ * client must have been added manually using @a_create@.
+ */
+
+extern void a_switcherr(void);
+
+/* --- @a_signals@ --- *
+ *
+ * Arguments: ---
+ *
+ * Returns: ---
+ *
+ * Use: Establishes handlers for the obvious signals.
+ */
+
+extern void a_signals(void);
+
/* --- @a_init@ --- *
*
* Arguments: @const char *sock@ = socket name to create
* Use: Creates the admin listening socket.
*/
-extern void a_init(const char */*sock*/,
- uid_t /*u*/, gid_t /*g*/, mode_t /*m*/);
+extern void a_init(void);
/*----- Mapping with addresses as keys ------------------------------------*/
extern const addr *p_addr(peer */*p*/);
-/* --- @p_init@ --- *
+/* --- @p_bind@ --- *
*
* Arguments: @struct addrinfo *ailist@ = addresses to bind to
*
* Returns: ---
*
- * Use: Initializes the peer system; creates the socket.
+ * Use: Binds to the main UDP sockets.
+ */
+
+extern void p_bind(struct addrinfo */*ailist*/);
+
+/* --- @p_init@ --- *
+ *
+ * Arguments: ---
+ *
+ * Returns: ---
+ *
+ * Use: Initializes the peer system.
*/
-extern void p_init(struct addrinfo */*ailist*/);
+extern void p_init(void);
/* --- @p_create@ --- *
*
~mdw / tripe / commitdiff