Dolda2000 GitWeb
/
doldaconnect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add getresps.
[doldaconnect.git]
/
daemon
/
filenet.c
diff --git
a/daemon/filenet.c
b/daemon/filenet.c
index
9e32dae
..
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;
}
@@
-106,10
+109,14
@@
void putfnetnode(struct fnetnode *fn)
CBCHAINFREE(fn, fnetpeer_chdi);
if(fn->fnet->destroy != NULL)
fn->fnet->destroy(fn);
CBCHAINFREE(fn, fnetpeer_chdi);
if(fn->fnet->destroy != NULL)
fn->fnet->destroy(fn);
+ while(fn->args != NULL)
+ freewcspair(fn->args, &fn->args);
while(fn->peers != NULL)
fnetdelpeer(fn->peers);
if(fn->mynick != NULL)
free(fn->mynick);
while(fn->peers != NULL)
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)
@@
-243,7
+250,7
@@
void fnetpeersetstr(struct fnetpeer *peer, wchar_t *id, wchar_t *value)
datum = adddatum(peer->fn, id, FNPD_STR);
di = difindoradd(peer, datum, &changed);
if(di->data.str != NULL) {
datum = adddatum(peer->fn, id, FNPD_STR);
di = difindoradd(peer, datum, &changed);
if(di->data.str != NULL) {
- changed = (changed ||
!
wcscmp(value, di->data.str));
+ changed = (changed || wcscmp(value, di->data.str));
free(di->data.str);
} else {
changed = 1;
free(di->data.str);
} else {
changed = 1;
@@
-437,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)
{
@@
-448,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);
@@
-485,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}
};