From: Matthew Fredrickson <creslin@digium.com>
Date: Tue, 23 Jun 2009 22:11:23 +0000 (+0000)
Subject: Merged revisions 202761 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6208dc59db69ce12b5f22e80f741339e5cd9556;p=thirdparty%2Fasterisk.git

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

........
r202761 | mattf | 2009-06-23 17:08:43 -0500 (Tue, 23 Jun 2009) | 1 line

I could have sworn I committed this patch ages ago, but... bug fix with setting NAI properly on linksets in certain situations.
........


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

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index f400136b93..54dcff933d 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -8798,13 +8798,13 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
 				tmp->ss7call = NULL;
 				ss7->pvts[ss7->numchans++] = tmp;
 
-				ast_copy_string(linksets[span].internationalprefix, conf->ss7.internationalprefix, sizeof(linksets[span].internationalprefix));
-				ast_copy_string(linksets[span].nationalprefix, conf->ss7.nationalprefix, sizeof(linksets[span].nationalprefix));
-				ast_copy_string(linksets[span].subscriberprefix, conf->ss7.subscriberprefix, sizeof(linksets[span].subscriberprefix));
-				ast_copy_string(linksets[span].unknownprefix, conf->ss7.unknownprefix, sizeof(linksets[span].unknownprefix));
+				ast_copy_string(ss7->internationalprefix, conf->ss7.internationalprefix, sizeof(ss7->internationalprefix));
+				ast_copy_string(ss7->nationalprefix, conf->ss7.nationalprefix, sizeof(ss7->nationalprefix));
+				ast_copy_string(ss7->subscriberprefix, conf->ss7.subscriberprefix, sizeof(ss7->subscriberprefix));
+				ast_copy_string(ss7->unknownprefix, conf->ss7.unknownprefix, sizeof(ss7->unknownprefix));
 
-				linksets[span].called_nai = conf->ss7.called_nai;
-				linksets[span].calling_nai = conf->ss7.calling_nai;
+				ss7->called_nai = conf->ss7.called_nai;
+				ss7->calling_nai = conf->ss7.calling_nai;
 			}
 #endif
 #ifdef HAVE_PRI