From 44095d48ef4bf16a569e0cdca7f6ed17ee233e4f Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 11 Aug 2006 18:20:04 +0000 Subject: [PATCH] socket tweak git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2260 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- .../mod_event_socket/mod_event_socket.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c index a883a8b763..56ab20cb69 100644 --- a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c +++ b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c @@ -31,7 +31,7 @@ */ #include #define CMD_BUFLEN 1024 * 1000 - +#define IS_BREAK(x) ((int)x || SWITCH_STATUS_BREAK || (int)x == 730035 || (int)x == 35) static const char modname[] = "mod_event_socket"; static char *MARKER = "1"; @@ -244,12 +244,13 @@ static switch_status_t read_packet(listener_t *listener, switch_event_t **event, mlen = 1; status = switch_socket_recv(listener->sock, ptr, &mlen); - if (status != SWITCH_STATUS_BREAK && status != SWITCH_STATUS_SUCCESS) { - return status; + if (!SWITCH_STATUS_IS_BREAK(status) && status != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_FALSE; } - if (status != SWITCH_STATUS_BREAK && mlen) { + if (mlen) { bytes++; + do_sleep = 0; if (*mbuf == '\r' || *mbuf == '\n') { /* bah */ ptr = mbuf; @@ -303,7 +304,7 @@ static switch_status_t read_packet(listener_t *listener, switch_event_t **event, return SWITCH_STATUS_FALSE; } } - + if (!*mbuf) { if (switch_test_flag(listener, LFLAG_LOG)) { if (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS) {