Revert to previous socket scheme.

[doldaconnect.git] / daemon / filenet.c

diff --git a/daemon/filenet.c b/daemon/filenet.c
index dd14f7e..be6c5af 100644 (file)
--- 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;
     }
@@ -118,6 +121,8 @@ void putfnetnode(struct fnetnode *fn)
        free(fn->name);
     if(fn->sk != NULL)
        putsock(fn->sk);
+    if(fn->owner != NULL)
+       free(fn->owner);
     free(fn);
     numfnetnodes--;
 }
@@ -441,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;
@@ -453,6 +458,7 @@ 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"");
@@ -499,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}
 };