kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup approach in 217804 and don't reach inside the sig_pvt.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@217987 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2009-09-10 23:49:09 +00:00
parent 3a718192c6
commit edb5e6efd9
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
channels/chan_dahdi.c
View File

@@ -6357,10 +6357,7 @@ static int dahdi_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
} }
#ifdef HAVE_PRI #ifdef HAVE_PRI
else if (dahdi_sig_pri_lib_handles(p->sig)) { else if (dahdi_sig_pri_lib_handles(p->sig)) {
struct sig_pri_chan *pchan = p->sig_pvt; sig_pri_fixup(oldchan, newchan, p->sig_pvt);
if (pchan->owner == oldchan) {
pchan->owner = newchan;
}
} }
#endif #endif

7
channels/sig_pri.c
View File

@@ -3198,4 +3198,11 @@ int pri_maintenance_bservice(struct pri *pri, struct sig_pri_chan *p, int change
} }
#endif #endif
void sig_pri_fixup(struct ast_channel *oldchan, struct ast_channel *newchan, struct sig_pri_chan *pchan)
{
if (pchan->owner == oldchan) {
pchan->owner = newchan;
}
}
#endif /* HAVE_PRI */ #endif /* HAVE_PRI */

2
channels/sig_pri.h
View File

@@ -266,4 +266,6 @@ int pri_send_callrerouting_facility_exec(struct sig_pri_chan *p, enum ast_channe
int pri_maintenance_bservice(struct pri *pri, struct sig_pri_chan *p, int changestatus); int pri_maintenance_bservice(struct pri *pri, struct sig_pri_chan *p, int changestatus);
#endif #endif
void sig_pri_fixup(struct ast_channel *oldchan, struct ast_channel *newchan, struct sig_pri_chan *pchan);
#endif /* _SIG_PRI_H */ #endif /* _SIG_PRI_H */