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

diff --git a/daemon/filenet.c b/daemon/filenet.c
index 9e32dae..99e094a 100644
--- a/daemon/filenet.c
+++ b/daemon/filenet.c
@@ -67,19 +67,18 @@ void killfnetnode(struct fnetnode *fn)
     if(fn->sk != NULL)
     {
 	fn->sk->close = 1;
-	if(fn->sk->data == fn)
-	    putfnetnode(fn);
 	putsock(fn->sk);
 	fn->sk = NULL;
     }
 }
 
-void getfnetnode(struct fnetnode *fn)
+struct fnetnode *getfnetnode(struct fnetnode *fn)
 {
     fn->refcount++;
 #ifdef DEBUG
     fprintf(stderr, "getfnetnode on id %i at %p, refcount=%i\n", fn->id, fn, fn->refcount);
 #endif
+    return(fn);
 }
 
 void putfnetnode(struct fnetnode *fn)
@@ -106,14 +105,20 @@ 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)
 	putsock(fn->sk);
+    if(fn->owner != NULL)
+	free(fn->owner);
     free(fn);
     numfnetnodes--;
 }
@@ -154,19 +159,20 @@ void unlinkfnetnode(struct fnetnode *fn)
     putfnetnode(fn);
 }
 
-static void conncb(struct socket *sk, int err, struct fnetnode *data)
+static int conncb(struct socket *sk, int err, struct fnetnode *data)
 {
     if(err != 0)
     {
 	killfnetnode(data);
 	putfnetnode(data);
-	return;
+	return(1);
     }
     data->sk = sk;
     fnetsetstate(data, FNN_HS);
     socksettos(sk, confgetint("fnet", "fntos"));
     data->fnet->connect(data);
     putfnetnode(data);
+    return(1);
 }
 
 static void resolvecb(struct sockaddr *addr, int addrlen, struct fnetnode *data)
@@ -176,7 +182,7 @@ static void resolvecb(struct sockaddr *addr, int addrlen, struct fnetnode *data)
 	killfnetnode(data);
 	putfnetnode(data);
     } else {
-	netcsconn(addr, addrlen, (void (*)(struct socket *, int, void *))conncb, data);
+	netcsconn(addr, addrlen, (int (*)(struct socket *, int, void *))conncb, data);
     }
 }
 
@@ -243,7 +249,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 +443,11 @@ struct fnet *findfnet(wchar_t *name)
     return(fnet);
 }
 
-struct fnetnode *fnetinitconnect(wchar_t *name, char *addr)
+struct fnetnode *fnetinitconnect(wchar_t *name, wchar_t *owner, char *addr, struct wcspair *args)
 {
     struct fnet *fnet;
     struct fnetnode *fn;
+    struct wcspair *arg;
     
     if((fnet = findfnet(name)) == NULL)
     {
@@ -448,6 +455,16 @@ struct fnetnode *fnetinitconnect(wchar_t *name, char *addr)
 	return(NULL);
     }
     fn = newfn(fnet);
+    fn->owner = swcsdup(owner);
+    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);
@@ -485,6 +502,7 @@ static struct configvar myvars[] =
     {CONF_VAR_INT, "srchwait", {.num = 15}},
     {CONF_VAR_INT, "fntos", {.num = 0}},
     {CONF_VAR_INT, "fnptos", {.num = 0}},
+    {CONF_VAR_INT, "maxnodes", {.num = 0}},
     {CONF_VAR_END}
 };