X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ffilenet.c;h=dd14f7e7e38eca6874cb5f06ba6be29932b8fb48;hb=a8e6bb8183d91e91e4244d55cc24829db4ce307d;hp=9e32daee32732386f9fb7d4db6bf9b4e1fdad3f9;hpb=d9c95ea0c97dab3b4a11dad6e369d244bd99ebc2;p=doldaconnect.git

diff --git a/daemon/filenet.c b/daemon/filenet.c
index 9e32dae..dd14f7e 100644
--- a/daemon/filenet.c
+++ b/daemon/filenet.c
@@ -106,10 +106,14 @@ 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)
 	free(fn->mynick);
+    if(fn->pubid != NULL)
+	free(fn->pubid);
     if(fn->name != NULL)
 	free(fn->name);
     if(fn->sk != NULL)
@@ -243,7 +247,7 @@ void fnetpeersetstr(struct fnetpeer *peer, wchar_t *id, wchar_t *value)
 	datum = adddatum(peer->fn, id, FNPD_STR);
     di = difindoradd(peer, datum, &changed);
     if(di->data.str != NULL) {
-	changed = (changed || !wcscmp(value, di->data.str));
+	changed = (changed || wcscmp(value, di->data.str));
 	free(di->data.str);
     } else {
 	changed = 1;
@@ -437,10 +441,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 +453,15 @@ struct fnetnode *fnetinitconnect(wchar_t *name, char *addr)
 	return(NULL);
     }
     fn = newfn(fnet);
+    fn->pubid = icmbstowcs(addr, NULL);
+    if(fn->pubid == NULL)
+	fn->pubid = swcsdup(L"");
+    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);