git-svn-id: svn+ssh://svn.dolda2000.com/srv/svn/repos/src/doldaconnect@591
959494ce-11ee-0310-bf91-
de5d638817bd
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)
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)
{
fn->args = args;
for(arg = fn->args; arg != NULL; arg = arg->next)
{
int linked;
int regstatus;
time_t srchwait, lastsrch;
int linked;
int regstatus;
time_t srchwait, lastsrch;
wchar_t *mynick;
struct fnet *fnet;
struct socket *sk;
wchar_t *mynick;
struct fnet *fnet;
struct socket *sk;
}
for(fn = fnetnodes; fn != NULL; fn = fn->next)
{
}
for(fn = fnetnodes; fn != NULL; fn = fn->next)
{
- sq(sk, (fn->next != NULL)?1:0, L"200", L"%%i", fn->id, fn->fnet->name, (fn->name == NULL)?L"":fn->name, L"%%i", fn->numpeers, L"%%i", fn->state, NULL);
+ sq(sk, (fn->next != NULL)?1:0, L"200", L"%%i", fn->id, fn->fnet->name, (fn->name == NULL)?L"":fn->name, L"%%i", fn->numpeers, L"%%i", fn->state, L"%%ls", fn->pubid, NULL);
void (*newpeercb)(struct dc_fnetpeer *peer);
void (*delpeercb)(struct dc_fnetpeer *peer);
void (*chpeercb)(struct dc_fnetpeer *peer);
void (*newpeercb)(struct dc_fnetpeer *peer);
void (*delpeercb)(struct dc_fnetpeer *peer);
void (*chpeercb)(struct dc_fnetpeer *peer);
};
struct dc_fnetpeerdatum
};
struct dc_fnetpeerdatum
fn->name = swcsdup(ires->argv[2].val.str);
fn->numusers = ires->argv[3].val.num;
fn->state = ires->argv[4].val.num;
fn->name = swcsdup(ires->argv[2].val.str);
fn->numusers = ires->argv[3].val.num;
fn->state = ires->argv[4].val.num;
+ if(fn->pubid != NULL)
+ free(fn->pubid);
+ fn->pubid = swcsdup(ires->argv[5].val.str);
} else {
fn = newfn();
fn->id = ires->argv[0].val.num;
} else {
fn = newfn();
fn->id = ires->argv[0].val.num;
fn->name = swcsdup(ires->argv[2].val.str);
fn->numusers = ires->argv[3].val.num;
fn->state = ires->argv[4].val.num;
fn->name = swcsdup(ires->argv[2].val.str);
fn->numusers = ires->argv[3].val.num;
fn->state = ires->argv[4].val.num;
+ fn->pubid = swcsdup(ires->argv[5].val.str);
fn->found = 1;
}
dc_freeires(ires);
fn->found = 1;
}
dc_freeires(ires);