Change delimiter of SIPPEER to be comma (instead of pipe) and further deprecate the...

Reported by: pj
Patch by: tilghman
Closes issue #11305

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89429 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 28f23d6..6df7e1d 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12964,9 +12964,12 @@ static int function_sippeer(struct ast_channel *chan, const char *cmd, char *dat
        struct sip_peer *peer;
        char *colname;
 
-       if ((colname = strchr(data, ':')))      /*! \todo Will be deprecated after 1.4 */
+       if ((colname = strchr(data, ':'))) {    /*! \todo Will be deprecated after 1.4 */
+               static int deprecation_warning = 0;
                *colname++ = '\0';
-       else if ((colname = strchr(data, '|')))
+               if (deprecation_warning++ % 10 == 0)
+                       ast_log(LOG_WARNING, "SIPPEER(): usage of ':' to separate arguments is deprecated.  Please use ',' instead.\n");
+       } else if ((colname = strchr(data, ',')))
                *colname++ = '\0';
        else
                colname = "ip";
@@ -13035,7 +13038,7 @@ static int function_sippeer(struct ast_channel *chan, const char *cmd, char *dat
 struct ast_custom_function sippeer_function = {
        .name = "SIPPEER",
        .synopsis = "Gets SIP peer information",
-       .syntax = "SIPPEER(<peername>[|item])",
+       .syntax = "SIPPEER(<peername>[,item])",
        .read = function_sippeer,
        .desc = "Valid items are:\n"
        "- ip (default)          The IP address.\n"