diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2012-08-08 00:15:54 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2012-08-08 00:15:54 +0000 |
| commit | f24be2740b0212380e28aa6154a58dbeb3cc0fdd (patch) | |
| tree | e8da37db26448dc450c7c33482a99e5dd7fd6c31 /channels/chan_dahdi.c | |
| parent | f4d1b7ab1207f59ec748ff0b72d5a266a110b164 (diff) | |
Convert sig_ss7 to use a global callback table.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@370887 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index b60838358..94415e0c0 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -3614,7 +3614,7 @@ static int my_ss7_play_tone(void *pvt, enum sig_ss7_tone tone) #endif /* defined(HAVE_SS7) */ #if defined(HAVE_SS7) -static struct sig_ss7_callback dahdi_ss7_callbacks = +struct sig_ss7_callback sig_ss7_callbacks = { .lock_private = my_lock_private, .unlock_private = my_unlock_private, @@ -12653,7 +12653,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, destroy_dahdi_pvt(tmp); return NULL; } - ss7_chan = sig_ss7_chan_new(tmp, &dahdi_ss7_callbacks, &ss7->ss7); + ss7_chan = sig_ss7_chan_new(tmp, &ss7->ss7); if (!ss7_chan) { destroy_dahdi_pvt(tmp); return NULL; @@ -18855,7 +18855,6 @@ static int setup_dahdi_int(int reload, struct dahdi_chan_conf *default_conf, str int x; for (x = 0; x < NUM_SPANS; x++) { if (linksets[x].ss7.ss7) { - linksets[x].ss7.calls = &dahdi_ss7_callbacks; if (ast_pthread_create(&linksets[x].ss7.master, NULL, ss7_linkset, &linksets[x].ss7)) { ast_log(LOG_ERROR, "Unable to start SS7 linkset on span %d\n", x + 1); return -1; |