dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 321812-321813 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r321812 | rmudgett | 2011-06-03 14:55:21 -0500 (Fri, 03 Jun 2011) | 1 line
  
  Correct IAX2 and SIP event subscription description string.
........
  r321813 | rmudgett | 2011-06-03 14:56:09 -0500 (Fri, 03 Jun 2011) | 1 line
  
  Constify subscription description parameter string.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@321814 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
rmudgett 2011-06-03 19:57:03 +00:00
parent 0424cbba6e
commit 3abc32f081
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
channels/chan_iax2.c
View File

@ -1282,10 +1282,7 @@ static void network_change_event_subscribe(void)
{ {
if (!network_change_event_subscription) { if (!network_change_event_subscription) {
network_change_event_subscription = ast_event_subscribe(AST_EVENT_NETWORK_CHANGE, network_change_event_subscription = ast_event_subscribe(AST_EVENT_NETWORK_CHANGE,
network_change_event_cb, network_change_event_cb, "IAX2 Network Change", NULL, AST_EVENT_IE_END);
"SIP Network Change ",
NULL,
AST_EVENT_IE_END);
} }
} }

4
channels/chan_sip.c
View File

@ -14248,9 +14248,7 @@ static void network_change_event_subscribe(void)
{ {
if (!network_change_event_subscription) { if (!network_change_event_subscription) {
network_change_event_subscription = ast_event_subscribe(AST_EVENT_NETWORK_CHANGE, network_change_event_subscription = ast_event_subscribe(AST_EVENT_NETWORK_CHANGE,
network_change_event_cb, network_change_event_cb, "SIP Network Change", NULL, AST_EVENT_IE_END);
"SIP Network Change ",
NULL, AST_EVENT_IE_END);
} }
} }

5
include/asterisk/event.h
View File

@ -114,7 +114,7 @@ typedef void (*ast_event_cb_t)(const struct ast_event *event, void *userdata);
* \note A NULL description will cause this function to crash, so watch out! * \note A NULL description will cause this function to crash, so watch out!
*/ */
struct ast_event_sub *ast_event_subscribe(enum ast_event_type event_type, struct ast_event_sub *ast_event_subscribe(enum ast_event_type event_type,
ast_event_cb_t cb, char *description, void *userdata, ...); ast_event_cb_t cb, const char *description, void *userdata, ...);
/*! /*!
* \brief Allocate a subscription, but do not activate it * \brief Allocate a subscription, but do not activate it
@ -397,8 +397,7 @@ int ast_event_queue(struct ast_event *event);
* The event API already knows which events can be cached and how to cache them. * The event API already knows which events can be cached and how to cache them.
* *
* \retval 0 success * \retval 0 success
* \retval non-zero failure. If failure is returned, the event must be destroyed * \retval non-zero failure.
* by the caller of this function.
*/ */
int ast_event_queue_and_cache(struct ast_event *event); int ast_event_queue_and_cache(struct ast_event *event);

2
main/event.c
View File

@ -840,7 +840,7 @@ int ast_event_sub_activate(struct ast_event_sub *sub)
} }
struct ast_event_sub *ast_event_subscribe(enum ast_event_type type, ast_event_cb_t cb, struct ast_event_sub *ast_event_subscribe(enum ast_event_type type, ast_event_cb_t cb,
char *description, void *userdata, ...) const char *description, void *userdata, ...)
{ {
va_list ap; va_list ap;
enum ast_event_ie_type ie_type; enum ast_event_ie_type ie_type;