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

Fix some more REF_DEBUG-related build errors

Browse Source 
When sip_ref_peer and sip_unref_peer were exported to be usable in
channels/sip/security_events.c, modifications to those functions when
building under REF_DEBUG were not taken into account. This change
moves the necessary defines into sip.h to make them accessible to
other parts of chan_sip that need them.
........

Merged revisions 381282 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@381285 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2013-02-12 20:18:21 +00:00
parent 27867e65d0
commit 81fa307af7
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_sip.c
View File

@@ -241,6 +241,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
balanced, along with the complete history for that object. balanced, along with the complete history for that object.
In normal operation, the macros defined will throw away the tags, so they do not In normal operation, the macros defined will throw away the tags, so they do not
affect the speed of the program at all. They can be considered to be documentation. affect the speed of the program at all. They can be considered to be documentation.
Note: This must also be enabled in channels/sip/security_events.c
*/ */
/* #define REF_DEBUG 1 */ /* #define REF_DEBUG 1 */
@@ -3291,9 +3293,7 @@ cleanup:
} }
#ifdef REF_DEBUG #ifdef REF_DEBUG
#define sip_ref_peer(arg1,arg2) _ref_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)
#define sip_unref_peer(arg1,arg2) _unref_peer((arg1),(arg2), __FILE__, __LINE__, __PRETTY_FUNCTION__)
static struct sip_peer *_ref_peer(struct sip_peer *peer, char *tag, char *file, int line, const char *func)
{ {
if (peer) if (peer)
__ao2_ref_debug(peer, 1, tag, file, line, func); __ao2_ref_debug(peer, 1, tag, file, line, func);
@@ -3302,7 +3302,7 @@ static struct sip_peer *_ref_peer(struct sip_peer *peer, char *tag, char *file,
return peer; return peer;
} }
static struct sip_peer *_unref_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)
{ {
if (peer) if (peer)
__ao2_ref_debug(peer, -1, tag, file, line, func); __ao2_ref_debug(peer, -1, tag, file, line, func);

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

@@ -1918,7 +1918,15 @@ struct sip_peer *sip_find_peer(const char *peer, struct ast_sockaddr *addr, int
void sip_auth_headers(enum sip_auth_type code, char **header, char **respheader); 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 sip_transport t); const char *sip_get_transport(enum sip_transport t);
void *sip_unref_peer(struct sip_peer *peer, char *tag);
#ifdef REF_DEBUG
#define sip_ref_peer(arg1,arg2) _ref_peer((arg1),(arg2), __FILE__, __LINE__, __PRETTY_FUNCTION__)
#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); 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

2
channels/sip/security_events.c
View File

@@ -32,6 +32,8 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$") ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
/* #define REF_DEBUG 1 */
#include "include/sip.h" #include "include/sip.h"
#include "include/security_events.h" #include "include/security_events.h"