X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ffilenet.c;h=417f6b8d43cf648c2a2e56e063ccfb29b2bc47a0;hb=547717748489192c66eefedfff7a031010faefce;hp=42fb165984a4a2d18af748b90083ac362057586d;hpb=378f34d2ec72cfdbf02613b40062648b8dac6b6c;p=doldaconnect.git diff --git a/daemon/filenet.c b/daemon/filenet.c index 42fb165..417f6b8 100644 --- a/daemon/filenet.c +++ b/daemon/filenet.c @@ -106,6 +106,8 @@ void putfnetnode(struct fnetnode *fn) CBCHAINFREE(fn, fnetpeer_chdi); if(fn->fnet->destroy != NULL) fn->fnet->destroy(fn); + while(fn->args != NULL) + freewcspair(fn->args, &fn->args); while(fn->peers != NULL) fnetdelpeer(fn->peers); if(fn->mynick != NULL) @@ -437,10 +439,11 @@ struct fnet *findfnet(wchar_t *name) return(fnet); } -struct fnetnode *fnetinitconnect(wchar_t *name, char *addr) +struct fnetnode *fnetinitconnect(wchar_t *name, char *addr, struct wcspair *args) { struct fnet *fnet; struct fnetnode *fn; + struct wcspair *arg; if((fnet = findfnet(name)) == NULL) { @@ -448,6 +451,12 @@ struct fnetnode *fnetinitconnect(wchar_t *name, char *addr) return(NULL); } fn = newfn(fnet); + fn->args = args; + for(arg = fn->args; arg != NULL; arg = arg->next) + { + if(!wcscmp(arg->key, L"nick")) + fnetsetnick(fn, arg->val); + } getfnetnode(fn); if(netresolve(addr, (void (*)(struct sockaddr *, int, void *))resolvecb, fn) < 0) return(NULL);