diff options
| -rw-r--r-- | UPGRADE-12.txt | 10 | ||||
| -rw-r--r-- | channels/chan_sip.c | 11 |
2 files changed, 15 insertions, 6 deletions
diff --git a/UPGRADE-12.txt b/UPGRADE-12.txt index 426b1a979..8652320c4 100644 --- a/UPGRADE-12.txt +++ b/UPGRADE-12.txt @@ -25,6 +25,16 @@ There are many significant architectural changes in Asterisk 12. It is recommended that you not only read through this document for important changes that affect an upgrade, but that you also read through the CHANGES document in depth to better understand the new options available to you. +chan_sip - Clarify The "sip show peers" Forcerport Column And Add Comedia + - Under the "Forcerport" column, the "N" used to mean NAT (i.e. Yes). With + the additon of auto_* NAT settings, the meaning changed and there was a + certain combination of letters added to indicate the current setting. The + combination of using "Y", "N", "A" or "a", can be confusing. Therefore, we + now display clearly what the current Forcerport setting is: "Yes", "No", + "Auto (Yes)", "Auto (No)". + - Since we are clarifying the Forcerport column, we have added a column to + display the Comedia setting since this is useful information as well. We + no longer have a simple "NAT" setting like other versions before 11. Additional information on the architectural changes made in Asterisk can be found on the Asterisk wiki (https://wiki.asterisk.org) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 791d6936c..52e7cdd83 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -19457,7 +19457,7 @@ int peercomparefunc(const void *a, const void *b) } /* the last argument is left-aligned, so we don't need a size anyways */ -#define PEERS_FORMAT2 "%-25.25s %-39.39s %-3.3s %-10.10s %-3.3s %-8s %-11s %-32.32s %s\n" +#define PEERS_FORMAT2 "%-25.25s %-39.39s %-3.3s %-10.10s %-10.10s %-3.3s %-8s %-11s %-32.32s %s\n" /*! \brief Used in the sip_show_peers functions to pass parameters */ struct show_peers_context { @@ -19519,7 +19519,7 @@ static char *_sip_show_peers(int fd, int *total, struct mansession *s, const str if (!s) { /* Normal list */ - ast_cli(fd, PEERS_FORMAT2, "Name/username", "Host", "Dyn", "Forcerport", "ACL", "Port", "Status", "Description", (cont.realtimepeers ? "Realtime" : "")); + ast_cli(fd, PEERS_FORMAT2, "Name/username", "Host", "Dyn", "Forcerport", "Comedia", "ACL", "Port", "Status", "Description", (cont.realtimepeers ? "Realtime" : "")); } ao2_lock(peers); @@ -19635,9 +19635,8 @@ static struct sip_peer *_sip_show_peers_one(int fd, struct mansession *s, struct ast_cli(fd, PEERS_FORMAT2, name, tmp_host, peer->host_dynamic ? " D " : " ", /* Dynamic or not? */ - ast_test_flag(&peer->flags[2], SIP_PAGE3_NAT_AUTO_RPORT) ? - ast_test_flag(&peer->flags[0], SIP_NAT_FORCE_RPORT) ? " A " : " a " : - ast_test_flag(&peer->flags[0], SIP_NAT_FORCE_RPORT) ? " N " : " ", /* NAT=yes? */ + force_rport_string(peer->flags), + comedia_string(peer->flags), (!ast_acl_list_is_empty(peer->acl)) ? " A " : " ", /* permit/deny */ tmp_port, status, peer->description ? peer->description : "", @@ -19668,7 +19667,7 @@ static struct sip_peer *_sip_show_peers_one(int fd, struct mansession *s, struct ast_sockaddr_isnull(&peer->addr) ? "0" : tmp_port, peer->host_dynamic ? "yes" : "no", /* Dynamic or not? */ ast_test_flag(&peer->flags[2], SIP_PAGE3_NAT_AUTO_RPORT) ? "yes" : "no", - ast_test_flag(&peer->flags[0], SIP_NAT_FORCE_RPORT) ? "yes" : "no", /* NAT=yes? */ + ast_test_flag(&peer->flags[0], SIP_NAT_FORCE_RPORT) ? "yes" : "no", ast_test_flag(&peer->flags[2], SIP_PAGE3_NAT_AUTO_COMEDIA) ? "yes" : "no", ast_test_flag(&peer->flags[1], SIP_PAGE2_SYMMETRICRTP) ? "yes" : "no", ast_test_flag(&peer->flags[1], SIP_PAGE2_VIDEOSUPPORT) ? "yes" : "no", /* VIDEOSUPPORT=yes? */ |