From b72b068a68dccfbb1232cb826bfaeff4bcc05f3b Mon Sep 17 00:00:00 2001 From: me_desk Date: Fri, 31 Aug 2012 17:01:19 +0000 Subject: bugfix: only last node address from database was in linked list returned by PICA_nodeaddr_list_load();Now list is loaded and linked in reverse order git-svn-id: svn://localhost/project_picapica/trunk@196 fb96df88-216d-11de-830c-f3023f12d8ac --- PICA_nodeaddrlist.c | 4 ++-- PICA_nodejoinskynet.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/PICA_nodeaddrlist.c b/PICA_nodeaddrlist.c index 4753e81..d52604f 100755 --- a/PICA_nodeaddrlist.c +++ b/PICA_nodeaddrlist.c @@ -36,7 +36,7 @@ na->inactive_count = atoi(argv[2]); na->last_active = atoi(argv[3]); -na->next = NULL; +na->next = *(cp->n_addr); *(cp->n_addr) = na; (*(cp->N))++; @@ -49,7 +49,7 @@ int PICA_nodeaddr_list_load(char* dbfilename,struct PICA_nodeaddr **list_head) int N=0, ret; sqlite3 *db; char *zErrMsg = 0; -const char query[] = "select address, port, inactive_count, last_active from nodes order by inactive_count asc, last_active desc"; +const char query[] = "select address, port, inactive_count, last_active from nodes order by inactive_count desc, last_active asc"; struct cb_param p = {list_head, &N}; diff --git a/PICA_nodejoinskynet.c b/PICA_nodejoinskynet.c index e91cfcd..faca24a 100644 --- a/PICA_nodejoinskynet.c +++ b/PICA_nodejoinskynet.c @@ -29,6 +29,8 @@ int ret; memset(&h,0,sizeof(struct addrinfo)); +PICA_debug1("connecting to node %.255s %u ...", addr, port); + #ifdef AI_IDN #define H_AI_FLAGS (AI_ADDRCONFIG | AI_IDN) #else -- cgit v1.2.1