From: Joshua Colp <jcolp@digium.com>
Date: Thu, 18 Jan 2007 18:39:21 +0000 (+0000)
Subject: Merged revisions 51243 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3442
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a06a5825076e0c3db030c69f0924674cffe50c5;p=thirdparty%2Fasterisk.git

Merged revisions 51243 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r51243 | file | 2007-01-18 13:36:35 -0500 (Thu, 18 Jan 2007) | 2 lines

Copy MOH settings when calling a peer so that if they put someone on hold or get put on hold themselves they get the right music class. (issue #8840 reported by mdu113)

........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index e115cf1c97..833202bf77 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2745,6 +2745,8 @@ static int create_addr_from_peer(struct sip_pvt *dialog, struct sip_peer *peer)
 	ast_string_field_set(dialog, username, peer->username);
 	ast_string_field_set(dialog, peersecret, peer->secret);
 	ast_string_field_set(dialog, peermd5secret, peer->md5secret);
+	ast_string_field_set(dialog, mohsuggest, peer->mohsuggest);
+	ast_string_field_set(dialog, mohinterpret, peer->mohinterpret);
 	ast_string_field_set(dialog, tohost, peer->tohost);
 	ast_string_field_set(dialog, fullcontact, peer->fullcontact);
 	if (!dialog->initreq.headers && !ast_strlen_zero(peer->fromdomain)) {