projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged silc_1_1_branch to trunk.
[silc.git]
/
apps
/
silcd
/
idlist.h
diff --git
a/apps/silcd/idlist.h
b/apps/silcd/idlist.h
index fe9f6ced5adf9716128240b10c3aa47b8033ce44..25705a9873d20bcda1fd76e17096ae062a7f6052 100644
(file)
--- a/
apps/silcd/idlist.h
+++ b/
apps/silcd/idlist.h
@@
-162,6
+162,9
@@
struct SilcServerEntryStruct {
/* Connection data */
void *connection;
/* Connection data */
void *connection;
+
+ void *backup_proto;
+ unsigned int backup : 1; /* Set when executing backup protocol */
};
/*
};
/*
@@
-543,6
+546,7
@@
struct SilcIDListStruct {
typedef struct {
/* Generic data structure. DO NOT add anything before this! */
SilcIDListDataStruct data;
typedef struct {
/* Generic data structure. DO NOT add anything before this! */
SilcIDListDataStruct data;
+ SilcAsyncOperation op;
SilcServerConfigRef cconfig;
SilcServerConfigRef sconfig;
SilcServerConfigRef rconfig;
SilcServerConfigRef cconfig;
SilcServerConfigRef sconfig;
SilcServerConfigRef rconfig;
@@
-588,7
+592,8
@@
int silc_idlist_get_clients_by_nickname(SilcIDList id_list, char *nickname,
char *server,
SilcClientEntry **clients,
SilcUInt32 *clients_count);
char *server,
SilcClientEntry **clients,
SilcUInt32 *clients_count);
-int silc_idlist_get_clients_by_hash(SilcIDList id_list, char *nickname,
+int silc_idlist_get_clients_by_hash(SilcIDList id_list,
+ char *nickname, char *server,
SilcHash md5hash,
SilcClientEntry **clients,
SilcUInt32 *clients_count);
SilcHash md5hash,
SilcClientEntry **clients,
SilcUInt32 *clients_count);