kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 09:36:46 +00:00
Code Issues Projects Releases Wiki Activity

fix auto-restart on disconnect

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13134 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
2009-04-23 15:54:47 +00:00
parent 2ffd15aefd
commit e6e5fde3b0
436 changed files with 171499 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libs/libdingaling/src/libdingaling.c
View File

@@ -144,6 +144,7 @@ struct ldl_handle {
void *private_info;
FILE *log_stream;
ldl_handle_state_t state;
int fail_count;
};
struct ldl_session {
@@ -1128,6 +1129,7 @@ static int on_stream_component(ldl_handle_t *handle, int type, iks *node)
}
globals.logger(DL_LOG_DEBUG, "XMPP authenticated\n");
ldl_set_flag_locked(handle, LDL_FLAG_AUTHORIZED);
handle->fail_count = 0;
}
} else {
globals.logger(DL_LOG_ERR, "LOGIN ERROR!\n");
@@ -1433,7 +1435,7 @@ static void *APR_THREAD_FUNC queue_thread(apr_thread_t *thread, void *obj)
ldl_set_flag_locked(handle, LDL_FLAG_QUEUE_RUNNING);
while (ldl_test_flag(handle, LDL_FLAG_RUNNING)) {
while (ldl_test_flag(handle, LDL_FLAG_RUNNING) && !ldl_test_flag(handle, LDL_FLAG_QUEUE_STOP)) {
ldl_flush_queue(handle, 0);
if (handle->loop_callback(handle) != LDL_STATUS_SUCCESS || !ldl_test_flag((&globals), LDL_FLAG_READY)) {
@@ -1442,13 +1444,14 @@ static void *APR_THREAD_FUNC queue_thread(apr_thread_t *thread, void *obj)
if ((fd = iks_fd(handle->parser)) > -1) {
shutdown(fd, 0x02);
}
ldl_clear_flag_locked(handle, LDL_FLAG_RUNNING);
ldl_set_flag_locked(handle, LDL_FLAG_BREAK);
break;
}
microsleep(100);
}
ldl_clear_flag_locked(handle, LDL_FLAG_QUEUE_RUNNING);
ldl_clear_flag_locked(handle, LDL_FLAG_QUEUE_STOP);
return NULL;
}
@@ -1541,13 +1544,12 @@ static void xmpp_connect(ldl_handle_t *handle, char *jabber_id, char *pass)
break;
}
if (IKS_OK != e) {
globals.logger(DL_LOG_DEBUG, "io error 2 %d\n", e);
microsleep(1000);
if (IKS_OK != e || ldl_test_flag(handle, LDL_FLAG_BREAK)) {
globals.logger(DL_LOG_DEBUG, "io error 2 %d retry in %d second(s)\n", e, ++handle->fail_count);
microsleep(1000 * handle->fail_count);
goto fail;
}
if (!ldl_test_flag(handle, LDL_FLAG_TLS) && ldl_test_flag(handle, LDL_FLAG_READY)) {
ldl_flush_queue(handle, 0);
}
@@ -1569,14 +1571,18 @@ static void xmpp_connect(ldl_handle_t *handle, char *jabber_id, char *pass)
fail:
ldl_set_flag_locked(handle, LDL_FLAG_QUEUE_STOP);
ldl_clear_flag_locked(handle, LDL_FLAG_CONNECTED);
ldl_clear_flag_locked(handle, LDL_FLAG_AUTHORIZED);
ldl_clear_flag_locked(handle, LDL_FLAG_BREAK);
handle->state = CS_NEW;
if ((fd = iks_fd(handle->parser)) > -1) {
shutdown(fd, 0x02);
}
while(ldl_test_flag(handle, LDL_FLAG_QUEUE_RUNNING)) {
microsleep(100);
}

4
libs/libdingaling/src/libdingaling.h
View File

@@ -120,7 +120,9 @@ typedef enum {
LDL_FLAG_READY = (1 << 3),
LDL_FLAG_CONNECTED = (1 << 4),
LDL_FLAG_QUEUE_RUNNING = (1 << 5),
LDL_FLAG_STOPPED = (1 << 6)
LDL_FLAG_STOPPED = (1 << 6),
LDL_FLAG_QUEUE_STOP = (1 << 7),
LDL_FLAG_BREAK = (1 << 8)
} ldl_flag_t;
typedef enum {