kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-06 05:02:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip_transport_management.c: Rename some variables." into 13

Browse Source
This commit is contained in:
Jenkins2
2017-08-14 12:49:45 -05:00
committed by Gerrit Code Review
parent bac3e8c08b 162f6ab845
commit 1ff6082da9
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/res_pjsip_transport_management.c
View File

@@ -33,7 +33,7 @@
#include "asterisk/module.h" #include "asterisk/module.h"
#include "asterisk/astobj2.h" #include "asterisk/astobj2.h"
/*! \brief Number of buckets for keepalive transports */ /*! \brief Number of buckets for monitored transports */
#define TRANSPORTS_BUCKETS 53 #define TRANSPORTS_BUCKETS 53
#define IDLE_TIMEOUT (pjsip_cfg()->tsx.td) #define IDLE_TIMEOUT (pjsip_cfg()->tsx.td)
@@ -114,7 +114,7 @@ AST_THREADSTORAGE(desc_storage);
static int idle_sched_cb(const void *data) static int idle_sched_cb(const void *data)
{ {
struct monitored_transport *keepalive = (struct monitored_transport *) data; struct monitored_transport *monitored = (struct monitored_transport *) data;
if (!pj_thread_is_registered()) { if (!pj_thread_is_registered()) {
pj_thread_t *thread; pj_thread_t *thread;
@@ -123,7 +123,7 @@ static int idle_sched_cb(const void *data)
desc = ast_threadstorage_get(&desc_storage, sizeof(pj_thread_desc)); desc = ast_threadstorage_get(&desc_storage, sizeof(pj_thread_desc));
if (!desc) { if (!desc) {
ast_log(LOG_ERROR, "Could not get thread desc from thread-local storage.\n"); ast_log(LOG_ERROR, "Could not get thread desc from thread-local storage.\n");
ao2_ref(keepalive, -1); ao2_ref(monitored, -1);
return 0; return 0;
} }
@@ -132,22 +132,22 @@ static int idle_sched_cb(const void *data)
pj_thread_register("Transport Monitor", *desc, &thread); pj_thread_register("Transport Monitor", *desc, &thread);
} }
if (!keepalive->sip_received) { if (!monitored->sip_received) {
ast_log(LOG_NOTICE, "Shutting down transport '%s' since no request was received in %d seconds\n", ast_log(LOG_NOTICE, "Shutting down transport '%s' since no request was received in %d seconds\n",
keepalive->transport->info, IDLE_TIMEOUT / 1000); monitored->transport->info, IDLE_TIMEOUT / 1000);
pjsip_transport_shutdown(keepalive->transport); pjsip_transport_shutdown(monitored->transport);
} }
ao2_ref(keepalive, -1); ao2_ref(monitored, -1);
return 0; return 0;
} }
/*! \brief Destructor for keepalive transport */ /*! \brief Destructor for keepalive transport */
static void monitored_transport_destroy(void *obj) static void monitored_transport_destroy(void *obj)
{ {
struct monitored_transport *keepalive = obj; struct monitored_transport *monitored = obj;
pjsip_transport_dec_ref(keepalive->transport); pjsip_transport_dec_ref(monitored->transport);
} }
/*! \brief Callback invoked when transport changes occur */ /*! \brief Callback invoked when transport changes occur */