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)
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--;
}
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)
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);
}
}
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)
{
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);
{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}
};