Skinny: Stop harcoding APR_TIMEUP

See also FS-3425

diff --git a/src/include/switch_apr.h b/src/include/switch_apr.h
index c7279b6a8cbfb0f252fabe90dd9db9b82c106f6f..f2af8bc24b6e67d5aeb0d236d93d16c273d1e06b 100644 (file)
--- a/src/include/switch_apr.h
+++ b/src/include/switch_apr.h
@@ -41,6 +41,9 @@
 #define SWITCH_APR_H
 
 SWITCH_BEGIN_EXTERN_C
+
+SWITCH_DECLARE(int) switch_status_is_timeup(int status);
+
 #ifdef WIN32
 typedef DWORD switch_thread_id_t;
 #else

diff --git a/src/mod/endpoints/mod_skinny/skinny_protocol.c b/src/mod/endpoints/mod_skinny/skinny_protocol.c
index da642c1cfabad2ba0c909f7296d45b305c97f5cd..16e8545304ddce041945aad9440abef10077443d 100644 (file)
--- a/src/mod/endpoints/mod_skinny/skinny_protocol.c
+++ b/src/mod/endpoints/mod_skinny/skinny_protocol.c
@@ -142,7 +142,7 @@ switch_status_t skinny_read_packet(listener_t *listener, skinny_message_t **req)
                if (!listener_is_ready(listener)) {
                        break;
                }
-               if ((status != 70007 /* APR_TIMEUP */) && !SWITCH_STATUS_IS_BREAK(status) && (status != SWITCH_STATUS_SUCCESS)) {
+               if (switch_status_is_timeup(status) && !SWITCH_STATUS_IS_BREAK(status) && (status != SWITCH_STATUS_SUCCESS)) {
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Socket break with status=%d.\n", status);
                        return SWITCH_STATUS_FALSE;
                }

diff --git a/src/switch_apr.c b/src/switch_apr.c
index b592fc7c3e414f06735673ec3bf009fdcd67efbb..be084fa61d0543e119b96d70d851727aca7a3878 100644 (file)
--- a/src/switch_apr.c
+++ b/src/switch_apr.c
@@ -69,6 +69,11 @@
 
 /* apr stubs */
 
+SWITCH_DECLARE(int) switch_status_is_timeup(int status)
+{
+       return APR_STATUS_IS_TIMEUP(status);
+}
+
 /* Memory Pools */
 
 SWITCH_DECLARE(switch_thread_id_t) switch_thread_self(void)