[svn-commits] mmichelson: trunk r256661 - in /trunk: channels/chan_sip.c main/ccss.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Apr  9 17:20:22 2010
New Revision: 256661

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=256661
Log:
Remove status_response callbacks where they are not needed.


Modified:
    trunk/channels/chan_sip.c
    trunk/main/ccss.c

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=256661&r1=256660&r2=256661
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri Apr  9 17:20:22 2010
@@ -1887,7 +1887,6 @@
 
 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 @@
 	.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,
@@ -2008,15 +2006,6 @@
 	}
 	construct_pidf_body(CC_CLOSED, monitor_instance->suspension_entry->body, sizeof(monitor_instance->suspension_entry->body), monitor_instance->peername);
 	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)

Modified: trunk/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/ccss.c?view=diff&rev=256661&r1=256660&r2=256661
==============================================================================
--- trunk/main/ccss.c (original)
+++ trunk/main/ccss.c Fri Apr  9 17:20:22 2010
@@ -965,7 +965,6 @@
 
 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 @@
 	.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,
@@ -1255,15 +1253,6 @@
 		}
 	}
 	cc_unref(generic_list, "Done with generic list in suspend callback");
-	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;
 }