X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ffilenet.c;h=5e2b607e7a6eb4bfbd17467c837ebf8d0c88939d;hb=161604ea3b618f4c63ff6e074ef0ae5d94e08708;hp=0380ce411bc8fa53f37fcdd5cb2591d61dc0e37e;hpb=3ea7528f421c6fb41172073504e03c555c87d9fb;p=doldaconnect.git

diff --git a/daemon/filenet.c b/daemon/filenet.c
index 0380ce4..5e2b607 100644
--- a/daemon/filenet.c
+++ b/daemon/filenet.c
@@ -68,7 +68,10 @@ void killfnetnode(struct fnetnode *fn)
     {
 	fn->sk->close = 1;
 	if(fn->sk->data == fn)
+	{
+	    fn->sk->data = NULL;
 	    putfnetnode(fn);
+	}
 	putsock(fn->sk);
 	fn->sk = NULL;
     }
@@ -112,6 +115,8 @@ void putfnetnode(struct fnetnode *fn)
 	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)
@@ -439,10 +444,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)
     {
@@ -450,6 +456,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);
@@ -487,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}
 };