From 1ce9e5b41de8a0ee0ed4f6aaa5ac4bb9118156ee Mon Sep 17 00:00:00 2001
From: Michiel van Baak <michiel@vanbaak.info>
Date: Wed, 2 Sep 2009 21:37:53 +0000
Subject: [PATCH] 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.2@215680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 channels/chan_sip.c    | 2 ++
 channels/chan_skinny.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 5431a9d929..dc6cb67727 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -14918,6 +14918,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 */
@@ -14996,6 +14997,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 a9e0afdfd8..84bcd4d751 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -3397,6 +3397,7 @@ static char *_skinny_show_line(int type, int fd, struct mansession *s, const str
 				ast_cli(fd, "NAT:              %s\n", (l->nat ? "Yes" : "No"));
 				ast_cli(fd, "immediate:        %s\n", (l->immediate ? "Yes" : "No"));
 				ast_cli(fd, "Group:            %d\n", l->group);
+				ast_cli(fd, "Parkinglot:       %s\n", S_OR(l->parkinglot, "<not set>"));
 				ast_cli(fd, "Conf Codecs:      ");
 				ast_getformatname_multiple(codec_buf, sizeof(codec_buf) - 1, l->confcapability);
 				ast_cli(fd, "%s\n", codec_buf);
@@ -3442,6 +3443,7 @@ static char *_skinny_show_line(int type, int fd, struct mansession *s, const str
 				astman_append(s, "NAT: %s\r\n", (l->nat ? "Yes" : "No"));
 				astman_append(s, "immediate: %s\r\n", (l->immediate ? "Yes" : "No"));
 				astman_append(s, "Group: %d\r\n", l->group);
+				astman_append(s, "Parkinglot: %s\r\n", S_OR(l->parkinglot, "<not set>"));
 				ast_getformatname_multiple(codec_buf, sizeof(codec_buf) - 1, l->confcapability);
 				astman_append(s, "Codecs: %s\r\n", codec_buf);
 				astman_append(s, "CodecOrder: ");