kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 18:40:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "chan_sip: Address runaway when realtime peers subscribe to mailboxes"

Browse Source
This commit is contained in:
zuul
2016-09-23 16:59:59 -05:00
committed by Gerrit Code Review
parent 91513c5e8d d425971009
commit eeeff9487f
4 changed files with 67 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
channels/chan_sip.c
View File

@@ -1278,6 +1278,7 @@ static void mwi_event_cb(void *, struct stasis_subscription *, struct stasis_mes
static void network_change_stasis_cb(void *data, struct stasis_subscription *sub, struct stasis_message *message); static void network_change_stasis_cb(void *data, struct stasis_subscription *sub, struct stasis_message *message);
static void acl_change_stasis_cb(void *data, struct stasis_subscription *sub, struct stasis_message *message); static void acl_change_stasis_cb(void *data, struct stasis_subscription *sub, struct stasis_message *message);
static void sip_keepalive_all_peers(void); static void sip_keepalive_all_peers(void);
#define peer_in_destruction(peer) (ao2_ref(peer, 0) == 0)
/*--- Applications, functions, CLI and manager command helpers */ /*--- Applications, functions, CLI and manager command helpers */
static const char *sip_nat_mode(const struct sip_pvt *p); static const char *sip_nat_mode(const struct sip_pvt *p);
@@ -5202,13 +5203,24 @@ static void destroy_mailbox(struct sip_mailbox *mailbox)
ast_free(mailbox); ast_free(mailbox);
} }
#define REMOVE_MAILBOX_WITH_LOCKED_PEER(__peer) \
({\
struct sip_mailbox *__mailbox;\
ao2_lock(__peer);\
__mailbox = AST_LIST_REMOVE_HEAD(&(__peer->mailboxes), entry);\
ao2_unlock(__peer);\
__mailbox;\
})
/*! Destroy all peer-related mailbox subscriptions */ /*! Destroy all peer-related mailbox subscriptions */
static void clear_peer_mailboxes(struct sip_peer *peer) static void clear_peer_mailboxes(struct sip_peer *peer)
{ {
struct sip_mailbox *mailbox; struct sip_mailbox *mailbox;
while ((mailbox = AST_LIST_REMOVE_HEAD(&peer->mailboxes, entry))) /* Lock the peer while accessing/updating the linked list but NOT while destroying the mailbox */
while ((mailbox = REMOVE_MAILBOX_WITH_LOCKED_PEER(peer))) {
destroy_mailbox(mailbox); destroy_mailbox(mailbox);
}
} }
static void sip_destroy_peer_fn(void *peer) static void sip_destroy_peer_fn(void *peer)
@@ -17260,19 +17272,21 @@ static void sip_peer_hold(struct sip_pvt *p, int hold)
/*! \brief Receive MWI events that we have subscribed to */ /*! \brief Receive MWI events that we have subscribed to */
static void mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct stasis_message *msg) static void mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct stasis_message *msg)
{ {
char *peer_name = userdata; struct sip_peer *peer = userdata;
struct sip_peer *peer = sip_find_peer(peer_name, NULL, TRUE, FINDALLDEVICES, FALSE, 0);
if (stasis_subscription_final_message(sub, msg)) { /*
/* peer can be non-NULL during reload. */ * peer can't be NULL here but the peer can be in the process of being
ao2_cleanup(peer); * destroyed. If it is, we don't want to send any messages. In most cases,
ast_free(peer_name); * the peer is actually gone and there's no sense sending NOTIFYs that will
* never be answered.
*/
if (stasis_subscription_final_message(sub, msg) || peer_in_destruction(peer)) {
return; return;
} }
if (peer && ast_mwi_state_type() == stasis_message_type(msg)) {
if (ast_mwi_state_type() == stasis_message_type(msg)) {
sip_send_mwi_to_peer(peer, 0); sip_send_mwi_to_peer(peer, 0);
} }
ao2_cleanup(peer);
} }
static void network_change_stasis_subscribe(void) static void network_change_stasis_subscribe(void)
@@ -27991,15 +28005,14 @@ static void add_peer_mwi_subs(struct sip_peer *peer)
AST_LIST_TRAVERSE(&peer->mailboxes, mailbox, entry) { AST_LIST_TRAVERSE(&peer->mailboxes, mailbox, entry) {
struct stasis_topic *mailbox_specific_topic; struct stasis_topic *mailbox_specific_topic;
mailbox->event_sub = stasis_unsubscribe(mailbox->event_sub);
if (mailbox->status != SIP_MAILBOX_STATUS_NEW) {
continue;
}
mailbox_specific_topic = ast_mwi_topic(mailbox->id); mailbox_specific_topic = ast_mwi_topic(mailbox->id);
if (mailbox_specific_topic) { if (mailbox_specific_topic) {
char *peer_name = ast_strdup(peer->name); mailbox->event_sub = stasis_subscribe_pool(mailbox_specific_topic, mwi_event_cb, peer);
if (!peer_name) {
return;
}
mailbox->event_sub = stasis_subscribe_pool(mailbox_specific_topic, mwi_event_cb, peer_name);
} }
} }
} }
@@ -29224,7 +29237,9 @@ static int get_cached_mwi(struct sip_peer *peer, int *new, int *old)
} }
/*! \brief Send message waiting indication to alert peer that they've got voicemail /*! \brief Send message waiting indication to alert peer that they've got voicemail
* \note Both peer and associated sip_pvt must be unlocked prior to calling this function * \note Both peer and associated sip_pvt must be unlocked prior to calling this function.
* It's possible that this function will get called during peer destruction as final messages
* are processed. The peer will still be valid however.
* \returns -1 on failure, 0 on success * \returns -1 on failure, 0 on success
*/ */
static int sip_send_mwi_to_peer(struct sip_peer *peer, int cache_only) static int sip_send_mwi_to_peer(struct sip_peer *peer, int cache_only)
@@ -31074,6 +31089,7 @@ static void add_peer_mailboxes(struct sip_peer *peer, const char *value)
AST_LIST_TRAVERSE(&peer->mailboxes, mailbox, entry) { AST_LIST_TRAVERSE(&peer->mailboxes, mailbox, entry) {
if (!strcmp(mailbox->id, mbox)) { if (!strcmp(mailbox->id, mbox)) {
duplicate = 1; duplicate = 1;
mailbox->status = SIP_MAILBOX_STATUS_EXISTING;
break; break;
} }
} }
@@ -31086,14 +31102,18 @@ static void add_peer_mailboxes(struct sip_peer *peer, const char *value)
continue; continue;
} }
strcpy(mailbox->id, mbox); /* SAFE */ strcpy(mailbox->id, mbox); /* SAFE */
mailbox->status = SIP_MAILBOX_STATUS_NEW;
mailbox->peer = peer;
AST_LIST_INSERT_TAIL(&peer->mailboxes, mailbox, entry); AST_LIST_INSERT_TAIL(&peer->mailboxes, mailbox, entry);
} }
} }
/*! \brief Build peer from configuration (file or realtime static/dynamic) */ /*! \brief Build peer from configuration (file or realtime static/dynamic) */
static struct sip_peer *build_peer(const char *name, struct ast_variable *v, struct ast_variable *alt, int realtime, int devstate_only) static struct sip_peer *build_peer(const char *name, struct ast_variable *v_head, struct ast_variable *alt, int realtime, int devstate_only)
{ {
/* We preserve the original value of v_head to make analyzing backtraces easier */
struct ast_variable *v = v_head;
struct sip_peer *peer = NULL; struct sip_peer *peer = NULL;
struct ast_acl_list *oldacl = NULL; struct ast_acl_list *oldacl = NULL;
struct ast_acl_list *olddirectmediaacl = NULL; struct ast_acl_list *olddirectmediaacl = NULL;
@@ -31157,6 +31177,7 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str
return NULL; return NULL;
} }
if (realtime && !ast_test_flag(&global_flags[1], SIP_PAGE2_RTCACHEFRIENDS)) { if (realtime && !ast_test_flag(&global_flags[1], SIP_PAGE2_RTCACHEFRIENDS)) {
ast_atomic_fetchadd_int(&rpeerobjs, 1); ast_atomic_fetchadd_int(&rpeerobjs, 1);
ast_debug(3, "-REALTIME- peer built. Name: %s. Peer objects: %d\n", name, rpeerobjs); ast_debug(3, "-REALTIME- peer built. Name: %s. Peer objects: %d\n", name, rpeerobjs);
@@ -31206,7 +31227,7 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str
if (!devstate_only) { if (!devstate_only) {
struct sip_mailbox *mailbox; struct sip_mailbox *mailbox;
AST_LIST_TRAVERSE(&peer->mailboxes, mailbox, entry) { AST_LIST_TRAVERSE(&peer->mailboxes, mailbox, entry) {
mailbox->delme = 1; mailbox->status = SIP_MAILBOX_STATUS_UNKNOWN;
} }
} }
@@ -31666,7 +31687,7 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str
if (!devstate_only) { if (!devstate_only) {
struct sip_mailbox *mailbox; struct sip_mailbox *mailbox;
AST_LIST_TRAVERSE_SAFE_BEGIN(&peer->mailboxes, mailbox, entry) { AST_LIST_TRAVERSE_SAFE_BEGIN(&peer->mailboxes, mailbox, entry) {
if (mailbox->delme) { if (mailbox->status == SIP_MAILBOX_STATUS_UNKNOWN) {
AST_LIST_REMOVE_CURRENT(entry); AST_LIST_REMOVE_CURRENT(entry);
destroy_mailbox(mailbox); destroy_mailbox(mailbox);
} }

9
channels/sip/include/sip.h
View File

@@ -1237,6 +1237,12 @@ struct sip_pkt {
struct ast_str *data; struct ast_str *data;
}; };
enum sip_mailbox_status {
SIP_MAILBOX_STATUS_UNKNOWN = 0,
SIP_MAILBOX_STATUS_EXISTING,
SIP_MAILBOX_STATUS_NEW,
};
/*! /*!
* \brief A peer's mailbox * \brief A peer's mailbox
* *
@@ -1247,7 +1253,8 @@ struct sip_mailbox {
/*! Associated MWI subscription */ /*! Associated MWI subscription */
struct stasis_subscription *event_sub; struct stasis_subscription *event_sub;
AST_LIST_ENTRY(sip_mailbox) entry; AST_LIST_ENTRY(sip_mailbox) entry;
unsigned int delme:1; struct sip_peer *peer;
enum sip_mailbox_status status;
char id[1]; char id[1];
}; };

2
include/asterisk/lock.h
View File

@@ -113,7 +113,7 @@ struct ast_lock_track {
int lineno[AST_MAX_REENTRANCY]; int lineno[AST_MAX_REENTRANCY];
int reentrancy; int reentrancy;
const char *func[AST_MAX_REENTRANCY]; const char *func[AST_MAX_REENTRANCY];
pthread_t thread[AST_MAX_REENTRANCY]; pthread_t thread_id[AST_MAX_REENTRANCY];
#ifdef HAVE_BKTR #ifdef HAVE_BKTR
struct ast_bt backtrace[AST_MAX_REENTRANCY]; struct ast_bt backtrace[AST_MAX_REENTRANCY];
#endif #endif

36
main/lock.c
View File

@@ -218,7 +218,7 @@ lt_cleanup:
lt->lineno[0] = lineno; lt->lineno[0] = lineno;
lt->func[0] = func; lt->func[0] = func;
lt->reentrancy = 0; lt->reentrancy = 0;
lt->thread[0] = 0; lt->thread_id[0] = 0;
#ifdef HAVE_BKTR #ifdef HAVE_BKTR
memset(&lt->backtrace[0], 0, sizeof(lt->backtrace[0])); memset(&lt->backtrace[0], 0, sizeof(lt->backtrace[0]));
#endif #endif
@@ -322,7 +322,7 @@ int __ast_pthread_mutex_lock(const char *filename, int lineno, const char *func,
lt->file[lt->reentrancy] = filename; lt->file[lt->reentrancy] = filename;
lt->lineno[lt->reentrancy] = lineno; lt->lineno[lt->reentrancy] = lineno;
lt->func[lt->reentrancy] = func; lt->func[lt->reentrancy] = func;
lt->thread[lt->reentrancy] = pthread_self(); lt->thread_id[lt->reentrancy] = pthread_self();
lt->reentrancy++; lt->reentrancy++;
} else { } else {
__ast_mutex_logger("%s line %d (%s): '%s' really deep reentrancy!\n", __ast_mutex_logger("%s line %d (%s): '%s' really deep reentrancy!\n",
@@ -402,7 +402,7 @@ int __ast_pthread_mutex_trylock(const char *filename, int lineno, const char *fu
lt->file[lt->reentrancy] = filename; lt->file[lt->reentrancy] = filename;
lt->lineno[lt->reentrancy] = lineno; lt->lineno[lt->reentrancy] = lineno;
lt->func[lt->reentrancy] = func; lt->func[lt->reentrancy] = func;
lt->thread[lt->reentrancy] = pthread_self(); lt->thread_id[lt->reentrancy] = pthread_self();
lt->reentrancy++; lt->reentrancy++;
} else { } else {
__ast_mutex_logger("%s line %d (%s): '%s' really deep reentrancy!\n", __ast_mutex_logger("%s line %d (%s): '%s' really deep reentrancy!\n",
@@ -445,7 +445,7 @@ int __ast_pthread_mutex_unlock(const char *filename, int lineno, const char *fun
if (lt) { if (lt) {
ast_reentrancy_lock(lt); ast_reentrancy_lock(lt);
if (lt->reentrancy && (lt->thread[ROFFSET] != pthread_self())) { if (lt->reentrancy && (lt->thread_id[ROFFSET] != pthread_self())) {
__ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n", __ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n",
filename, lineno, func, mutex_name); filename, lineno, func, mutex_name);
__ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n", __ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n",
@@ -466,7 +466,7 @@ int __ast_pthread_mutex_unlock(const char *filename, int lineno, const char *fun
lt->file[lt->reentrancy] = NULL; lt->file[lt->reentrancy] = NULL;
lt->lineno[lt->reentrancy] = 0; lt->lineno[lt->reentrancy] = 0;
lt->func[lt->reentrancy] = NULL; lt->func[lt->reentrancy] = NULL;
lt->thread[lt->reentrancy] = 0; lt->thread_id[lt->reentrancy] = 0;
} }
#ifdef HAVE_BKTR #ifdef HAVE_BKTR
@@ -536,7 +536,7 @@ static void restore_lock_tracking(struct ast_lock_track *lt, struct ast_lock_tra
memcpy(lt->lineno, lt_saved->lineno, sizeof(lt->lineno)); memcpy(lt->lineno, lt_saved->lineno, sizeof(lt->lineno));
lt->reentrancy = lt_saved->reentrancy; lt->reentrancy = lt_saved->reentrancy;
memcpy(lt->func, lt_saved->func, sizeof(lt->func)); memcpy(lt->func, lt_saved->func, sizeof(lt->func));
memcpy(lt->thread, lt_saved->thread, sizeof(lt->thread)); memcpy(lt->thread_id, lt_saved->thread_id, sizeof(lt->thread_id));
#ifdef HAVE_BKTR #ifdef HAVE_BKTR
memcpy(lt->backtrace, lt_saved->backtrace, sizeof(lt->backtrace)); memcpy(lt->backtrace, lt_saved->backtrace, sizeof(lt->backtrace));
#endif #endif
@@ -571,7 +571,7 @@ int __ast_cond_wait(const char *filename, int lineno, const char *func,
if (lt) { if (lt) {
ast_reentrancy_lock(lt); ast_reentrancy_lock(lt);
if (lt->reentrancy && (lt->thread[ROFFSET] != pthread_self())) { if (lt->reentrancy && (lt->thread_id[ROFFSET] != pthread_self())) {
__ast_mutex_logger("%s line %d (%s): attempted wait using mutex '%s' without owning it!\n", __ast_mutex_logger("%s line %d (%s): attempted wait using mutex '%s' without owning it!\n",
filename, lineno, func, mutex_name); filename, lineno, func, mutex_name);
__ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n", __ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n",
@@ -639,7 +639,7 @@ int __ast_cond_timedwait(const char *filename, int lineno, const char *func,
if (lt) { if (lt) {
ast_reentrancy_lock(lt); ast_reentrancy_lock(lt);
if (lt->reentrancy && (lt->thread[ROFFSET] != pthread_self())) { if (lt->reentrancy && (lt->thread_id[ROFFSET] != pthread_self())) {
__ast_mutex_logger("%s line %d (%s): attempted wait using mutex '%s' without owning it!\n", __ast_mutex_logger("%s line %d (%s): attempted wait using mutex '%s' without owning it!\n",
filename, lineno, func, mutex_name); filename, lineno, func, mutex_name);
__ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n", __ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n",
@@ -747,7 +747,7 @@ lt_cleanup:
lt->lineno[0] = lineno; lt->lineno[0] = lineno;
lt->func[0] = func; lt->func[0] = func;
lt->reentrancy = 0; lt->reentrancy = 0;
lt->thread[0] = 0; lt->thread_id[0] = 0;
#ifdef HAVE_BKTR #ifdef HAVE_BKTR
memset(&lt->backtrace[0], 0, sizeof(lt->backtrace[0])); memset(&lt->backtrace[0], 0, sizeof(lt->backtrace[0]));
#endif #endif
@@ -790,13 +790,13 @@ int __ast_rwlock_unlock(const char *filename, int line, const char *func, ast_rw
int i; int i;
pthread_t self = pthread_self(); pthread_t self = pthread_self();
for (i = lt->reentrancy - 1; i >= 0; --i) { for (i = lt->reentrancy - 1; i >= 0; --i) {
if (lt->thread[i] == self) { if (lt->thread_id[i] == self) {
lock_found = 1; lock_found = 1;
if (i != lt->reentrancy - 1) { if (i != lt->reentrancy - 1) {
lt->file[i] = lt->file[lt->reentrancy - 1]; lt->file[i] = lt->file[lt->reentrancy - 1];
lt->lineno[i] = lt->lineno[lt->reentrancy - 1]; lt->lineno[i] = lt->lineno[lt->reentrancy - 1];
lt->func[i] = lt->func[lt->reentrancy - 1]; lt->func[i] = lt->func[lt->reentrancy - 1];
lt->thread[i] = lt->thread[lt->reentrancy - 1]; lt->thread_id[i] = lt->thread_id[lt->reentrancy - 1];
} }
#ifdef HAVE_BKTR #ifdef HAVE_BKTR
bt = &lt->backtrace[i]; bt = &lt->backtrace[i];
@@ -804,7 +804,7 @@ int __ast_rwlock_unlock(const char *filename, int line, const char *func, ast_rw
lt->file[lt->reentrancy - 1] = NULL; lt->file[lt->reentrancy - 1] = NULL;
lt->lineno[lt->reentrancy - 1] = 0; lt->lineno[lt->reentrancy - 1] = 0;
lt->func[lt->reentrancy - 1] = NULL; lt->func[lt->reentrancy - 1] = NULL;
lt->thread[lt->reentrancy - 1] = AST_PTHREADT_NULL; lt->thread_id[lt->reentrancy - 1] = AST_PTHREADT_NULL;
break; break;
} }
} }
@@ -918,7 +918,7 @@ int __ast_rwlock_rdlock(const char *filename, int line, const char *func, ast_rw
lt->file[lt->reentrancy] = filename; lt->file[lt->reentrancy] = filename;
lt->lineno[lt->reentrancy] = line; lt->lineno[lt->reentrancy] = line;
lt->func[lt->reentrancy] = func; lt->func[lt->reentrancy] = func;
lt->thread[lt->reentrancy] = pthread_self(); lt->thread_id[lt->reentrancy] = pthread_self();
lt->reentrancy++; lt->reentrancy++;
} }
ast_reentrancy_unlock(lt); ast_reentrancy_unlock(lt);
@@ -1027,7 +1027,7 @@ int __ast_rwlock_wrlock(const char *filename, int line, const char *func, ast_rw
lt->file[lt->reentrancy] = filename; lt->file[lt->reentrancy] = filename;
lt->lineno[lt->reentrancy] = line; lt->lineno[lt->reentrancy] = line;
lt->func[lt->reentrancy] = func; lt->func[lt->reentrancy] = func;
lt->thread[lt->reentrancy] = pthread_self(); lt->thread_id[lt->reentrancy] = pthread_self();
lt->reentrancy++; lt->reentrancy++;
} }
ast_reentrancy_unlock(lt); ast_reentrancy_unlock(lt);
@@ -1120,7 +1120,7 @@ int __ast_rwlock_timedrdlock(const char *filename, int line, const char *func, a
lt->file[lt->reentrancy] = filename; lt->file[lt->reentrancy] = filename;
lt->lineno[lt->reentrancy] = line; lt->lineno[lt->reentrancy] = line;
lt->func[lt->reentrancy] = func; lt->func[lt->reentrancy] = func;
lt->thread[lt->reentrancy] = pthread_self(); lt->thread_id[lt->reentrancy] = pthread_self();
lt->reentrancy++; lt->reentrancy++;
} }
ast_reentrancy_unlock(lt); ast_reentrancy_unlock(lt);
@@ -1213,7 +1213,7 @@ int __ast_rwlock_timedwrlock(const char *filename, int line, const char *func, a
lt->file[lt->reentrancy] = filename; lt->file[lt->reentrancy] = filename;
lt->lineno[lt->reentrancy] = line; lt->lineno[lt->reentrancy] = line;
lt->func[lt->reentrancy] = func; lt->func[lt->reentrancy] = func;
lt->thread[lt->reentrancy] = pthread_self(); lt->thread_id[lt->reentrancy] = pthread_self();
lt->reentrancy++; lt->reentrancy++;
} }
ast_reentrancy_unlock(lt); ast_reentrancy_unlock(lt);
@@ -1288,7 +1288,7 @@ int __ast_rwlock_tryrdlock(const char *filename, int line, const char *func, ast
lt->file[lt->reentrancy] = filename; lt->file[lt->reentrancy] = filename;
lt->lineno[lt->reentrancy] = line; lt->lineno[lt->reentrancy] = line;
lt->func[lt->reentrancy] = func; lt->func[lt->reentrancy] = func;
lt->thread[lt->reentrancy] = pthread_self(); lt->thread_id[lt->reentrancy] = pthread_self();
lt->reentrancy++; lt->reentrancy++;
} }
ast_reentrancy_unlock(lt); ast_reentrancy_unlock(lt);
@@ -1347,7 +1347,7 @@ int __ast_rwlock_trywrlock(const char *filename, int line, const char *func, ast
lt->file[lt->reentrancy] = filename; lt->file[lt->reentrancy] = filename;
lt->lineno[lt->reentrancy] = line; lt->lineno[lt->reentrancy] = line;
lt->func[lt->reentrancy] = func; lt->func[lt->reentrancy] = func;
lt->thread[lt->reentrancy] = pthread_self(); lt->thread_id[lt->reentrancy] = pthread_self();
lt->reentrancy++; lt->reentrancy++;
} }
ast_reentrancy_unlock(lt); ast_reentrancy_unlock(lt);