[svn-commits] mmichelson: branch group/CCSS r233355 - /team/group/CCSS/channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Dec  4 17:00:51 2009
New Revision: 233355

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=233355
Log:
Combine initial and modify CC ESC handlers since
the functions have turned out to be identical.


Modified:
    team/group/CCSS/channels/chan_sip.c

Modified: team/group/CCSS/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/channels/chan_sip.c?view=diff&rev=233355&r1=233354&r2=233355
==============================================================================
--- team/group/CCSS/channels/chan_sip.c (original)
+++ team/group/CCSS/channels/chan_sip.c Fri Dec  4 17:00:51 2009
@@ -1952,12 +1952,11 @@
 	const esc_publish_callback remove_handler;
 };
 
-static int cc_esc_publish_initial_handler(struct sip_pvt *pvt, struct sip_request *req, struct event_state_compositor *esc, struct sip_esc_entry *esc_entry);
-static int cc_esc_publish_modify_handler(struct sip_pvt *pvt, struct sip_request *req, struct event_state_compositor *esc, struct sip_esc_entry *esc_entry);
+static int cc_esc_publish_handler(struct sip_pvt *pvt, struct sip_request *req, struct event_state_compositor *esc, struct sip_esc_entry *esc_entry);
 
 static const struct sip_esc_publish_callbacks cc_esc_publish_callbacks = {
-	.initial_handler = cc_esc_publish_initial_handler,
-	.modify_handler = cc_esc_publish_modify_handler,
+	.initial_handler = cc_esc_publish_handler,
+	.modify_handler = cc_esc_publish_handler,
 };
 
 /*!
@@ -23474,7 +23473,7 @@
 	return res;
 }
 
-static int cc_esc_publish_initial_handler(struct sip_pvt *pvt, struct sip_request *req, struct event_state_compositor *esc, struct sip_esc_entry *esc_entry)
+static int cc_esc_publish_handler(struct sip_pvt *pvt, struct sip_request *req, struct event_state_compositor *esc, struct sip_esc_entry *esc_entry)
 {
 	const char *uri = REQ_OFFSET_TO_STR(req, rlPart2);
 	struct ast_cc_agent *agent = find_sip_cc_agent_by_notify_uri(uri);
@@ -23585,21 +23584,6 @@
 
 	ao2_ref(esc_entry, -1);
 	return res;
-}
-
-static int cc_esc_publish_modify_handler(struct sip_pvt *pvt, struct sip_request *req, struct event_state_compositor *esc, struct sip_esc_entry *esc_entry)
-{
-	/*XXX STUB
-	 * 9 times out of 10, a modify PUBLISH will be changing the state from closed to open.
-	 * Of course it is very possible for either state to be present.
-	 *
-	 * If the modify is setting the state to closed, then we will call ast_cc_caller_busy.
-	 *
-	 * If the modify is setting the state to open, then we will call ast_cc_caller_available.
-	 *
-	 * Simple as that.
-	 */
-	return 0;
 }
 
 static int handle_sip_publish_modify(struct sip_pvt *p, struct sip_request *req, struct event_state_compositor *esc, const char * const etag, const int expires)