]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
use running instead of ready on handles
authorAnthony Minessale <anthony.minessale@gmail.com>
Fri, 21 Aug 2009 22:47:42 +0000 (22:47 +0000)
committerAnthony Minessale <anthony.minessale@gmail.com>
Fri, 21 Aug 2009 22:47:42 +0000 (22:47 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14592 d0543943-73ff-0310-b7d9-9358b9ac24b2

libs/libdingaling/src/libdingaling.c

index 9b480973944253b089731b4cc896bedd87ba39fb..683b10c60e0dd88aafa62f7e88a628d427860ea7 100644 (file)
@@ -1042,7 +1042,6 @@ static int on_result(void *user_data, ikspak *pak)
 
                apr_queue_push(handle->queue, msg);
                msg = NULL;
-               ldl_set_flag_locked(handle, LDL_FLAG_READY);
        }
        return IKS_FILTER_EAT;
 }
@@ -1122,7 +1121,6 @@ static int on_stream_component(ldl_handle_t *handle, int type, iks *node)
                        if (iks_recv(handle->parser, 1) == 2) {
                                handle->state = CS_CONNECTED;
                                if (!ldl_test_flag(handle, LDL_FLAG_AUTHORIZED)) {
-                                       ldl_set_flag_locked(handle, LDL_FLAG_READY);
                                        do_roster(handle);
                                        if (handle->session_callback) {
                                                handle->session_callback(handle, NULL, LDL_SIGNAL_LOGIN_SUCCESS, "user", "core", "Login Success", handle->login);
@@ -1550,7 +1548,7 @@ static void xmpp_connect(ldl_handle_t *handle, char *jabber_id, char *pass)
                                goto fail;
                        }
 
-                       if (!ldl_test_flag(handle, LDL_FLAG_TLS) && ldl_test_flag(handle, LDL_FLAG_READY)) {
+                       if (!ldl_test_flag(handle, LDL_FLAG_TLS) && ldl_test_flag(handle, LDL_FLAG_RUNNING)) {
                                ldl_flush_queue(handle, 0);
                        }
 
@@ -2237,7 +2235,7 @@ void ldl_global_set_log_stream(FILE *log_stream)
 
 int8_t ldl_handle_ready(ldl_handle_t *handle)
 {
-       return (int8_t) (ldl_test_flag(handle, LDL_FLAG_READY) && ldl_test_flag((&globals), LDL_FLAG_READY));
+       return (int8_t) (ldl_test_flag(handle, LDL_FLAG_RUNNING) && ldl_test_flag((&globals), LDL_FLAG_READY));
 }
 
 ldl_status ldl_handle_init(ldl_handle_t **handle,