projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/silc.1.1.branch'
[silc.git]
/
apps
/
silcd
/
server_backup.c
diff --git
a/apps/silcd/server_backup.c
b/apps/silcd/server_backup.c
index 3bde1802a3f00cb405bba34c5fa26c89f50b42f4..8f5140c1f779af72302062511e7ce1b448e00043 100644
(file)
--- a/
apps/silcd/server_backup.c
+++ b/
apps/silcd/server_backup.c
@@
-786,6
+786,8
@@
SILC_TASK_CALLBACK(silc_server_backup_connected_again)
SilcServer server = app_context;
SilcServerConfigRouter *primary;
SilcServer server = app_context;
SilcServerConfigRouter *primary;
+ SILC_LOG_DEBUG(("Reconnecting"));
+
if (server->server_shutdown)
return;
if (server->server_shutdown)
return;
@@
-793,7
+795,7
@@
SILC_TASK_CALLBACK(silc_server_backup_connected_again)
if (primary) {
if (!silc_server_find_socket_by_host(server, SILC_CONN_ROUTER,
primary->host, primary->port))
if (primary) {
if (!silc_server_find_socket_by_host(server, SILC_CONN_ROUTER,
primary->host, primary->port))
- silc_server_create_connection(server,
FALS
E, FALSE,
+ silc_server_create_connection(server,
TRU
E, FALSE,
primary->host, primary->port,
silc_server_backup_connected,
context);
primary->host, primary->port,
silc_server_backup_connected,
context);
@@
-813,6
+815,7
@@
void silc_server_backup_connected(SilcServer server,
if (!server_entry) {
/* Try again */
if (!server_entry) {
/* Try again */
+ SILC_LOG_DEBUG(("Connecting failed"));
silc_schedule_task_add_timeout(server->schedule,
silc_server_backup_connected_again,
context, 5, 0);
silc_schedule_task_add_timeout(server->schedule,
silc_server_backup_connected_again,
context, 5, 0);
@@
-843,7
+846,7
@@
SILC_TASK_CALLBACK(silc_server_backup_connect_primary_again)
if (primary) {
if (!silc_server_find_socket_by_host(server, SILC_CONN_ROUTER,
primary->host, primary->port))
if (primary) {
if (!silc_server_find_socket_by_host(server, SILC_CONN_ROUTER,
primary->host, primary->port))
- silc_server_create_connection(server,
FALS
E, FALSE,
+ silc_server_create_connection(server,
TRU
E, FALSE,
primary->host, primary->port,
silc_server_backup_connect_primary,
context);
primary->host, primary->port,
silc_server_backup_connect_primary,
context);
@@
-1043,7
+1046,7
@@
SILC_TASK_CALLBACK(silc_server_protocol_backup)
SILC_LOG_DEBUG(("Received START (session %d), reconnect to router",
ctx->session));
silc_packet_stream_ref(ctx->sock);
SILC_LOG_DEBUG(("Received START (session %d), reconnect to router",
ctx->session));
silc_packet_stream_ref(ctx->sock);
- silc_server_create_connection(server,
FALS
E, FALSE,
+ silc_server_create_connection(server,
TRU
E, FALSE,
primary->host, primary->port,
silc_server_backup_connect_primary,
ctx->sock);
primary->host, primary->port,
silc_server_backup_connect_primary,
ctx->sock);