kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-10 14:51:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chan_sip: Simplify dialog/peer references, improve REF_DEBUG output.

Browse Source 
* Replace functions for ref/undef of dialogs and peers with macro's
  to call ao2_t_bump/ao2_t_cleanup.
* Enable passthough of REF_DEBUG caller information to sip_alloc and
  find_call.

ASTERISK-24882 #close 
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4189/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@433115 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Corey Farrell
2015-03-19 09:53:37 +00:00
parent 7fddae99dd
commit 958bc84caf
3 changed files with 35 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
channels/chan_sip.c
View File

@@ -1180,7 +1180,11 @@ static int sip_send_mwi_to_peer(struct sip_peer *peer, int cache_only);
static int __sip_autodestruct(const void *data); static int __sip_autodestruct(const void *data);
static int update_call_counter(struct sip_pvt *fup, int event); static int update_call_counter(struct sip_pvt *fup, int event);
static int auto_congest(const void *arg); static int auto_congest(const void *arg);
static struct sip_pvt *find_call(struct sip_request *req, struct ast_sockaddr *addr, const int intended_method); static struct sip_pvt *__find_call(struct sip_request *req, struct ast_sockaddr *addr, const int intended_method,
const char *file, int line, const char *func);
#define find_call(req, addr, intended_method) \
__find_call(req, addr, intended_method, __FILE__, __LINE__, __PRETTY_FUNCTION__)
static void build_route(struct sip_pvt *p, struct sip_request *req, int backwards, int resp); static void build_route(struct sip_pvt *p, struct sip_request *req, int backwards, int resp);
static int build_path(struct sip_pvt *p, struct sip_peer *peer, struct sip_request *req, const char *pathbuf); static int build_path(struct sip_pvt *p, struct sip_peer *peer, struct sip_request *req, const char *pathbuf);
static enum check_auth_result register_verify(struct sip_pvt *p, struct ast_sockaddr *addr, static enum check_auth_result register_verify(struct sip_pvt *p, struct ast_sockaddr *addr,
@@ -2331,30 +2335,6 @@ static struct ast_tcptls_session_args sip_tls_desc = {
\return Always returns 0 */ \return Always returns 0 */
#define append_history(p, event, fmt , args... ) append_history_full(p, "%-15s " fmt, event, ## args) #define append_history(p, event, fmt , args... ) append_history_full(p, "%-15s " fmt, event, ## args)
struct sip_pvt *dialog_ref_debug(struct sip_pvt *p, const char *tag, char *file, int line, const char *func)
{
if (p)
#ifdef REF_DEBUG
__ao2_ref_debug(p, 1, tag, file, line, func);
#else
ao2_ref(p, 1);
#endif
else
ast_log(LOG_ERROR, "Attempt to Ref a null pointer\n");
return p;
}
struct sip_pvt *dialog_unref_debug(struct sip_pvt *p, const char *tag, char *file, int line, const char *func)
{
if (p)
#ifdef REF_DEBUG
__ao2_ref_debug(p, -1, tag, file, line, func);
#else
ao2_ref(p, -1);
#endif
return NULL;
}
/*! \brief map from an integer value to a string. /*! \brief map from an integer value to a string.
* If no match is found, return errorstring * If no match is found, return errorstring
*/ */
@@ -3154,41 +3134,6 @@ cleanup:
return NULL; return NULL;
} }
#ifdef REF_DEBUG
struct sip_peer *_ref_peer(struct sip_peer *peer, char *tag, char *file, int line, const char *func)
{
if (peer)
__ao2_ref_debug(peer, 1, tag, file, line, func);
else
ast_log(LOG_ERROR, "Attempt to Ref a null peer pointer\n");
return peer;
}
void *_unref_peer(struct sip_peer *peer, char *tag, char *file, int line, const char *func)
{
if (peer)
__ao2_ref_debug(peer, -1, tag, file, line, func);
return NULL;
}
#else
/*!
* helper functions to unreference various types of objects.
* By handling them this way, we don't have to declare the
* destructor on each call, which removes the chance of errors.
*/
void *sip_unref_peer(struct sip_peer *peer, char *tag)
{
ao2_t_ref(peer, -1, tag);
return NULL;
}
struct sip_peer *sip_ref_peer(struct sip_peer *peer, char *tag)
{
ao2_t_ref(peer, 1, tag);
return peer;
}
#endif /* REF_DEBUG */
static void peer_sched_cleanup(struct sip_peer *peer) static void peer_sched_cleanup(struct sip_peer *peer)
{ {
if (peer->pokeexpire != -1) { if (peer->pokeexpire != -1) {
@@ -8648,13 +8593,18 @@ static void sip_pvt_callid_set(struct sip_pvt *pvt, struct ast_callid *callid)
* Returns a reference to the object so whoever uses it later must * Returns a reference to the object so whoever uses it later must
* remember to release the reference. * remember to release the reference.
*/ */
struct sip_pvt *sip_alloc(ast_string_field callid, struct ast_sockaddr *addr, struct sip_pvt *__sip_alloc(ast_string_field callid, struct ast_sockaddr *addr,
int useglobal_nat, const int intended_method, struct sip_request *req, struct ast_callid *logger_callid) int useglobal_nat, const int intended_method, struct sip_request *req, struct ast_callid *logger_callid,
const char *file, int line, const char *func)
{ {
struct sip_pvt *p; struct sip_pvt *p;
if (!(p = ao2_t_alloc(sizeof(*p), sip_destroy_fn, "allocate a dialog(pvt) struct"))) p = __ao2_alloc_debug(sizeof(*p), sip_destroy_fn,
AO2_ALLOC_OPT_LOCK_MUTEX, "allocate a dialog(pvt) struct",
file, line, func, 1);
if (!p) {
return NULL; return NULL;
}
if (ast_string_field_init(p, 512)) { if (ast_string_field_init(p, 512)) {
ao2_t_ref(p, -1, "failed to string_field_init, drop p"); ao2_t_ref(p, -1, "failed to string_field_init, drop p");
@@ -9176,7 +9126,8 @@ static void sip_set_owner(struct sip_pvt *p, struct ast_channel *chan)
* Returns a reference to the sip_pvt object, remember to give it back once done. * Returns a reference to the sip_pvt object, remember to give it back once done.
* Called by handle_request_do * Called by handle_request_do
*/ */
static struct sip_pvt *find_call(struct sip_request *req, struct ast_sockaddr *addr, const int intended_method) static struct sip_pvt *__find_call(struct sip_request *req, struct ast_sockaddr *addr, const int intended_method,
const char *file, int line, const char *func)
{ {
char totag[128]; char totag[128];
char fromtag[128]; char fromtag[128];
@@ -9233,7 +9184,8 @@ static struct sip_pvt *find_call(struct sip_request *req, struct ast_sockaddr *a
struct sip_pvt tmp_dialog = { struct sip_pvt tmp_dialog = {
.callid = callid, .callid = callid,
}; };
sip_pvt_ptr = ao2_t_find(dialogs, &tmp_dialog, OBJ_POINTER, "ao2_find in dialogs"); sip_pvt_ptr = __ao2_find_debug(dialogs, &tmp_dialog, OBJ_POINTER,
"find_call in dialogs", file, line, func);
if (sip_pvt_ptr) { /* well, if we don't find it-- what IS in there? */ if (sip_pvt_ptr) { /* well, if we don't find it-- what IS in there? */
/* Found the call */ /* Found the call */
return sip_pvt_ptr; return sip_pvt_ptr;
@@ -9247,11 +9199,12 @@ static struct sip_pvt *find_call(struct sip_request *req, struct ast_sockaddr *a
struct sip_pvt *fork_pvt = NULL; struct sip_pvt *fork_pvt = NULL;
struct match_req_args args = { 0, }; struct match_req_args args = { 0, };
int found; int found;
struct ao2_iterator *iterator = ao2_t_callback(dialogs, struct ao2_iterator *iterator = __ao2_callback_debug(dialogs,
OBJ_POINTER | OBJ_MULTIPLE, OBJ_POINTER | OBJ_MULTIPLE,
dialog_find_multiple, dialog_find_multiple,
&tmp_dialog, &tmp_dialog,
"pedantic ao2_find in dialogs"); "pedantic ao2_find in dialogs",
file, line, func);
struct sip_via *via = NULL; struct sip_via *via = NULL;
args.method = req->method; args.method = req->method;
@@ -9296,7 +9249,8 @@ static struct sip_pvt *find_call(struct sip_request *req, struct ast_sockaddr *a
/* This is likely a forked Request that somehow resulted in us receiving multiple parts of the fork. /* This is likely a forked Request that somehow resulted in us receiving multiple parts of the fork.
* RFC 3261 section 8.2.2.2, Indicate that we want to merge requests by sending a 482 response. */ * RFC 3261 section 8.2.2.2, Indicate that we want to merge requests by sending a 482 response. */
transmit_response_using_temp(callid, addr, 1, intended_method, req, "482 (Loop Detected)"); transmit_response_using_temp(callid, addr, 1, intended_method, req, "482 (Loop Detected)");
dialog_unref(sip_pvt_ptr, "pvt did not match incoming SIP msg, unref from search."); __ao2_ref_debug(sip_pvt_ptr, -1, "pvt did not match incoming SIP msg, unref from search.",
file, line, func);
ao2_iterator_destroy(iterator); ao2_iterator_destroy(iterator);
dialog_unref(fork_pvt, "unref fork_pvt"); dialog_unref(fork_pvt, "unref fork_pvt");
free_via(via); free_via(via);
@@ -9307,7 +9261,8 @@ static struct sip_pvt *find_call(struct sip_request *req, struct ast_sockaddr *a
/* fall through */ /* fall through */
case SIP_REQ_NOT_MATCH: case SIP_REQ_NOT_MATCH:
default: default:
dialog_unref(sip_pvt_ptr, "pvt did not match incoming SIP msg, unref from search"); __ao2_ref_debug(sip_pvt_ptr, -1, "pvt did not match incoming SIP msg, unref from search",
file, line, func);
break; break;
} }
} }

15
channels/sip/include/dialog.h
View File

@@ -29,13 +29,16 @@
* functions so we keep track of the refcounts. * functions so we keep track of the refcounts.
* To simplify the code, we allow a NULL to be passed to dialog_unref(). * To simplify the code, we allow a NULL to be passed to dialog_unref().
*/ */
#define dialog_ref(arg1,arg2) dialog_ref_debug((arg1),(arg2), __FILE__, __LINE__, __PRETTY_FUNCTION__) #define dialog_ref(dialog, tag) ao2_t_bump(dialog, tag)
#define dialog_unref(arg1,arg2) dialog_unref_debug((arg1),(arg2), __FILE__, __LINE__, __PRETTY_FUNCTION__) #define dialog_unref(dialog, tag) ({ ao2_t_cleanup(dialog, tag); (NULL); })
struct sip_pvt *dialog_ref_debug(struct sip_pvt *p, const char *tag, char *file, int line, const char *func);
struct sip_pvt *dialog_unref_debug(struct sip_pvt *p, const char *tag, char *file, int line, const char *func); struct sip_pvt *__sip_alloc(ast_string_field callid, struct ast_sockaddr *sin,
int useglobal_nat, const int intended_method, struct sip_request *req, struct ast_callid *logger_callid,
const char *file, int line, const char *func);
#define sip_alloc(callid, addr, useglobal_nat, intended_method, req, logger_callid) \
__sip_alloc(callid, addr, useglobal_nat, intended_method, req, logger_callid, __FILE__, __LINE__, __PRETTY_FUNCTION__)
struct sip_pvt *sip_alloc(ast_string_field callid, struct ast_sockaddr *sin,
int useglobal_nat, const int intended_method, struct sip_request *req, struct ast_callid *logger_callid);
void sip_scheddestroy_final(struct sip_pvt *p, int ms); void sip_scheddestroy_final(struct sip_pvt *p, int ms);
void sip_scheddestroy(struct sip_pvt *p, int ms); void sip_scheddestroy(struct sip_pvt *p, int ms);
int sip_cancel_destroy(struct sip_pvt *p); int sip_cancel_destroy(struct sip_pvt *p);

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

@@ -1869,14 +1869,7 @@ void sip_auth_headers(enum sip_auth_type code, char **header, char **respheader)
const char *sip_get_header(const struct sip_request *req, const char *name); const char *sip_get_header(const struct sip_request *req, const char *name);
const char *sip_get_transport(enum ast_transport t); const char *sip_get_transport(enum ast_transport t);
#ifdef REF_DEBUG #define sip_ref_peer(peer, tag) ao2_t_bump(peer, tag)
#define sip_ref_peer(arg1,arg2) _ref_peer((arg1),(arg2), __FILE__, __LINE__, __PRETTY_FUNCTION__) #define sip_unref_peer(peer, tag) ({ ao2_t_cleanup(peer, tag); (NULL); })
#define sip_unref_peer(arg1,arg2) _unref_peer((arg1),(arg2), __FILE__, __LINE__, __PRETTY_FUNCTION__)
struct sip_peer *_ref_peer(struct sip_peer *peer, char *tag, char *file, int line, const char *func);
void *_unref_peer(struct sip_peer *peer, char *tag, char *file, int line, const char *func);
#else
struct sip_peer *sip_ref_peer(struct sip_peer *peer, char *tag);
void *sip_unref_peer(struct sip_peer *peer, char *tag);
#endif /* REF_DEBUG */
#endif #endif