From 4315b4ea6b09c7520a3e77a531123013fd392b5e Mon Sep 17 00:00:00 2001 From: me_desk Date: Sun, 26 May 2013 11:09:02 +0000 Subject: fixed casting to in_addr; skynet_refresh_tmst now is updated at the beginning of the PICA_join_skynet in order to prevent refreshing nodelist database in each main loop iteration when nodes database is empty git-svn-id: svn://localhost/project_picapica/trunk@248 fb96df88-216d-11de-830c-f3023f12d8ac --- PICA_node.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'PICA_node.c') diff --git a/PICA_node.c b/PICA_node.c index 76cec95..c66725d 100755 --- a/PICA_node.c +++ b/PICA_node.c @@ -594,7 +594,7 @@ switch (buf[0]) if (nodelink_search_by_ipv4addr(na_ipv4.addr, na_ipv4.port)) //connection with this node is already established { - PICA_debug3("disconnecting node %.16s:%hu - connection with this node is already established", inet_ntoa(na_ipv4.addr), ntohs(na_ipv4.port)); + PICA_debug3("disconnecting node %.16s:%hu - connection with this node is already established", inet_ntoa(*(struct in_addr*)&na_ipv4.addr), ntohs(na_ipv4.port)); return 0; } @@ -2773,6 +2773,8 @@ struct PICA_nodeaddr *nap,*addrlist_h=0; struct nodelink *nl; int ret; +skynet_refresh_tmst = time(0); + ret = PICA_nodeaddr_list_load(addrlistfilename, &addrlist_h);//MEM if (ret <= 0) return; @@ -2821,8 +2823,6 @@ while(nap) } PICA_nodeaddr_list_free(addrlist_h); - -skynet_refresh_tmst = time(0); } int main(int argc,char** argv) -- cgit v1.2.1