From: Leif Madsen Date: Mon, 3 Oct 2011 20:13:44 +0000 (+0000) Subject: Merged revisions 339148 via svnmerge from X-Git-Tag: 11.0.0-beta1~1076 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34bf1527e818078b19bf9dcc533ea68cb6288170;p=thirdparty%2Fasterisk.git Merged revisions 339148 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/10 ................ r339148 | lmadsen | 2011-10-03 15:13:16 -0500 (Mon, 03 Oct 2011) | 14 lines Merged revisions 339147 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r339147 | lmadsen | 2011-10-03 15:12:43 -0500 (Mon, 03 Oct 2011) | 6 lines Remove duplicated Maxforwards line in AMI output. (Closes issue ASTERISK-18637) Reported by: Jacek Konieczny Patches: asterisk-sipshowpeer.patch (License #6298) uploaded by Jacek Konieczny ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339149 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 1a84aafb80..bf39c2f835 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -17524,7 +17524,6 @@ static char *_sip_show_peer(int type, int fd, struct mansession *s, const struct astman_append(s, "VoiceMailbox: %s\r\n", mailbox_str->str); astman_append(s, "TransferMode: %s\r\n", transfermode2str(peer->allowtransfer)); astman_append(s, "Maxforwards: %d\r\n", peer->maxforwards); - astman_append(s, "Maxforwards: %d\r\n", peer->maxforwards); astman_append(s, "Call-limit: %d\r\n", peer->call_limit); astman_append(s, "Busy-level: %d\r\n", peer->busy_level); astman_append(s, "MaxCallBR: %d kbps\r\n", peer->maxcallbitrate);