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

diff --git a/UPGRADE.txt b/UPGRADE.txt
index c935d122df49ea9488882e7e0519fc1e234a6357..a654865faedb8f87e3651f8f154dbdd9d235614c 100644 (file)
--- 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 e0b5c9da633ce17a400a13d197620d5362603976..d8fdc0e73cc4223bbeb7c6e6729b7bc3c1b68d05 100644 (file)
--- 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 36b03a9fc44b769cac2f7ed974780b1df1c8f72d..5ffe7fac15879114c33f8135ffcb3315879b57a9 100644 (file)
--- 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 */