Convert sig_pri to use a global callback table.

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

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 94415e0c0d242da681c86fa03678c0a639c0bfe3..f87b500f9ed33ceb71af502d2a4600e737d39fb2 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -3442,7 +3442,7 @@ static void my_pri_init_config(void *priv, struct sig_pri_span *pri);
 #endif /* defined(HAVE_PRI_CALL_WAITING) */
 static int dahdi_new_pri_nobch_channel(struct sig_pri_span *pri);
 
-static struct sig_pri_callback dahdi_pri_callbacks =
+struct sig_pri_callback sig_pri_callbacks =
 {
        .handle_dchan_exception = my_handle_dchan_exception,
        .play_tone = my_pri_play_tone,
@@ -12812,8 +12812,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
                                                        return NULL;
                                                }
 
-                                               ast_debug(4, "Adding callbacks %p to chan %d\n", &dahdi_pri_callbacks, tmp->channel);
-                                               pri_chan = sig_pri_chan_new(tmp, &dahdi_pri_callbacks, &pris[span].pri, tmp->logicalspan, p.chanpos, pris[span].mastertrunkgroup);
+                                               pri_chan = sig_pri_chan_new(tmp, &pris[span].pri, tmp->logicalspan, p.chanpos, pris[span].mastertrunkgroup);
                                                if (!pri_chan) {
                                                        destroy_dahdi_pvt(tmp);
                                                        return NULL;
@@ -13596,7 +13595,7 @@ static int dahdi_new_pri_nobch_channel(struct sig_pri_span *pri)
        pvt->faxbuf_no = dahdi_pseudo_parms.faxbuf_no;
        pvt->faxbuf_policy = dahdi_pseudo_parms.faxbuf_policy;
 
-       chan = sig_pri_chan_new(pvt, &dahdi_pri_callbacks, pri, 0, 0, 0);
+       chan = sig_pri_chan_new(pvt, pri, 0, 0, 0);
        if (!chan) {
                destroy_dahdi_pvt(pvt);
                return -1;
@@ -14436,8 +14435,6 @@ static int prepare_pri(struct dahdi_pri *pri)
        struct dahdi_bufferinfo bi;
        struct dahdi_spaninfo si;
 
-       pri->pri.calls = &dahdi_pri_callbacks;
-
        for (i = 0; i < SIG_PRI_NUM_DCHANS; i++) {
                if (!pri->dchannels[i])
                        break;

diff --git a/channels/sig_pri.c b/channels/sig_pri.c
index 4bb4066e7ad35703bcb2b163ced92dc807d36050..1da6af43edb53b49e00bd36bfc1233cd46693b4a 100644 (file)
--- a/channels/sig_pri.c
+++ b/channels/sig_pri.c
@@ -161,30 +161,31 @@ static unsigned int PVT_TO_CHANNEL(struct sig_pri_chan *p)
 
 static void sig_pri_handle_dchan_exception(struct sig_pri_span *pri, int index)
 {
-       if (pri->calls->handle_dchan_exception)
-               pri->calls->handle_dchan_exception(pri, index);
+       if (sig_pri_callbacks.handle_dchan_exception) {
+               sig_pri_callbacks.handle_dchan_exception(pri, index);
+       }
 }
 
 static void sig_pri_set_dialing(struct sig_pri_chan *p, int is_dialing)
 {
-       if (p->calls->set_dialing) {
-               p->calls->set_dialing(p->chan_pvt, is_dialing);
+       if (sig_pri_callbacks.set_dialing) {
+               sig_pri_callbacks.set_dialing(p->chan_pvt, is_dialing);
        }
 }
 
 static void sig_pri_set_digital(struct sig_pri_chan *p, int is_digital)
 {
        p->digital = is_digital;
-       if (p->calls->set_digital) {
-               p->calls->set_digital(p->chan_pvt, is_digital);
+       if (sig_pri_callbacks.set_digital) {
+               sig_pri_callbacks.set_digital(p->chan_pvt, is_digital);
        }
 }
 
 static void sig_pri_set_outgoing(struct sig_pri_chan *p, int is_outgoing)
 {
        p->outgoing = is_outgoing;
-       if (p->calls->set_outgoing) {
-               p->calls->set_outgoing(p->chan_pvt, is_outgoing);
+       if (sig_pri_callbacks.set_outgoing) {
+               sig_pri_callbacks.set_outgoing(p->chan_pvt, is_outgoing);
        }
 }
 
@@ -203,15 +204,15 @@ void sig_pri_set_alarm(struct sig_pri_chan *p, int in_alarm)
        p->resetting = SIG_PRI_RESET_IDLE;
 
        p->inalarm = in_alarm;
-       if (p->calls->set_alarm) {
-               p->calls->set_alarm(p->chan_pvt, in_alarm);
+       if (sig_pri_callbacks.set_alarm) {
+               sig_pri_callbacks.set_alarm(p->chan_pvt, in_alarm);
        }
 }
 
 static const char *sig_pri_get_orig_dialstring(struct sig_pri_chan *p)
 {
-       if (p->calls->get_orig_dialstring) {
-               return p->calls->get_orig_dialstring(p->chan_pvt);
+       if (sig_pri_callbacks.get_orig_dialstring) {
+               return sig_pri_callbacks.get_orig_dialstring(p->chan_pvt);
        }
        ast_log(LOG_ERROR, "get_orig_dialstring callback not defined\n");
        return "";
@@ -220,8 +221,8 @@ static const char *sig_pri_get_orig_dialstring(struct sig_pri_chan *p)
 #if defined(HAVE_PRI_CCSS)
 static void sig_pri_make_cc_dialstring(struct sig_pri_chan *p, char *buf, size_t buf_size)
 {
-       if (p->calls->make_cc_dialstring) {
-               p->calls->make_cc_dialstring(p->chan_pvt, buf, buf_size);
+       if (sig_pri_callbacks.make_cc_dialstring) {
+               sig_pri_callbacks.make_cc_dialstring(p->chan_pvt, buf, buf_size);
        } else {
                ast_log(LOG_ERROR, "make_cc_dialstring callback not defined\n");
                buf[0] = '\0';
@@ -231,8 +232,8 @@ static void sig_pri_make_cc_dialstring(struct sig_pri_chan *p, char *buf, size_t
 
 static void sig_pri_dial_digits(struct sig_pri_chan *p, const char *dial_string)
 {
-       if (p->calls->dial_digits) {
-               p->calls->dial_digits(p->chan_pvt, dial_string);
+       if (sig_pri_callbacks.dial_digits) {
+               sig_pri_callbacks.dial_digits(p->chan_pvt, dial_string);
        }
 }
 
@@ -249,8 +250,8 @@ static void sig_pri_dial_digits(struct sig_pri_chan *p, const char *dial_string)
  */
 static void sig_pri_span_devstate_changed(struct sig_pri_span *pri)
 {
-       if (pri->calls->update_span_devstate) {
-               pri->calls->update_span_devstate(pri);
+       if (sig_pri_callbacks.update_span_devstate) {
+               sig_pri_callbacks.update_span_devstate(pri);
        }
 }
 
@@ -267,7 +268,7 @@ static void sig_pri_set_caller_id(struct sig_pri_chan *p)
 {
        struct ast_party_caller caller;
 
-       if (p->calls->set_callerid) {
+       if (sig_pri_callbacks.set_callerid) {
                ast_party_caller_init(&caller);
 
                caller.id.name.str = p->cid_name;
@@ -293,7 +294,7 @@ static void sig_pri_set_caller_id(struct sig_pri_chan *p)
                caller.ani.number.valid = 1;
 
                caller.ani2 = p->cid_ani2;
-               p->calls->set_callerid(p->chan_pvt, &caller);
+               sig_pri_callbacks.set_callerid(p->chan_pvt, &caller);
        }
 }
 
@@ -309,8 +310,8 @@ static void sig_pri_set_caller_id(struct sig_pri_chan *p)
  */
 static void sig_pri_set_dnid(struct sig_pri_chan *p, const char *dnid)
 {
-       if (p->calls->set_dnid) {
-               p->calls->set_dnid(p->chan_pvt, dnid);
+       if (sig_pri_callbacks.set_dnid) {
+               sig_pri_callbacks.set_dnid(p->chan_pvt, dnid);
        }
 }
 
@@ -326,27 +327,29 @@ static void sig_pri_set_dnid(struct sig_pri_chan *p, const char *dnid)
  */
 static void sig_pri_set_rdnis(struct sig_pri_chan *p, const char *rdnis)
 {
-       if (p->calls->set_rdnis) {
-               p->calls->set_rdnis(p->chan_pvt, rdnis);
+       if (sig_pri_callbacks.set_rdnis) {
+               sig_pri_callbacks.set_rdnis(p->chan_pvt, rdnis);
        }
 }
 
 static void sig_pri_unlock_private(struct sig_pri_chan *p)
 {
-       if (p->calls->unlock_private)
-               p->calls->unlock_private(p->chan_pvt);
+       if (sig_pri_callbacks.unlock_private) {
+               sig_pri_callbacks.unlock_private(p->chan_pvt);
+       }
 }
 
 static void sig_pri_lock_private(struct sig_pri_chan *p)
 {
-       if (p->calls->lock_private)
-               p->calls->lock_private(p->chan_pvt);
+       if (sig_pri_callbacks.lock_private) {
+               sig_pri_callbacks.lock_private(p->chan_pvt);
+       }
 }
 
 static void sig_pri_deadlock_avoidance_private(struct sig_pri_chan *p)
 {
-       if (p->calls->deadlock_avoidance_private) {
-               p->calls->deadlock_avoidance_private(p->chan_pvt);
+       if (sig_pri_callbacks.deadlock_avoidance_private) {
+               sig_pri_callbacks.deadlock_avoidance_private(p->chan_pvt);
        } else {
                /* Fallback to the old way if callback not present. */
                sig_pri_unlock_private(p);
@@ -927,39 +930,42 @@ static void sig_pri_redirecting_update(struct sig_pri_chan *pvt, struct ast_chan
  */
 static void sig_pri_dsp_reset_and_flush_digits(struct sig_pri_chan *p)
 {
-       if (p->calls->dsp_reset_and_flush_digits) {
-               p->calls->dsp_reset_and_flush_digits(p->chan_pvt);
+       if (sig_pri_callbacks.dsp_reset_and_flush_digits) {
+               sig_pri_callbacks.dsp_reset_and_flush_digits(p->chan_pvt);
        }
 }
 
 static int sig_pri_set_echocanceller(struct sig_pri_chan *p, int enable)
 {
-       if (p->calls->set_echocanceller)
-               return p->calls->set_echocanceller(p->chan_pvt, enable);
-       else
+       if (sig_pri_callbacks.set_echocanceller) {
+               return sig_pri_callbacks.set_echocanceller(p->chan_pvt, enable);
+       } else {
                return -1;
+       }
 }
 
 static void sig_pri_fixup_chans(struct sig_pri_chan *old_chan, struct sig_pri_chan *new_chan)
 {
-       if (old_chan->calls->fixup_chans)
-               old_chan->calls->fixup_chans(old_chan->chan_pvt, new_chan->chan_pvt);
+       if (sig_pri_callbacks.fixup_chans) {
+               sig_pri_callbacks.fixup_chans(old_chan->chan_pvt, new_chan->chan_pvt);
+       }
 }
 
 static int sig_pri_play_tone(struct sig_pri_chan *p, enum sig_pri_tone tone)
 {
-       if (p->calls->play_tone)
-               return p->calls->play_tone(p->chan_pvt, tone);
-       else
+       if (sig_pri_callbacks.play_tone) {
+               return sig_pri_callbacks.play_tone(p->chan_pvt, tone);
+       } else {
                return -1;
+       }
 }
 
 static struct ast_channel *sig_pri_new_ast_channel(struct sig_pri_chan *p, int state, int ulaw, int transfercapability, char *exten, const struct ast_channel *requestor)
 {
        struct ast_channel *c;
 
-       if (p->calls->new_ast_channel) {
-               c = p->calls->new_ast_channel(p->chan_pvt, state, ulaw, exten, requestor);
+       if (sig_pri_callbacks.new_ast_channel) {
+               c = sig_pri_callbacks.new_ast_channel(p->chan_pvt, state, ulaw, exten, requestor);
        } else {
                return NULL;
        }
@@ -1001,8 +1007,8 @@ static void sig_pri_open_media(struct sig_pri_chan *p)
                return;
        }
 
-       if (p->calls->open_media) {
-               p->calls->open_media(p->chan_pvt);
+       if (sig_pri_callbacks.open_media) {
+               sig_pri_callbacks.open_media(p->chan_pvt);
        }
 }
 
@@ -1019,8 +1025,8 @@ static void sig_pri_open_media(struct sig_pri_chan *p)
  */
 static void sig_pri_ami_channel_event(struct sig_pri_chan *p)
 {
-       if (p->calls->ami_channel_event) {
-               p->calls->ami_channel_event(p->chan_pvt, p->owner);
+       if (sig_pri_callbacks.ami_channel_event) {
+               sig_pri_callbacks.ami_channel_event(p->chan_pvt, p->owner);
        }
 }
 
@@ -1255,8 +1261,8 @@ static void pri_queue_control(struct sig_pri_span *pri, int chanpos, int subclas
        struct ast_frame f = {AST_FRAME_CONTROL, };
        struct sig_pri_chan *p = pri->pvts[chanpos];
 
-       if (p->calls->queue_control) {
-               p->calls->queue_control(p->chan_pvt, subclass);
+       if (sig_pri_callbacks.queue_control) {
+               sig_pri_callbacks.queue_control(p->chan_pvt, subclass);
        }
 
        f.subclass.integer = subclass;
@@ -1783,8 +1789,8 @@ static void sig_pri_init_config(struct sig_pri_chan *pvt, struct sig_pri_span *p
        ast_copy_string(pvt->context, pri->ch_cfg.context, sizeof(pvt->context));
        ast_copy_string(pvt->mohinterpret, pri->ch_cfg.mohinterpret, sizeof(pvt->mohinterpret));
 
-       if (pri->calls->init_config) {
-               pri->calls->init_config(pvt->chan_pvt, pri);
+       if (sig_pri_callbacks.init_config) {
+               sig_pri_callbacks.init_config(pvt->chan_pvt, pri);
        }
 }
 #endif /* defined(HAVE_PRI_CALL_WAITING) */
@@ -1855,8 +1861,8 @@ static int pri_find_empty_nobch(struct sig_pri_span *pri)
        }
 
        /* Need to create a new interface. */
-       if (pri->calls->new_nobch_intf) {
-               idx = pri->calls->new_nobch_intf(pri);
+       if (sig_pri_callbacks.new_nobch_intf) {
+               idx = sig_pri_callbacks.new_nobch_intf(pri);
        } else {
                idx = -1;
        }
@@ -2655,7 +2661,7 @@ static void sig_pri_cc_monitor_instance_destroy(void *data)
                pri_cc_cancel(monitor_instance->pri->pri, monitor_instance->cc_id);
                ast_mutex_unlock(&monitor_instance->pri->lock);
        }
-       monitor_instance->pri->calls->module_unref();
+       sig_pri_callbacks.module_unref();
 }
 #endif /* defined(HAVE_PRI_CCSS) */
 
@@ -2682,7 +2688,7 @@ static struct sig_pri_cc_monitor_instance *sig_pri_cc_monitor_instance_init(int
 {
        struct sig_pri_cc_monitor_instance *monitor_instance;
 
-       if (!pri->calls->module_ref || !pri->calls->module_unref) {
+       if (!sig_pri_callbacks.module_ref || !sig_pri_callbacks.module_unref) {
                return NULL;
        }
 
@@ -2697,7 +2703,7 @@ static struct sig_pri_cc_monitor_instance *sig_pri_cc_monitor_instance_init(int
        monitor_instance->core_id = core_id;
        strcpy(monitor_instance->name, device_name);
 
-       pri->calls->module_ref();
+       sig_pri_callbacks.module_ref();
 
        ao2_link(sig_pri_cc_monitors, monitor_instance);
        return monitor_instance;
@@ -8647,8 +8653,8 @@ void sig_pri_dial_complete(struct sig_pri_chan *pvt, struct ast_channel *ast)
                {
                        struct ast_frame f = {AST_FRAME_CONTROL, };
 
-                       if (pvt->calls->queue_control) {
-                               pvt->calls->queue_control(pvt->chan_pvt, AST_CONTROL_ANSWER);
+                       if (sig_pri_callbacks.queue_control) {
+                               sig_pri_callbacks.queue_control(pvt->chan_pvt, AST_CONTROL_ANSWER);
                        }
 
                        f.subclass.integer = AST_CONTROL_ANSWER;
@@ -9121,7 +9127,7 @@ int sig_pri_is_alarm_ignored(struct sig_pri_span *pri)
        return pri->layer1_ignored;
 }
 
-struct sig_pri_chan *sig_pri_chan_new(void *pvt_data, struct sig_pri_callback *callback, struct sig_pri_span *pri, int logicalspan, int channo, int trunkgroup)
+struct sig_pri_chan *sig_pri_chan_new(void *pvt_data, struct sig_pri_span *pri, int logicalspan, int channo, int trunkgroup)
 {
        struct sig_pri_chan *p;
 
@@ -9133,7 +9139,6 @@ struct sig_pri_chan *sig_pri_chan_new(void *pvt_data, struct sig_pri_callback *c
        p->prioffset = channo;
        p->mastertrunkgroup = trunkgroup;
 
-       p->calls = callback;
        p->chan_pvt = pvt_data;
 
        p->pri = pri;

diff --git a/channels/sig_pri.h b/channels/sig_pri.h
index 6c1ca2aa38605c3bf29dc19aaee97d5aa9ce6249..80f22c9a68948788c2d1d98d27b9f6cad7f12978 100644 (file)
--- a/channels/sig_pri.h
+++ b/channels/sig_pri.h
@@ -231,6 +231,9 @@ struct sig_pri_callback {
        void (*module_unref)(void);
 };
 
+/*! Global sig_pri callbacks to the upper layer. */
+extern struct sig_pri_callback sig_pri_callbacks;
+
 #define SIG_PRI_NUM_DCHANS             4               /*!< No more than 4 d-channels */
 #define SIG_PRI_MAX_CHANNELS   672             /*!< No more than a DS3 per trunk group */
 
@@ -358,7 +361,6 @@ struct sig_pri_chan {
        unsigned service_status;
 #endif /* defined(HAVE_PRI_SERVICE_MESSAGES) */
 
-       struct sig_pri_callback *calls;
        void *chan_pvt;                                 /*!< Private structure of the user of this module. */
 #if defined(HAVE_PRI_REVERSE_CHARGE)
        /*!
@@ -583,7 +585,6 @@ struct sig_pri_span {
        pthread_t master;                                                       /*!< Thread of master */
        ast_mutex_t lock;                                                       /*!< libpri access Mutex */
        time_t lastreset;                                                       /*!< time when unused channels were last reset */
-       struct sig_pri_callback *calls;
        /*!
         * \brief Congestion device state of the span.
         * \details
@@ -648,7 +649,7 @@ void pri_event_noalarm(struct sig_pri_span *pri, int index, int before_start_pri
 
 struct ast_channel *sig_pri_request(struct sig_pri_chan *p, enum sig_pri_law law, const struct ast_channel *requestor, int transfercapability);
 
-struct sig_pri_chan *sig_pri_chan_new(void *pvt_data, struct sig_pri_callback *callback, struct sig_pri_span *pri, int logicalspan, int channo, int trunkgroup);
+struct sig_pri_chan *sig_pri_chan_new(void *pvt_data, struct sig_pri_span *pri, int logicalspan, int channo, int trunkgroup);
 void sig_pri_chan_delete(struct sig_pri_chan *doomed);
 
 int pri_is_up(struct sig_pri_span *pri);