Dolda2000 GitWeb
/
doldaconnect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow using the default ccache.
[doldaconnect.git]
/
daemon
/
filenet.c
diff --git
a/daemon/filenet.c
b/daemon/filenet.c
index
81a83c4
..
dd14f7e
100644
(file)
--- a/
daemon/filenet.c
+++ b/
daemon/filenet.c
@@
-52,6
+52,9
@@
static struct fnetnode *newfn(struct fnet *fnet)
CBCHAININIT(new, fnetnode_chat);
CBCHAININIT(new, fnetnode_unlink);
CBCHAININIT(new, fnetnode_destroy);
CBCHAININIT(new, fnetnode_chat);
CBCHAININIT(new, fnetnode_unlink);
CBCHAININIT(new, fnetnode_destroy);
+ CBCHAININIT(new, fnetpeer_new);
+ CBCHAININIT(new, fnetpeer_del);
+ CBCHAININIT(new, fnetpeer_chdi);
new->next = NULL;
new->prev = NULL;
numfnetnodes++;
new->next = NULL;
new->prev = NULL;
numfnetnodes++;
@@
-98,12
+101,19
@@
void putfnetnode(struct fnetnode *fn)
CBCHAINFREE(fn, fnetnode_chat);
CBCHAINFREE(fn, fnetnode_unlink);
CBCHAINFREE(fn, fnetnode_destroy);
CBCHAINFREE(fn, fnetnode_chat);
CBCHAINFREE(fn, fnetnode_unlink);
CBCHAINFREE(fn, fnetnode_destroy);
+ CBCHAINFREE(fn, fnetpeer_new);
+ CBCHAINFREE(fn, fnetpeer_del);
+ CBCHAINFREE(fn, fnetpeer_chdi);
if(fn->fnet->destroy != NULL)
fn->fnet->destroy(fn);
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)
@@
-202,7
+212,7
@@
static struct fnetpeerdatum *adddatum(struct fnetnode *fn, wchar_t *id, int data
return(new);
}
return(new);
}
-static struct fnetpeerdi *difindoradd(struct fnetpeer *peer, struct fnetpeerdatum *datum)
+static struct fnetpeerdi *difindoradd(struct fnetpeer *peer, struct fnetpeerdatum *datum
, int *isnew
)
{
int i;
{
int i;
@@
-217,8
+227,12
@@
static struct fnetpeerdi *difindoradd(struct fnetpeer *peer, struct fnetpeerdatu
memset(&peer->peerdi[peer->dinum], 0, sizeof(struct fnetpeerdi));
peer->peerdi[peer->dinum].datum = datum;
datum->refcount++;
memset(&peer->peerdi[peer->dinum], 0, sizeof(struct fnetpeerdi));
peer->peerdi[peer->dinum].datum = datum;
datum->refcount++;
+ if(isnew != NULL)
+ *isnew = 1;
return(&peer->peerdi[peer->dinum++]);
} else {
return(&peer->peerdi[peer->dinum++]);
} else {
+ if(isnew != NULL)
+ *isnew = 0;
return(&peer->peerdi[i]);
}
}
return(&peer->peerdi[i]);
}
}
@@
-227,35
+241,50
@@
void fnetpeersetstr(struct fnetpeer *peer, wchar_t *id, wchar_t *value)
{
struct fnetpeerdatum *datum;
struct fnetpeerdi *di;
{
struct fnetpeerdatum *datum;
struct fnetpeerdi *di;
+ int changed;
if((datum = finddatum(peer->fn, id)) == NULL)
datum = adddatum(peer->fn, id, FNPD_STR);
if((datum = finddatum(peer->fn, id)) == NULL)
datum = adddatum(peer->fn, id, FNPD_STR);
- di = difindoradd(peer, datum);
- if(di->data.str != NULL)
+ di = difindoradd(peer, datum, &changed);
+ if(di->data.str != NULL) {
+ changed = (changed || wcscmp(value, di->data.str));
free(di->data.str);
free(di->data.str);
+ } else {
+ changed = 1;
+ }
di->data.str = swcsdup(value);
di->data.str = swcsdup(value);
+ if(changed)
+ CBCHAINDOCB(peer->fn, fnetpeer_chdi, peer->fn, peer, di);
}
void fnetpeersetnum(struct fnetpeer *peer, wchar_t *id, int value)
{
struct fnetpeerdatum *datum;
struct fnetpeerdi *di;
}
void fnetpeersetnum(struct fnetpeer *peer, wchar_t *id, int value)
{
struct fnetpeerdatum *datum;
struct fnetpeerdi *di;
+ int changed;
if((datum = finddatum(peer->fn, id)) == NULL)
datum = adddatum(peer->fn, id, FNPD_INT);
if((datum = finddatum(peer->fn, id)) == NULL)
datum = adddatum(peer->fn, id, FNPD_INT);
- di = difindoradd(peer, datum);
+ di = difindoradd(peer, datum, &changed);
+ changed = (changed || (di->data.num != value));
di->data.num = value;
di->data.num = value;
+ if(changed)
+ CBCHAINDOCB(peer->fn, fnetpeer_chdi, peer->fn, peer, di);
}
void fnetpeersetlnum(struct fnetpeer *peer, wchar_t *id, long long value)
{
struct fnetpeerdatum *datum;
struct fnetpeerdi *di;
}
void fnetpeersetlnum(struct fnetpeer *peer, wchar_t *id, long long value)
{
struct fnetpeerdatum *datum;
struct fnetpeerdi *di;
+ int changed;
if((datum = finddatum(peer->fn, id)) == NULL)
datum = adddatum(peer->fn, id, FNPD_LL);
if((datum = finddatum(peer->fn, id)) == NULL)
datum = adddatum(peer->fn, id, FNPD_LL);
- di = difindoradd(peer, datum);
+ di = difindoradd(peer, datum, &changed);
+ changed = (changed || (di->data.lnum != value));
di->data.lnum = value;
di->data.lnum = value;
+ if(changed)
+ CBCHAINDOCB(peer->fn, fnetpeer_chdi, peer->fn, peer, di);
}
static void putdatum(struct fnetpeer *peer, struct fnetpeerdatum *datum)
}
static void putdatum(struct fnetpeer *peer, struct fnetpeerdatum *datum)
@@
-311,6
+340,7
@@
struct fnetpeer *fnetaddpeer(struct fnetnode *fn, wchar_t *id, wchar_t *nick)
fn->peers = new;
fn->numpeers++;
CBCHAINDOCB(fn, fnetnode_ac, fn, L"numpeers");
fn->peers = new;
fn->numpeers++;
CBCHAINDOCB(fn, fnetnode_ac, fn, L"numpeers");
+ CBCHAINDOCB(fn, fnetpeer_new, fn, new);
return(new);
}
return(new);
}
@@
-326,6
+356,7
@@
void fnetdelpeer(struct fnetpeer *peer)
peer->fn->peers = peer->next;
peer->fn->numpeers--;
CBCHAINDOCB(peer->fn, fnetnode_ac, peer->fn, L"numpeers");
peer->fn->peers = peer->next;
peer->fn->numpeers--;
CBCHAINDOCB(peer->fn, fnetnode_ac, peer->fn, L"numpeers");
+ CBCHAINDOCB(peer->fn, fnetpeer_del, peer->fn, peer);
free(peer->id);
free(peer->nick);
for(i = 0; i < peer->dinum; i++)
free(peer->id);
free(peer->nick);
for(i = 0; i < peer->dinum; i++)
@@
-410,10
+441,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)
{
@@
-421,6
+453,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);