diff options
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 2 | ||||
| -rw-r--r-- | channels/chan_iax2.c | 10 | ||||
| -rw-r--r-- | channels/chan_mgcp.c | 2 | ||||
| -rw-r--r-- | channels/chan_sip.c | 12 | ||||
| -rw-r--r-- | channels/chan_skinny.c | 6 | ||||
| -rw-r--r-- | channels/sig_pri.c | 2 |
6 files changed, 17 insertions, 17 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 5fc968367..f7cfa8cd7 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -553,7 +553,7 @@ static int restart_monitor(void); static int dahdi_sendtext(struct ast_channel *c, const char *text); -static void mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg) +static void mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct stasis_message *msg) { /* This module does not handle MWI in an event-based manner. However, it * subscribes to MWI for each mailbox that is configured so that the core diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index fb68131b6..b880f5d94 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -1270,8 +1270,8 @@ static void build_rand_pad(unsigned char *buf, ssize_t len); static int get_unused_callno(enum callno_type type, int validated, callno_entry *entry); static int replace_callno(const void *obj); static void sched_delay_remove(struct sockaddr_in *sin, callno_entry entry); -static void network_change_stasis_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *message); -static void acl_change_stasis_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *message); +static void network_change_stasis_cb(void *data, struct stasis_subscription *sub, struct stasis_message *message); +static void acl_change_stasis_cb(void *data, struct stasis_subscription *sub, struct stasis_message *message); static struct ast_channel_tech iax2_tech = { .type = "IAX2", @@ -1331,7 +1331,7 @@ static void iax2_lock_owner(int callno) } } -static void mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg) +static void mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct stasis_message *msg) { /* The MWI subscriptions exist just so the core knows we care about those * mailboxes. However, we just grab the events out of the cache when it @@ -1378,7 +1378,7 @@ static int network_change_sched_cb(const void *data) } static void network_change_stasis_cb(void *data, struct stasis_subscription *sub, - struct stasis_topic *topic, struct stasis_message *message) + struct stasis_message *message) { /* This callback is only concerned with network change messages from the system topic. */ if (stasis_message_type(message) != ast_network_change_type()) { @@ -1392,7 +1392,7 @@ static void network_change_stasis_cb(void *data, struct stasis_subscription *sub } static void acl_change_stasis_cb(void *data, struct stasis_subscription *sub, - struct stasis_topic *topic, struct stasis_message *message) + struct stasis_message *message) { if (stasis_message_type(message) != ast_named_acl_change_type()) { return; diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index b28fce355..8fcdebfad 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -486,7 +486,7 @@ static struct ast_channel_tech mgcp_tech = { .func_channel_read = acf_channel_read, }; -static void mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg) +static void mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct stasis_message *msg) { /* This module does not handle MWI in an event-based manner. However, it * subscribes to MWI for each mailbox that is configured so that the core diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 9cbfd715d..2a821dd73 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -1324,9 +1324,9 @@ static int sip_poke_noanswer(const void *data); static int sip_poke_peer(struct sip_peer *peer, int force); static void sip_poke_all_peers(void); static void sip_peer_hold(struct sip_pvt *p, int hold); -static void mwi_event_cb(void *, struct stasis_subscription *, struct stasis_topic *, struct stasis_message *); -static void network_change_stasis_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *message); -static void acl_change_stasis_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *message); +static void mwi_event_cb(void *, struct stasis_subscription *, struct stasis_message *); +static void network_change_stasis_cb(void *data, struct stasis_subscription *sub, struct stasis_message *message); +static void acl_change_stasis_cb(void *data, struct stasis_subscription *sub, struct stasis_message *message); static void sip_keepalive_all_peers(void); /*--- Applications, functions, CLI and manager command helpers */ @@ -16825,7 +16825,7 @@ static void sip_peer_hold(struct sip_pvt *p, int hold) } /*! \brief Receive MWI events that we have subscribed to */ -static void mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg) +static void mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct stasis_message *msg) { struct sip_peer *peer = userdata; if (stasis_subscription_final_message(sub, msg)) { @@ -16872,7 +16872,7 @@ static int network_change_sched_cb(const void *data) return 0; } -static void network_change_stasis_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *message) +static void network_change_stasis_cb(void *data, struct stasis_subscription *sub, struct stasis_message *message) { /* This callback is only concerned with network change messages from the system topic. */ if (stasis_message_type(message) != ast_network_change_type()) { @@ -28940,7 +28940,7 @@ static int restart_monitor(void) } static void acl_change_stasis_cb(void *data, struct stasis_subscription *sub, - struct stasis_topic *topic, struct stasis_message *message) + struct stasis_message *message) { if (stasis_message_type(message) != ast_named_acl_change_type()) { return; diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index b62079616..7cf592a26 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -1639,7 +1639,7 @@ static int skinny_indicate(struct ast_channel *ast, int ind, const void *data, s static int skinny_fixup(struct ast_channel *oldchan, struct ast_channel *newchan); static int skinny_senddigit_begin(struct ast_channel *ast, char digit); static int skinny_senddigit_end(struct ast_channel *ast, char digit, unsigned int duration); -static void mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg); +static void mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct stasis_message *msg); static int skinny_dialer_cb(const void *data); static int skinny_reload(void); @@ -2300,7 +2300,7 @@ static int skinny_register(struct skinny_req *req, struct skinnysession *s) set_callforwards(l, NULL, SKINNY_CFWD_ALL|SKINNY_CFWD_BUSY|SKINNY_CFWD_NOANSWER); register_exten(l); /* initialize MWI on line and device */ - mwi_event_cb(l, NULL, NULL, NULL); + mwi_event_cb(l, NULL, NULL); AST_LIST_TRAVERSE(&l->sublines, subline, list) { ast_extension_state_add(subline->context, subline->exten, skinny_extensionstate_cb, subline->container); } @@ -3529,7 +3529,7 @@ static void update_connectedline(struct skinny_subchannel *sub, const void *data send_callinfo(sub); } -static void mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg) +static void mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct stasis_message *msg) { struct skinny_line *l = userdata; struct skinny_device *d = l->device; diff --git a/channels/sig_pri.c b/channels/sig_pri.c index a6d134e1b..9f4007723 100644 --- a/channels/sig_pri.c +++ b/channels/sig_pri.c @@ -8892,7 +8892,7 @@ static void sig_pri_send_mwi_indication(struct sig_pri_span *pri, const char *vm * * \return Nothing */ -static void sig_pri_mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg) +static void sig_pri_mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct stasis_message *msg) { struct sig_pri_span *pri = userdata; const char *mbox_context; |