diff options
| author | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-23 22:09:53 +0000 |
|---|---|---|
| committer | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-23 22:09:53 +0000 |
| commit | bd4cc829529c32b850d0dba13e6be7d12cc650d6 (patch) | |
| tree | 61dfd97a97f0b748a6149ba47d88f97af50cfbf6 | |
| parent | f8806fc84268c3d552bdb129889796597a3e4b8f (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@202763 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_dahdi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index e71ee1074..e4d93fdc9 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -8607,13 +8607,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 |