diff options
| author | George Joseph <george.joseph@fairview5.com> | 2014-06-19 20:13:20 +0000 |
|---|---|---|
| committer | George Joseph <george.joseph@fairview5.com> | 2014-06-19 20:13:20 +0000 |
| commit | d87f8c429e6852d11f7a3bddf6981e2f754c1ea8 (patch) | |
| tree | 1ad84131a2d570ce903a00ac292e46ce18b6e493 /res/res_pjsip_endpoint_identifier_ip.c | |
| parent | bd36288efa8fdb4cda14c1ff99862911aaa70b53 (diff) | |
pjsip cli: Change Identify to show CIDR notation instead of netmasks.
* Added ast_sockaddr_cidr_bits() to count the 1 bits in an ast_sockaddr.
* Added ast_ha_join_cidr() which uses ast_sockaddr_cidr_bits() for the netmask
instead of ast_sockaddr_stringify_addr.
* Changed res_pjsip_endpoint_identifier_ip to call ast_ha_join_cidr() instead
of ast_ha_join() for the CLI output.
This is a CLI change only. AMI was not affected.
Tested by: George Joseph
Review: https://reviewboard.asterisk.org/r/3652/
........
Merged revisions 416737 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@416738 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_pjsip_endpoint_identifier_ip.c')
| -rw-r--r-- | res/res_pjsip_endpoint_identifier_ip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_pjsip_endpoint_identifier_ip.c b/res/res_pjsip_endpoint_identifier_ip.c index b4b7e9a9c..f52b4447d 100644 --- a/res/res_pjsip_endpoint_identifier_ip.c +++ b/res/res_pjsip_endpoint_identifier_ip.c @@ -372,7 +372,7 @@ static int cli_print_body(void *obj, void *arg, int flags) ast_str_append(&context->output_buffer, 0, "%*s: ", CLI_INDENT_TO_SPACES(context->indent_level), "Identify"); - ast_ha_join(ident->matches, &str); + ast_ha_join_cidr(ident->matches, &str); ast_str_append(&context->output_buffer, 0, "%s\n", ast_str_buffer(str)); return 0; |