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

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

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index ade108dbe22458fdec93d6a191ae515e2940b95f..94240377d540509ab6c44302164f1b8945dc923e 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -6357,10 +6357,7 @@ static int dahdi_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
        } 
 #ifdef HAVE_PRI
        else if (dahdi_sig_pri_lib_handles(p->sig)) {
-               struct sig_pri_chan *pchan = p->sig_pvt;
-               if (pchan->owner == oldchan) {
-                       pchan->owner = newchan;
-               }
+               sig_pri_fixup(oldchan, newchan, p->sig_pvt);
        }
 #endif
 

diff --git a/channels/sig_pri.c b/channels/sig_pri.c
index 779d7f69c0db91026b4299c36ae4c3ee915d6fae..f76113e080472f639dee38c1817e2827767b0d26 100644 (file)
--- a/channels/sig_pri.c
+++ b/channels/sig_pri.c
@@ -3198,4 +3198,11 @@ int pri_maintenance_bservice(struct pri *pri, struct sig_pri_chan *p, int change
 }
 #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 */

diff --git a/channels/sig_pri.h b/channels/sig_pri.h
index eb6bd02bd8cea05ea4633d193047ff78a3a3a59c..a61ef3161c0cd03c64c039e1a39eccefd577ab7f 100644 (file)
--- a/channels/sig_pri.h
+++ b/channels/sig_pri.h
@@ -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);
 #endif
 
+void sig_pri_fixup(struct ast_channel *oldchan, struct ast_channel *newchan, struct sig_pri_chan *pchan);
+
 #endif /* _SIG_PRI_H */