[asterisk-commits] mvanbaak: branch 1.6.1 r215679 - in /branches/1.6.1: ./ channels/

[SVN commits to the Asterisk project]

Author: mvanbaak
Date: Wed Sep  2 16:30:37 2009
New Revision: 215679

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=215679
Log:
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.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c
    branches/1.6.1/channels/chan_skinny.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=215679&r1=215678&r2=215679
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Wed Sep  2 16:30:37 2009
@@ -14096,6 +14096,7 @@
 		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 @@
  		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);

Modified: branches/1.6.1/channels/chan_skinny.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_skinny.c?view=diff&rev=215679&r1=215678&r2=215679
==============================================================================
--- branches/1.6.1/channels/chan_skinny.c (original)
+++ branches/1.6.1/channels/chan_skinny.c Wed Sep  2 16:30:37 2009
@@ -2947,6 +2947,7 @@
 			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);