summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eversberg2010-06-30 11:48:11 +0200
committerAndreas Eversberg2010-06-30 11:48:11 +0200
commit443a7c9eb2993ae43e457045baa3d68bf7501272 (patch)
treec58d4e5dc123dcd705e0ab61999a567bde89938e
parentMore debug. (diff)
downloadlcr-443a7c9eb2993ae43e457045baa3d68bf7501272.tar.gz
lcr-443a7c9eb2993ae43e457045baa3d68bf7501272.tar.xz
lcr-443a7c9eb2993ae43e457045baa3d68bf7501272.zip
Hopefully fixed the double log bug that causes so much trouble.
-rw-r--r--chan_lcr.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/chan_lcr.c b/chan_lcr.c
index 05ac231..38f969b 100644
--- a/chan_lcr.c
+++ b/chan_lcr.c
@@ -1264,6 +1264,7 @@ int receive_message(int message_type, unsigned int ref, union parameter *param)
if (message_type == MESSAGE_BCHANNEL) {
switch(param->bchannel.type) {
case BCHANNEL_ASSIGN:
+lock_debug("rx1");
CDEBUG(NULL, NULL, "Received BCHANNEL_ASSIGN message. (handle=%08lx) for ref %d\n", param->bchannel.handle, ref);
if ((bchannel = find_bchannel_handle(param->bchannel.handle))) {
CERROR(NULL, NULL, "bchannel handle %x already assigned.\n", (int)param->bchannel.handle);
@@ -1556,7 +1557,9 @@ static int handle_socket(struct lcr_fd *fd, unsigned int what, void *instance, i
CERROR(NULL, NULL, "Socket received illegal message %d.\n", msg.message);
goto error;
}
+ lock_debug("handleX");
receive_message(msg.u.msg.type, msg.u.msg.ref, &msg.u.msg.param);
+ lock_debug("handleY");
} else {
CERROR(NULL, NULL, "Socket failed (errno %d).\n", errno);
goto error;
@@ -1689,7 +1692,7 @@ static void handle_queue()
ast = call->ast;
if (*p && ast) {
lock_debug("A1+");
- ast_channel_lock(ast);
+// ast_channel_lock(ast);
lock_debug("A1-");
while(*p) {
switch (*p) {
@@ -1746,7 +1749,7 @@ static void handle_queue()
p++;
}
call->queue_string[0] = '\0';
- ast_channel_unlock(ast);
+// ast_channel_unlock(ast);
lock_debug("a1");
}
call = call->next;