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
/
server.h
diff --git
a/apps/silcd/server.h
b/apps/silcd/server.h
index b3021e7839cb3307775f9198181fddaa17cd0829..84ed585b79565f047e7d440c369cb709361d071e 100644
(file)
--- a/
apps/silcd/server.h
+++ b/
apps/silcd/server.h
@@
-120,11
+120,6
@@
do { \
silc_free(__fmt__); \
} while(0)
silc_free(__fmt__); \
} while(0)
-/* Check whether rekey protocol is active */
-#define SILC_SERVER_IS_REKEY(sock) \
- (sock->protocol && sock->protocol->protocol && \
- sock->protocol->protocol->type == SILC_PROTOCOL_SERVER_REKEY)
-
/* Output a message to stderr or to the appropriate log facility wether
we are in the background or not. */
#define SILC_SERVER_LOG_INFO(fmt) \
/* Output a message to stderr or to the appropriate log facility wether
we are in the background or not. */
#define SILC_SERVER_LOG_INFO(fmt) \
@@
-146,6
+141,7
@@
void silc_server_stop(SilcServer server);
void silc_server_start_key_exchange(SilcServerConnection sconn);
void silc_server_create_connection(SilcServer server,
SilcBool reconnect,
void silc_server_start_key_exchange(SilcServerConnection sconn);
void silc_server_create_connection(SilcServer server,
SilcBool reconnect,
+ SilcBool dynamic,
const char *remote_host, SilcUInt32 port,
SilcServerConnectCallback callback,
void *context);
const char *remote_host, SilcUInt32 port,
SilcServerConnectCallback callback,
void *context);