X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ffilenet.c;h=be6c5affb86292b58eaa592381ebe4967e938ad9;hb=3e0252c1448d505c1f2c58ba8024d5026529ff60;hp=417f6b8d43cf648c2a2e56e063ccfb29b2bc47a0;hpb=547717748489192c66eefedfff7a031010faefce;p=doldaconnect.git

diff --git a/daemon/filenet.c b/daemon/filenet.c
index 417f6b8..be6c5af 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,10 +115,14 @@ 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)
 	putsock(fn->sk);
+    if(fn->owner != NULL)
+	free(fn->owner);
     free(fn);
     numfnetnodes--;
 }
@@ -439,7 +446,7 @@ struct fnet *findfnet(wchar_t *name)
     return(fnet);
 }
 
-struct fnetnode *fnetinitconnect(wchar_t *name, char *addr, struct wcspair *args)
+struct fnetnode *fnetinitconnect(wchar_t *name, wchar_t *owner, char *addr, struct wcspair *args)
 {
     struct fnet *fnet;
     struct fnetnode *fn;
@@ -451,6 +458,10 @@ struct fnetnode *fnetinitconnect(wchar_t *name, char *addr, struct wcspair *args
 	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)
     {
@@ -494,6 +505,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}
 };