From: Michiel van Baak <michiel@vanbaak.info>
Date: Wed, 2 Sep 2009 21:30:37 +0000 (+0000)
Subject: Merged revisions 215665 via svnmerge from
X-Git-Tag: 1.6.1.7-rc1~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5df0a703ed64c08c2ca9d06c545a91536c36c7c;p=thirdparty%2Fasterisk.git

Merged revisions 215665 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r215665 | mvanbaak | 2009-09-02 23:23:17 +0200 (Wed, 02 Sep 2009) | 5 lines

  add Parkinglot info to sip show peer <foo> and skinny show line <foo>

  If we had this from the start, debugging the 'parking not using configured parkinglot'
  bug would have been easier.
........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index bd4d1502c0..979fa05b59 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -14096,6 +14096,7 @@ static char *_sip_show_peer(int type, int fd, struct mansession *s, const struct
 		ast_cli(fd, "  Sess-Refresh : %s\n", strefresher2str(peer->stimer.st_ref));
 		ast_cli(fd, "  Sess-Expires : %d secs\n", peer->stimer.st_max_se);
 		ast_cli(fd, "  Min-Sess     : %d secs\n", peer->stimer.st_min_se);
+		ast_cli(fd, "  Parkinglot   : %s\n", peer->parkinglot);
 		ast_cli(fd, "\n");
 		peer = unref_peer(peer, "sip_show_peer: unref_peer: done with peer ptr");
 	} else  if (peer && type == 1) { /* manager listing */
@@ -14172,6 +14173,7 @@ static char *_sip_show_peer(int type, int fd, struct mansession *s, const struct
  		astman_append(s, "SIP-Useragent: %s\r\n", peer->useragent);
  		astman_append(s, "Reg-Contact: %s\r\n", peer->fullcontact);
 		astman_append(s, "QualifyFreq: %d ms\r\n", peer->qualifyfreq);
+		astman_append(s, "Parkinglot: %s\r\n", peer->parkinglot);
 		if (peer->chanvars) {
 			for (v = peer->chanvars ; v ; v = v->next) {
  				astman_append(s, "ChanVariable: %s=%s\r\n", v->name, v->value);
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 634ce54130..6a8ee8b14e 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -2947,6 +2947,7 @@ static char *handle_skinny_show_line(struct ast_cli_entry *e, int cmd, struct as
 			ast_cli(a->fd, "NAT:              %s\n", (l->nat ? "Yes" : "No"));
 			ast_cli(a->fd, "immediate:        %s\n", (l->immediate ? "Yes" : "No"));
 			ast_cli(a->fd, "Group:            %d\n", l->group);
+			ast_cli(a->fd, "Parkinglot:       %s\n", S_OR(l->parkinglot, "<not set>"));
 			ast_cli(a->fd, "Codecs:           ");
 			ast_getformatname_multiple(codec_buf, sizeof(codec_buf) - 1, l->capability);
 			ast_cli(a->fd, "%s\n", codec_buf);