From cece2a51a8039efc3d67f37b11b7c8122641cd85 Mon Sep 17 00:00:00 2001 From: fredrik Date: Fri, 4 Nov 2005 01:45:10 +0000 Subject: [PATCH] Always track peers. git-svn-id: svn+ssh://svn.dolda2000.com/srv/svn/repos/src/doldaconnect@443 959494ce-11ee-0310-bf91-de5d638817bd --- include/doldaconnect/uimisc.h | 1 - lib/uimisc.c | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/include/doldaconnect/uimisc.h b/include/doldaconnect/uimisc.h index 77bf907..eafc66a 100644 --- a/include/doldaconnect/uimisc.h +++ b/include/doldaconnect/uimisc.h @@ -48,7 +48,6 @@ struct dc_fnetnode int found; void (*destroycb)(struct dc_fnetnode *fn); void *udata; - int trackpeers; struct dc_fnetpeer *peers; struct dc_fnetpeerdatum *peerdata; }; diff --git a/lib/uimisc.c b/lib/uimisc.c index 6c799df..d989e1e 100644 --- a/lib/uimisc.c +++ b/lib/uimisc.c @@ -1034,11 +1034,9 @@ static int getpeerlistcallback(struct dc_response *resp) if(!peer->found) delpeer(peer); } - fn->trackpeers = 1; } else if(resp->code == 201) { while(fn->peers != NULL) delpeer(fn->peers); - fn->trackpeers = 1; } data->callback(fn, resp->code, data->data); free(data); @@ -1217,21 +1215,21 @@ void dc_uimisc_handlenotify(struct dc_response *resp) } break; case 630: - if(((fn = dc_findfnetnode(ires->argv[0].val.num)) != NULL) && fn->trackpeers) + if((fn = dc_findfnetnode(ires->argv[0].val.num)) != NULL) { if((peer = dc_fnetfindpeer(fn, ires->argv[1].val.str)) == NULL) addpeer(fn, ires->argv[1].val.str, ires->argv[2].val.str); } break; case 631: - if(((fn = dc_findfnetnode(ires->argv[0].val.num)) != NULL) && fn->trackpeers) + if((fn = dc_findfnetnode(ires->argv[0].val.num)) != NULL) { if((peer = dc_fnetfindpeer(fn, ires->argv[1].val.str)) != NULL) delpeer(peer); } break; case 632: - if(((fn = dc_findfnetnode(ires->argv[0].val.num)) != NULL) && fn->trackpeers) + if((fn = dc_findfnetnode(ires->argv[0].val.num)) != NULL) { if((peer = dc_fnetfindpeer(fn, ires->argv[1].val.str)) != NULL) { -- 2.11.0