Fixed broken timeout condition

[lcr.git] / chan_lcr.c

diff --git a/chan_lcr.c b/chan_lcr.c
index 2740a32..a8ded4a 100644 (file)
--- a/chan_lcr.c
+++ b/chan_lcr.c
@@ -208,8 +208,6 @@ int wake_global = 0;
 int wake_pipe[2];
 struct lcr_fd wake_fd;
 
-int quit;
-
 int glob_channel = 0;
 
 int lcr_sock = -1;
@@ -362,7 +360,7 @@ int send_message(int message_type, unsigned int ref, union parameter *param)
                CDEBUG(NULL, NULL, "Ignoring message %d, because socket is closed.\n", message_type);
                return -1;
        }
-       CDEBUG(NULL, NULL, "Sending %s to socket.\n", messages_txt[message_type]);
+       CDEBUG(NULL, NULL, "Sending %s to socket. (ref=%d)\n", messages_txt[message_type], ref);
 
        adminp = &admin_first;
        while(*adminp)
@@ -1154,7 +1152,7 @@ static void lcr_in_connect(struct chan_call *call, int message_type, union param
        call->state = CHAN_LCR_STATE_CONNECT;
        /* request bchannel */
        if (!call->bchannel) {
-               CDEBUG(call, call->ast, "Requesting B-channel.\n");
+               CDEBUG(call, call->ast, "Requesting B-channel. (ref=%d)\n", call->ref);
                memset(&newparam, 0, sizeof(union parameter));
                newparam.bchannel.type = BCHANNEL_REQUEST;
                send_message(MESSAGE_BCHANNEL, call->ref, &newparam);
@@ -1307,7 +1305,7 @@ static void lcr_in_notify(struct chan_call *call, int message_type, union parame
 
        /* request bchannel, if call is resumed and we don't have it */
        if (param->notifyinfo.notify == INFO_NOTIFY_USER_RESUMED && !call->bchannel && call->ref) {
-               CDEBUG(call, call->ast, "Reqesting bchannel at resume.\n");
+               CDEBUG(call, call->ast, "Reqesting bchannel at resume. (ref=%d)\n", call->ref);
                memset(&newparam, 0, sizeof(union parameter));
                newparam.bchannel.type = BCHANNEL_REQUEST;
                send_message(MESSAGE_BCHANNEL, call->ref, &newparam);
@@ -1350,7 +1348,7 @@ static void lcr_in_pattern(struct chan_call *call, int message_type, union param
 
        /* request bchannel */
        if (!call->bchannel) {
-               CDEBUG(call, call->ast, "Requesting B-channel.\n");
+               CDEBUG(call, call->ast, "Requesting B-channel. (ref=%d)\n", call->ref);
                memset(&newparam, 0, sizeof(union parameter));
                newparam.bchannel.type = BCHANNEL_REQUEST;
                send_message(MESSAGE_BCHANNEL, call->ref, &newparam);
@@ -1522,8 +1520,7 @@ int receive_message(int message_type, unsigned int ref, union parameter *param)
                        call = find_call_ref(0);
                        if (!call) {
                                /* send release, if ref does not exist */
-                               CDEBUG(NULL, NULL, "No call found, that requests a ref.\n");
-                               send_release_and_import(call, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL);
+                               CERROR(NULL, NULL, "No call found, that requests a ref.\n");
                                return 0;
                        }
                        /* store new ref */
@@ -1936,23 +1933,11 @@ static void *chan_thread(void *arg)
 
        ast_mutex_lock(&chan_lock);
 
-       while(!quit) {
+       while(1) {
                handle_queue();
                select_main(0, &global_change, lock_chan, unlock_chan);
        }
 
-       close_socket();
-
-       del_timer(&socket_retry);
-
-       unregister_fd(&wake_fd);
-       close(wake_pipe[0]);
-       close(wake_pipe[1]);
-
-       CERROR(NULL, NULL, "Thread exit.\n");
-
-       ast_mutex_unlock(&chan_lock);
-
        return NULL;
 }
 
@@ -3304,7 +3289,6 @@ int load_module(void)
        ast_cli_register(&cli_port_unload);
 #endif
 
-       quit = 0;
        if ((pthread_create(&chan_tid, NULL, chan_thread, NULL)<0)) {
                /* failed to create thread */
                bchannel_deinitialize();
@@ -3326,16 +3310,24 @@ int load_module(void)
 int unload_module(void)
 {
        /* First, take us out of the channel loop */
-       CDEBUG(NULL, NULL, "-- Unregistering mISDN Channel Driver --\n");
+       CDEBUG(NULL, NULL, "-- Unregistering Linux-Call-Router Channel Driver --\n");
+
+       pthread_cancel(chan_tid);
+
+       close_socket();
 
-       quit = 1;
-       pthread_join(chan_tid, NULL);
+       del_timer(&socket_retry);
+
+       unregister_fd(&wake_fd);
+       close(wake_pipe[0]);
+       close(wake_pipe[1]);
+
+//     ast_mutex_unlock(&chan_lock);
 
        ast_channel_unregister(&lcr_tech);
 
        ast_unregister_application("lcr_config");
 
-
        if (mISDN_created) {
                bchannel_deinitialize();
                mISDN_created = 0;