ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-11-14 21:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

dingaling tweak

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1660 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale committed 2006-06-22 21:57:40 +00:00
1 parent 4fb9e6e76b
commit 988841611a
3 files changed
+30 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libs/libdingaling/src/libdingaling.c
+15 -6
View File
@@ -549,7 +549,7 @@ static int on_stream(ldl_handle_t *handle, int type, iks * node)
handle->features = iks_stream_features(node);
if (opt_use_tls && !iks_is_secure(handle->parser))
break;
if (ldl_test_flag(handle, LDL_FLAG_AUTHORIZED)) {
if (ldl_test_flag(handle, LDL_FLAG_CONNECTED)) {
iks *t;
if (handle->features & IKS_STREAM_BIND) {
t = iks_make_resource_bind(handle->acc);
@@ -576,14 +576,22 @@ static int on_stream(ldl_handle_t *handle, int type, iks * node)
}
} else if (strcmp("success", iks_name(node)) == 0) {
globals.logger(DL_LOG_DEBUG, "XMPP server connected\n");
if (handle->session_callback) {
handle->session_callback(handle, NULL, LDL_SIGNAL_LOGIN_SUCCESS, "core", "Login Success", handle->login);
}
iks_send_header(handle->parser, handle->acc->server);
ldl_set_flag(handle, LDL_FLAG_AUTHORIZED);
ldl_set_flag(handle, LDL_FLAG_CONNECTED);
if (handle->session_callback) {
handle->session_callback(handle, NULL, LDL_SIGNAL_CONNECTED, "core", "Server Connected", handle->login);
}
} else {
ikspak *pak;
if (!ldl_test_flag(handle, LDL_FLAG_AUTHORIZED)) {
if (handle->session_callback) {
handle->session_callback(handle, NULL, LDL_SIGNAL_LOGIN_SUCCESS, "core", "Login Success", handle->login);
}
globals.logger(DL_LOG_DEBUG, "XMPP authenticated\n");
ldl_set_flag(handle, LDL_FLAG_AUTHORIZED);
}
pak = iks_packet(node);
iks_filter_packet(handle->filter, pak);
if (handle->job_done == 1)
@@ -803,7 +811,7 @@ static void xmpp_connect(ldl_handle_t *handle, char *jabber_id, char *pass)
ldl_flush_queue(handle);
}
if (!ldl_test_flag(handle, LDL_FLAG_AUTHORIZED)) {
if (!ldl_test_flag(handle, LDL_FLAG_CONNECTED)) {
if (IKS_NET_TLSFAIL == e) {
globals.logger(DL_LOG_DEBUG, "tls handshake failed\n");
microsleep(500);
@@ -820,6 +828,7 @@ static void xmpp_connect(ldl_handle_t *handle, char *jabber_id, char *pass)
iks_disconnect(handle->parser);
iks_parser_delete(handle->parser);
ldl_clear_flag(handle, LDL_FLAG_CONNECTED);
ldl_clear_flag(handle, LDL_FLAG_AUTHORIZED);
}
libs/libdingaling/src/libdingaling.h
+3 -1
View File
@@ -99,7 +99,8 @@ typedef enum {
LDL_FLAG_INIT = (1 << 0),
LDL_FLAG_RUNNING = (1 << 1),
LDL_FLAG_AUTHORIZED = (1 << 2),
LDL_FLAG_READY = (1 << 3)
LDL_FLAG_READY = (1 << 3),
LDL_FLAG_CONNECTED = (1 << 4)
} ldl_flag_t;
typedef enum {
@@ -111,6 +112,7 @@ typedef enum {
LDL_SIGNAL_ERROR,
LDL_SIGNAL_LOGIN_SUCCESS,
LDL_SIGNAL_LOGIN_FAILURE,
LDL_SIGNAL_CONNECTED
} ldl_signal_t;
typedef enum {