=================================================================== RCS file: /cvs/cvs/blind/blind.c,v retrieving revision 1.4 retrieving revision 1.18 diff -u -p -r1.4 -r1.18 --- blind/blind.c 2022/03/17 05:35:23 1.4 +++ blind/blind.c 2022/03/25 20:54:51 1.18 @@ -17,13 +17,16 @@ #include #include #include +#include +#include #include "blind.h" +#include "config.h" +#include "log.h" -static void usage(void); +static void usage(void); -int daemonize = 1; -int verbose = 0; +struct blind *bl; static void usage(void) @@ -38,7 +41,9 @@ int main(int argc, char *argv[]) { int ch; + int verbose = 0; int no_action = 0; + int daemonize = 1; const char *config = BL_CONF; while ((ch = getopt(argc, argv, "dhnvf:")) != -1) { @@ -57,7 +62,7 @@ main(int argc, char *argv[]) config = optarg; break; case 'v': - verbose = 1; + verbose = BL_OPT_VERBOSE; break; default: usage(); @@ -69,13 +74,33 @@ main(int argc, char *argv[]) if (argc || *argv) usage(); - // log_initialization (LOG_DAEMON) + log_init(daemonize, LOG_DAEMON); + log_info("%s %s", BL_TEXT, BL_VERS); - // default_conf initialization (BLIND STRUCT) + if ((bl = config_init()) == NULL) + log_fatal("initialization failed"); + if (verbose) { + bl->bl_opt |= verbose; + log_setv(verbose); + log_debug("verbose mode on"); + } + + if (strlcpy(bl->bl_conf, config, PATH_MAX) >= PATH_MAX) + log_fatal("file name exceeds PATH_MAX"); + + if (config_load(bl)) + log_fatal("config %s", bl->bl_conf); + + log_debug("conf=%s", bl->bl_conf); + log_debug("sock=%s", bl->bl_sock); + log_debug(" ttl=%d", bl->bl_ttl); + log_debug(" opt=%d", bl->bl_opt); + log_debug(" flg=%d", bl->bl_flg); + // TAILQ_INIT(&offline_queue) - // parse_config + // fork + process setup + communication setup exit(0); }