Dolda2000 GitWeb
/
doldaconnect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More correct return on conv error.
[doldaconnect.git]
/
daemon
/
filenet.c
diff --git
a/daemon/filenet.c
b/daemon/filenet.c
index
0380ce4
..
5e2b607
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->close = 1;
if(fn->sk->data == fn)
+ {
+ fn->sk->data = NULL;
putfnetnode(fn);
putfnetnode(fn);
+ }
putsock(fn->sk);
fn->sk = NULL;
}
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);
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)
if(fn->name != NULL)
free(fn->name);
if(fn->sk != NULL)
@@
-439,10
+444,11
@@
struct fnet *findfnet(wchar_t *name)
return(fnet);
}
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 fnet *fnet;
struct fnetnode *fn;
+ struct wcspair *arg;
if((fnet = findfnet(name)) == NULL)
{
if((fnet = findfnet(name)) == NULL)
{
@@
-450,6
+456,15
@@
struct fnetnode *fnetinitconnect(wchar_t *name, char *addr)
return(NULL);
}
fn = newfn(fnet);
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);
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, "srchwait", {.num = 15}},
{CONF_VAR_INT, "fntos", {.num = 0}},
{CONF_VAR_INT, "fnptos", {.num = 0}},
+ {CONF_VAR_INT, "maxnodes", {.num = 0}},
{CONF_VAR_END}
};
{CONF_VAR_END}
};