commit 4bad36bb9f7db6ee8abf51f5ed9bbdcffaddbb5e from: Tracey Emery date: Sat Apr 20 16:27:05 2019 UTC Fix child termination. Remove log config. commit - ac1b786b6855906e4b3e996850f3b42beef1c754 commit + 4bad36bb9f7db6ee8abf51f5ed9bbdcffaddbb5e blob - 6d792c2e1953a128a33e1bcbaf51298edab3ef9a blob + 2f51d26b1c193a607e84884751c008f6bf120315 --- thingsctl/thingsctl.c +++ thingsctl/thingsctl.c @@ -132,10 +132,10 @@ main(int argc, char *argv[]) done = 1; break; case LOG_DEBUG: - verbose++; + verbose |= L_VERBOSE2; /* FALLTHROUGH */ case LOG_VERBOSE: - verbose++; + verbose |= L_VERBOSE1; /* FALLTHROUGH */ case LOG_BRIEF: imsg_compose(ibuf, IMSG_THGS_LOG_VERBOSE, 0, 0, -1, blob - fd2db3c864a9aa68fac6fe05ab190b0f72532f6d blob + dbeddbea4eeb35e02a631d545e6ffa6fb2c4efbb --- thingsd/control.c +++ thingsd/control.c @@ -276,14 +276,14 @@ control_dispatch_imsg(int fd, short event, void *bula) imsg.data, IMSG_DATA_SIZE(imsg)); break; case IMSG_THGS_LOG_VERBOSE: - if (imsg.hdr.len != IMSG_HEADER_SIZE + - sizeof(verbose)) + if (IMSG_DATA_SIZE(imsg) != sizeof(verbose)) break; /* forward to other process */ + main_imsg_compose_thgs(imsg.hdr.type, 0, + imsg.data, IMSG_DATA_SIZE(imsg)); + memcpy(&verbose, imsg.data, sizeof(verbose)); log_setverbose(verbose); - main_imsg_compose_thgs(imsg.hdr.type, 0, - imsg.data, imsg.hdr.len - IMSG_HEADER_SIZE); break; default: log_debug("%s: error handling imsg %d", __func__, blob - 682e7f25f6b4003059de0901cac6ad5dbff7164a blob + 1c88ec0b926f4fd763588d3237839beeca02cd6a --- thingsd/examples/etc/thingsd.conf +++ thingsd/examples/etc/thingsd.conf @@ -21,9 +21,6 @@ max subscriptions 5 # max is 600 seconds connection retry 60 -# Daemon verbosity -log verbose 1 - # # Device Setup # blob - 876a08519e2c4b5305cf038b62db49331a4a7806 blob + 07132f33eb37384d0cea6dac36cfb2dac209faf3 --- thingsd/log.c +++ thingsd/log.c @@ -166,7 +166,7 @@ log_debug(const char *emsg, ...) { va_list ap; - if (verbose > 1) { + if (verbose) { va_start(ap, emsg); vlog(LOG_DEBUG, emsg, ap); va_end(ap); blob - f156a74cc2c84b7c0bf065769e5121787765a16c blob + 36bd33a78c5f97f8b9d57fdc14cb31bf242d0986 --- thingsd/parse.y +++ thingsd/parse.y @@ -92,7 +92,7 @@ typedef struct { %} %token BAUD DATA PARITY STOP HARDWARE SOFTWARE PASSWORD NAME RETRY PERSISTENT -%token LOG VERBOSE CONNECT THING LISTEN LOCATION IPADDR UDP THINGS CONNECTION +%token VERBOSE CONNECT THING LISTEN LOCATION IPADDR UDP THINGS CONNECTION %token DEFAULT PORT MAX CLIENTS SUBSCRIPTIONS BIND INTERFACE SUBSCRIBE TLS %token ERROR RECEIVE CERTIFICATE CIPHERS CLIENT CA CRL OPTIONAL DHE ECDHE KEY %token OCSP PROTOCOLS ON @@ -122,7 +122,6 @@ main : DEFAULT PORT NUMBER { | maxclients | maxsubs | bindopts1 - | logging | thing | thgretry ; @@ -201,11 +200,6 @@ subthgs : THING '{' STRING ',' STRING '}' optcomma { } } ; -logging : LOG VERBOSE NUMBER { - if (pthgsd->debug == 0) - pthgsd->verbose = $3; - } - ; bindopts1 : BIND INTERFACE STRING { pthgsd->iface = $3; } @@ -561,7 +555,6 @@ int lookup(char *s) { { "key", KEY }, { "listen", LISTEN }, { "location", LOCATION }, - { "log", LOG }, { "max", MAX }, { "name", NAME }, { "ocsp", OCSP }, blob - 5f3837cdc3cfffe1644a9c5b3ea7c6e5feff7ad3 blob + 1dd553d4c787681053c340ffc9fb2d44af2f0a76 --- thingsd/things.c +++ thingsd/things.c @@ -84,8 +84,6 @@ thgs_main(int debug, int verbose, char *thgs_sock) open_thgs(pthgsd, false); create_socks(pthgsd, false); - pthgsd->verbose = verbose; - pthgsd->debug = debug; pdthgs->run = 1; if (unveil("/dev", "rw") == -1) @@ -121,10 +119,10 @@ thgs_main(int debug, int verbose, char *thgs_sock) if (pthgsd->exists) { do_reconn(); } + if (getppid() == 1) + break; event_base_loopexit(pthgsd->thgs_eb, &eb_timeout); event_base_dispatch(pthgsd->thgs_eb); - if (getppid() == 1) - break; } thgs_shutdown(pdthgs); @@ -213,9 +211,9 @@ thgs_dispatch_main(int fd, short event, void *bula) imsg_event_add(iev); else { /* This pipe is dead. Remove its event handler. */ - log_warnx("%s: pipe to main dead, event deleted", __func__); event_del(&iev->ev); event_loopexit(NULL); + pdthgs->run = 0; } } blob - 6a34d1dc82899ce3e316f4a4f708d351cf7d9115 blob + b2317a04d56695900c0b6c3f87bf88d4ca4f959a --- thingsd/thingsd.c +++ thingsd/thingsd.c @@ -52,6 +52,8 @@ struct event evsighup; pid_t thgs_pid; static struct imsgev *iev_thgs; +uint32_t v_opts; + __dead void usage(void) { @@ -82,7 +84,7 @@ main(int argc, char *argv[]) { int ch; char *thgs_sock, *saved_argv0; - int pipe_thgs[2], debug = 0, verbose = 0; + int pipe_thgs[2], debug = 0; int control_fd; thgs_sock = THINGSD_SOCK; @@ -102,10 +104,12 @@ main(int argc, char *argv[]) thgs_chld = true; break; case 'd': - debug++; + debug = 1; break; case 'v': - verbose++; + if (v_opts & L_VERBOSE1) + v_opts |= L_VERBOSE2; + v_opts |= L_VERBOSE1; break; default: usage(); @@ -117,7 +121,7 @@ main(int argc, char *argv[]) if (argc > 0) usage(); if (thgs_chld) - thgs_main(debug, verbose, thgs_sock); + thgs_main(debug, v_opts & (L_VERBOSE1 | L_VERBOSE2), thgs_sock); if (geteuid()) fatalx("need root privileges"); if ((control_fd = control_init(thgs_sock)) == -1) @@ -126,7 +130,7 @@ main(int argc, char *argv[]) control_state.fd = control_fd; log_init(debug, LOG_DAEMON); - log_setverbose(verbose); + log_setverbose(v_opts & L_VERBOSE1); /* make parent daemon */ thgsd_process = PROC_MAIN; @@ -142,7 +146,7 @@ main(int argc, char *argv[]) fatalx("thgs socketpair"); thgs_pid = start_child(PROC_THGS, saved_argv0, pipe_thgs[1], debug, - verbose); + v_opts & (L_VERBOSE1 | L_VERBOSE2)); event_init(); @@ -212,10 +216,9 @@ thgsd_shutdown() static pid_t start_child(int p, char *argv0, int fd, int debug, int verbose) { - int argc = 0, argvc = 10, ac; - char *argv[argvc], bufa[argvc], bufb[argvc]; + int argc = 0, argvc = 10; + char *argv[argvc]; pid_t pid; - const char *dash = "-"; switch (pid = fork()) { case -1: @@ -241,26 +244,12 @@ start_child(int p, char *argv0, int fd, int debug, int argv[argc++] = "-C"; break; } - memset(bufa, 0, sizeof(bufa)); - memset(bufb, 0, sizeof(bufb)); - if (debug) { - strlcpy(bufa, dash, sizeof(bufa)); - for (ac = 0; ac < debug; ac++) { - if (ac >= argvc) - continue; - strlcat(bufa, "d", sizeof(bufa)); - } - argv[argc++] = bufa; - } - if (verbose) { - strlcpy(bufb, dash, sizeof(bufb)); - for (ac = 0; ac < verbose; ac++) { - if (ac >= argvc) - continue; - strlcat(bufb, "v", sizeof(bufb)); - } - argv[argc++] = bufb; - } + if (debug) + argv[argc++] = "-d"; + if (verbose & L_VERBOSE1) + argv[argc++] = "-v"; + if (verbose & L_VERBOSE2) + argv[argc++] = "-v"; argv[argc++] = NULL; execvp(argv0, argv); @@ -298,7 +287,7 @@ main_dispatch_thgs(int fd, short event, void *bula) struct imsgbuf *ibuf = &iev->ibuf; struct imsg imsg; ssize_t n; - int shut = 0, verbose; + int shut = 0; if (event & EV_READ) { if ((n = imsg_read(ibuf)) == -1 && errno != EAGAIN) @@ -328,10 +317,6 @@ main_dispatch_thgs(int fd, short event, void *bula) case IMSG_CTL_END: control_imsg_relay(&imsg); break; - case IMSG_THGS_LOG_VERBOSE: - memcpy(&verbose, imsg.data, sizeof(verbose)); - log_setverbose(verbose); - break; default: log_debug("%s: error handling imsg %d", __func__, imsg.hdr.type); @@ -343,7 +328,6 @@ main_dispatch_thgs(int fd, short event, void *bula) imsg_event_add(iev); else { /* this pipe is dead, so remove the event handler */ - log_warnx("%s: pipe to thgs dead, event deleted", __func__); event_del(&iev->ev); event_loopexit(NULL); } blob - 7bb22a0affe9150f2b9c6c63a7d535c38952c430 blob + c67f9adb065e65b1c9813d8decb7653e606f9811 --- thingsd/thingsd.conf.5 +++ thingsd/thingsd.conf.5 @@ -67,8 +67,6 @@ Set the maximum number of things a client can subscrib Set the lost connection thing watchdog interval. Default is 30 seconds. Range is 30-600 seconds. -.It Ic log verbose Ar number -Turn on verbose logging. .El .Sh THINGS things represent a serial, TCP/IP, or UDP listener thing for blob - 5925a57ae551fc6887da87dca3eaa348d2e09eca blob + d59b67155318c6acf0d42cd75cd1ba9c101674ed --- thingsd/thingsd.h +++ thingsd/thingsd.h @@ -42,16 +42,19 @@ #define EB_TIMEOUT 10 #define TLS_CONFIG_MAX 511 -#define TLS_CERT "/etc/ssl/thing.crt" -#define TLS_KEY "/etc/ssl/private/thing.key" -#define TLS_CIPHERS "compat" -#define TLS_DHE_PARAMS "none" -#define TLS_ECDHE_CURVES "default" -#define TLSFLAG_CA 0x01 -#define TLSFLAG_CRL 0x02 -#define TLSFLAG_OPTIONAL 0x04 -#define TLSFLAG_BITS "\10\01CA\02CRL\03OPTIONAL" +#define TLS_CERT "/etc/ssl/thing.crt" +#define TLS_KEY "/etc/ssl/private/thing.key" +#define TLS_CIPHERS "compat" +#define TLS_DHE_PARAMS "none" +#define TLS_ECDHE_CURVES "default" +#define TLSFLAG_CA 0x01 +#define TLSFLAG_CRL 0x02 +#define TLSFLAG_OPTIONAL 0x04 +#define TLSFLAG_BITS "\10\01CA\02CRL\03OPTIONAL" +#define L_VERBOSE1 0x00000001 +#define L_VERBOSE2 0x00000002 + #define PARENT_SOCK_FD (STDERR_FILENO + 1) enum socktypes { @@ -215,11 +218,9 @@ struct thgsd { char *iface; int max_clt; int port; - size_t debug; size_t clt_cnt; size_t conn_rtry; size_t max_sub; - size_t verbose; void (*clt_fptr)(struct thgsd *); /* disconnected things parts */