diff options
| -rwxr-xr-x | Makefile | 6 | ||||
| -rwxr-xr-x | PICA_node.c | 30 | ||||
| -rwxr-xr-x | PICA_nodeaddrlist.c | 20 | ||||
| -rw-r--r-- | PICA_nodejoinskynet.c | 6 |
4 files changed, 42 insertions, 20 deletions
@@ -7,16 +7,16 @@ all: pica-node; pica-node: $(OBJS) gcc $(OBJS) $(LIBS) -o pica-node # добавить CFLAGS и все такое -PICA_node.o: PICA_node.c PICA_node.h PICA_msgproc.h PICA_nodeaddrlist.h PICA_nodejoinskynet.h PICA_nodeconfig.h +PICA_node.o: PICA_node.c PICA_node.h PICA_msgproc.h PICA_nodeaddrlist.h PICA_nodejoinskynet.h PICA_nodeconfig.h PICA_common.h PICA_proto.h PICA_log.h gcc $(CFLAGS) -c PICA_node.c PICA_msgproc.o: PICA_msgproc.c PICA_msgproc.h gcc $(CFLAGS) -c PICA_msgproc.c -PICA_nodeaddrlist.o: PICA_nodeaddrlist.c PICA_nodeaddrlist.h +PICA_nodeaddrlist.o: PICA_nodeaddrlist.c PICA_nodeaddrlist.h PICA_log.h gcc $(CFLAGS) -c PICA_nodeaddrlist.c -PICA_nodejoinskynet.o: PICA_nodejoinskynet.c PICA_nodejoinskynet.h PICA_nodeaddrlist.h +PICA_nodejoinskynet.o: PICA_nodejoinskynet.c PICA_nodejoinskynet.h PICA_nodeaddrlist.h PICA_common.h PICA_proto.h PICA_msgproc.h PICA_log.h gcc $(CFLAGS) -c PICA_nodejoinskynet.c PICA_nodeconfig.o: PICA_nodeconfig.c PICA_nodeconfig.h iniparser/src/iniparser.h iniparser/src/dictionary.h diff --git a/PICA_node.c b/PICA_node.c index 07f4bf7..49350ae 100755 --- a/PICA_node.c +++ b/PICA_node.c @@ -2328,6 +2328,8 @@ MIT License"); void process_cmdline(int argc,char** argv) { int opt; +int verbosity = 0; + while((opt = getopt(argc, argv, "f:hvV")) != -1) { switch(opt) @@ -2335,18 +2337,33 @@ while((opt = getopt(argc, argv, "f:hvV")) != -1) case 'f': nodecfg.config_file = strdup(optarg); break; + case 'h': print_usage(); exit(0); break; + case 'v': + verbosity++; + break; + case 'V': print_version(); exit(0); break; + + default: + PICA_error("unknown option - %c", optopt); + print_usage(); + exit(-1); } } + +if (verbosity > 3) + verbosity = 3; + +PICA_set_loglevel(PICA_LOG_INFO + verbosity); } int main(int argc,char** argv) @@ -2354,7 +2371,14 @@ int main(int argc,char** argv) process_cmdline(argc, argv); -PICA_nodeconfig_load(nodecfg.config_file ? nodecfg.config_file : "/etc/pica-node.ini"); +nodecfg.config_file = (nodecfg.config_file ? nodecfg.config_file : "/etc/pica-node.ini"); + +PICA_nodeconfig_load(nodecfg.config_file); + +PICA_debug1("nodecfg.config_file = %s", nodecfg.config_file); +PICA_debug1("nodecfg.announced_addr = %s",nodecfg.announced_addr); +PICA_debug1("nodecfg.listen_port = %s",nodecfg.listen_port); +PICA_debug1("nodecfg.nodes_db_file = %s",nodecfg.nodes_db_file); if (!PICA_node_init()) return -1; @@ -2364,10 +2388,6 @@ if (!PICA_node_init()) PICA_node_joinskynet(nodecfg.nodes_db_file, nodecfg.announced_addr);//CONF-CONF имя файла с адресами узлов, свой адрес -printf("nodecfg.announced_addr =%s\n",nodecfg.announced_addr);//debug -printf("nodecfg.listen_port =%s\n",nodecfg.listen_port);//debug -printf("nodecfg.nodes_db_file =%s\n",nodecfg.nodes_db_file);//debug - my_addr = nodecfg.announced_addr;//TEMP FIXME return node_loop(); diff --git a/PICA_nodeaddrlist.c b/PICA_nodeaddrlist.c index e1b4ff0..f4e710d 100755 --- a/PICA_nodeaddrlist.c +++ b/PICA_nodeaddrlist.c @@ -1,8 +1,10 @@ -#include "PICA_nodeaddrlist.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <sqlite3.h> +#include "PICA_nodeaddrlist.h" +#include "PICA_log.h" + struct cb_param { @@ -23,7 +25,7 @@ na = (struct PICA_nodeaddr *)malloc(sizeof(struct PICA_nodeaddr)); if (!na) return 1; -printf("NODE: addr: %s port %s\n", argv[0], argv[1]);//debug +PICA_debug1("node address loaded: addr: %s port %s\n", argv[0], argv[1]);//debug strncpy(na->addr, argv[0], 255); na->addr[255] = '\0'; @@ -55,7 +57,7 @@ ret = sqlite3_open(dbfilename, &db); if (ret != SQLITE_OK) { - fprintf(stderr, "Can't open nodelist database: %s\n", sqlite3_errmsg(db)); + PICA_error( "Can't open nodelist database: %s\n", sqlite3_errmsg(db)); sqlite3_close(db); return -1; } @@ -64,7 +66,7 @@ ret = sqlite3_exec(db, query, nodeaddr_load_sqlite_cb, &p, &zErrMsg); if( ret != SQLITE_OK ) { - fprintf(stderr, "SQL error: %s\n", zErrMsg); + PICA_error("SQL error: %s\n", zErrMsg); sqlite3_free(zErrMsg); } @@ -85,7 +87,7 @@ ret = sqlite3_open(dbfilename, &db); if (ret != SQLITE_OK) { - fprintf(stderr, "Can't open nodelist database: %s\n", sqlite3_errmsg(db)); + PICA_error("Can't open nodelist database: %s\n", sqlite3_errmsg(db)); sqlite3_close(db); return -1; } @@ -94,7 +96,7 @@ ret = sqlite3_prepare_v2(db, query, -1, &stmt, NULL); if (ret != SQLITE_OK) { - fprintf(stderr, "Can't prepare SQLite statement: %s\n", sqlite3_errmsg(db)); + PICA_error("Can't prepare SQLite statement: %s\n", sqlite3_errmsg(db)); sqlite3_close(db); return -1; } @@ -103,7 +105,7 @@ ret = sqlite3_bind_text(stmt, 1, naddr->addr, -1, SQLITE_STATIC); if (ret != SQLITE_OK) { - fprintf(stderr, "Can't bind address value: %s\n", sqlite3_errmsg(db)); + PICA_error("Can't bind address value: %s\n", sqlite3_errmsg(db)); sqlite3_finalize(stmt); sqlite3_close(db); return -1; @@ -113,7 +115,7 @@ ret = sqlite3_bind_int(stmt, 2, naddr->port); if (ret != SQLITE_OK) { - fprintf(stderr, "Can't bind port value: %s\n", sqlite3_errmsg(db)); + PICA_error("Can't bind port value: %s\n", sqlite3_errmsg(db)); sqlite3_finalize(stmt); sqlite3_close(db); return -1; @@ -123,7 +125,7 @@ ret = sqlite3_step(stmt); if (ret !=SQLITE_DONE) { - fprintf(stderr, "Can't execute query: %s\n", sqlite3_errmsg(db)); + PICA_error( "Can't execute query: %s\n", sqlite3_errmsg(db)); sqlite3_finalize(stmt); sqlite3_close(db); return -1; diff --git a/PICA_nodejoinskynet.c b/PICA_nodejoinskynet.c index dad8411..32a239e 100644 --- a/PICA_nodejoinskynet.c +++ b/PICA_nodejoinskynet.c @@ -5,6 +5,7 @@ #include "PICA_msgproc.h" #include "PICA_common.h" #include "PICA_nodeconfig.h" +#include "PICA_log.h" #include <time.h> #include <sys/time.h> @@ -120,11 +121,11 @@ else { if (proto_version.c[0]> PICA_PROTO_VER_HIGH || (proto_version.c[1]> PICA_PROTO_VER_LOW && proto_version.c[0]== PICA_PROTO_VER_HIGH)) { - puts("make update of node software");//debug + PICA_info("make update of node software - peer node has newer protocol version"); } else {//peer node has older software version - puts("peer node has older protocol version");//debug + PICA_info("peer node has older protocol version"); } } return 0; @@ -154,7 +155,6 @@ struct newconn nc; clock_t tmst,t; int ret; -printf("filename = %s, my_addr = %s \n", addrlistfilename, my_addr);//debug ret=PICA_nodeaddr_list_load(addrlistfilename,&addrlist_h);//MEM if (ret<=0) |