diff options
| author | Sean Bright <sean@malleable.com> | 2012-03-20 18:17:16 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2012-03-20 18:17:16 +0000 |
| commit | 3a231e090f8e6746856358f49e6f21b0a3a1ab38 (patch) | |
| tree | eb432aed000a648e7a838abb28493e33664a5dd8 | |
| parent | 334f13d8b8ea94f388af20c144f24097089e5e1c (diff) | |
chan_iax2: Correct spelling of 'Port' header in IAX2 PeerStatus AMI Events
The PeerStatus event for IAX2 channels currently includes a header named Post
which should have been Port. Post was removed and the AMI version has been
updated to 1.3.
........
Merged revisions 359982 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@359983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | UPGRADE.txt | 2 | ||||
| -rw-r--r-- | channels/chan_iax2.c | 2 | ||||
| -rw-r--r-- | include/asterisk/manager.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/UPGRADE.txt b/UPGRADE.txt index c935d122d..a654865fa 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -66,6 +66,8 @@ Configuration Files: AMI: - DBDelTree now correctly returns an error when 0 rows are deleted just as the DBDel action does. + - The IAX2 PeerStatus event now sends a 'Port' header. In Asterisk 10, this was + erroneously being sent as a 'Post' header. CCSS: - Macro is deprecated. Use cc_callback_sub instead of cc_callback_macro diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index e0b5c9da6..d8fdc0e73 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -8763,7 +8763,7 @@ static int update_registry(struct sockaddr_in *sin, int callno, char *devtype, i ast_db_put("IAX/Registry", p->name, data); ast_verb(3, "Registered IAX2 '%s' (%s) at %s:%d\n", p->name, ast_test_flag(&iaxs[callno]->state, IAX_STATE_AUTHENTICATED) ? "AUTHENTICATED" : "UNAUTHENTICATED", ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port)); - manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: IAX2\r\nPeer: IAX2/%s\r\nPeerStatus: Registered\r\nAddress: %s\r\nPost: %d\r\n", p->name, ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port)); + manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: IAX2\r\nPeer: IAX2/%s\r\nPeerStatus: Registered\r\nAddress: %s\r\nPort: %d\r\n", p->name, ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port)); register_peer_exten(p, 1); ast_devstate_changed(AST_DEVICE_UNKNOWN, "IAX2/%s", p->name); /* Activate notification */ } else if (!ast_test_flag64(p, IAX_TEMPONLY)) { diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h index 36b03a9fc..5ffe7fac1 100644 --- a/include/asterisk/manager.h +++ b/include/asterisk/manager.h @@ -54,7 +54,7 @@ - \ref manager.c Main manager code file */ -#define AMI_VERSION "1.2" +#define AMI_VERSION "1.3" #define DEFAULT_MANAGER_PORT 5038 /* Default port for Asterisk management via TCP */ #define DEFAULT_MANAGER_TLS_PORT 5039 /* Default port for Asterisk management via TCP */ |