From 9afa6af881a3364a7a15393b087e8217e0acbf44 Mon Sep 17 00:00:00 2001
From: Mark Michelson <mmichelson@digium.com>
Date: Fri, 9 Apr 2010 22:20:22 +0000
Subject: [PATCH] Remove status_response callbacks where they are not needed.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@256661 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_sip.c | 11 -----------
main/ccss.c | 11 -----------
2 files changed, 22 deletions(-)
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 9e8efac25c..21480b325f 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1887,7 +1887,6 @@ static int find_sip_monitor_instance_by_suspension_entry(void *obj, void *arg, i
static int sip_cc_monitor_request_cc(struct ast_cc_monitor *monitor, int *available_timer_id);
static int sip_cc_monitor_suspend(struct ast_cc_monitor *monitor);
-static int sip_cc_monitor_status_response(struct ast_cc_monitor *monitor, enum ast_device_state devstate);
static int sip_cc_monitor_unsuspend(struct ast_cc_monitor *monitor);
static int sip_cc_monitor_cancel_available_timer(struct ast_cc_monitor *monitor, int *sched_id);
static void sip_cc_monitor_destructor(void *private_data);
@@ -1896,7 +1895,6 @@ static struct ast_cc_monitor_callbacks sip_cc_monitor_callbacks = {
.type = "SIP",
.request_cc = sip_cc_monitor_request_cc,
.suspend = sip_cc_monitor_suspend,
- .status_response = sip_cc_monitor_status_response,
.unsuspend = sip_cc_monitor_unsuspend,
.cancel_available_timer = sip_cc_monitor_cancel_available_timer,
.destructor = sip_cc_monitor_destructor,
@@ -2010,15 +2008,6 @@ static int sip_cc_monitor_suspend(struct ast_cc_monitor *monitor)
return transmit_publish(monitor_instance->suspension_entry, publish_type, monitor_instance->notify_uri);
}
-static int sip_cc_monitor_status_response(struct ast_cc_monitor *monitor, enum ast_device_state devstate)
-{
- /* This will never be called because the SIP monitor will never make a status request to
- * begin with
- */
- ast_log(LOG_WARNING, "sip_cc_monitor_status_response called. Something dreadfully wrong must have happened.\n");
- return 0;
-}
-
static int sip_cc_monitor_unsuspend(struct ast_cc_monitor *monitor)
{
struct sip_monitor_instance *monitor_instance = monitor->private_data;
diff --git a/main/ccss.c b/main/ccss.c
index 4e616011bc..ad1d76ed54 100644
--- a/main/ccss.c
+++ b/main/ccss.c
@@ -965,7 +965,6 @@ static const struct ast_cc_agent_callbacks *find_agent_callbacks(struct ast_chan
static int cc_generic_monitor_request_cc(struct ast_cc_monitor *monitor, int *available_timer_id);
static int cc_generic_monitor_suspend(struct ast_cc_monitor *monitor);
-static int cc_generic_monitor_status_response(struct ast_cc_monitor *monitor, enum ast_device_state devstate);
static int cc_generic_monitor_unsuspend(struct ast_cc_monitor *monitor);
static int cc_generic_monitor_cancel_available_timer(struct ast_cc_monitor *monitor, int *sched_id);
static void cc_generic_monitor_destructor(void *private_data);
@@ -974,7 +973,6 @@ static struct ast_cc_monitor_callbacks generic_monitor_cbs = {
.type = "generic",
.request_cc = cc_generic_monitor_request_cc,
.suspend = cc_generic_monitor_suspend,
- .status_response = cc_generic_monitor_status_response,
.unsuspend = cc_generic_monitor_unsuspend,
.cancel_available_timer = cc_generic_monitor_cancel_available_timer,
.destructor = cc_generic_monitor_destructor,
@@ -1258,15 +1256,6 @@ static int cc_generic_monitor_suspend(struct ast_cc_monitor *monitor)
return 0;
}
-static int cc_generic_monitor_status_response(struct ast_cc_monitor *monitor, enum ast_device_state devstate)
-{
- /* The generic monitor will never issue a status request of the other side's agent.
- * If this somehow gets called, something really fishy is going on.
- */
- ast_log(LOG_WARNING, "Why has a generic monitor's status_response callback been called? CoreID is %d\n", monitor->core_id);
- return 0;
-}
-
static int cc_generic_monitor_unsuspend(struct ast_cc_monitor *monitor)
{
struct generic_monitor_instance *generic_instance;
--
GitLab