[asterisk-commits] mmichelson: branch group/CCSS r241014 - /team/group/CCSS/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Jan 18 13:36:55 2010
New Revision: 241014

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=241014
Log:
Free cc_esc_data and change some NOTICEs to WARNINGs.


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=241014&r1=241013&r2=241014
==============================================================================
--- team/group/CCSS/channels/chan_sip.c (original)
+++ team/group/CCSS/channels/chan_sip.c Mon Jan 18 13:36:55 2010
@@ -2029,7 +2029,8 @@
  */
 static void cc_esc_destructor(struct sip_esc_entry *esc_entry)
 {
-	/* XXX STUB */
+	struct cc_esc_data *cc_data = esc_entry->event_specific_data;
+	ast_free(cc_data);
 	return;
 }
 
@@ -23727,7 +23728,7 @@
 	struct ast_xml_node *tuple_children_iterator;
 	/* Tuples have to have an id attribute or they're invalid */
 	if (!(id = ast_xml_get_attribute(tuple_node, "id"))) {
-		ast_log(LOG_NOTICE, "Tuple XML element has no attribute 'id'\n");
+		ast_log(LOG_WARNING, "Tuple XML element has no attribute 'id'\n");
 		return FALSE;
 	}
 	/* We don't care what it actually is, just that it's there */
@@ -23735,7 +23736,7 @@
 	/* This is a tuple. It must have a status element */
 	if (!(tuple_children = ast_xml_node_get_children(tuple_node))) {
 		/* The tuple has no children. It sucks */
-		ast_log(LOG_NOTICE, "Tuple XML element has no child elements\n");
+		ast_log(LOG_WARNING, "Tuple XML element has no child elements\n");
 		return FALSE;
 	}
 	for (tuple_children_iterator = tuple_children; tuple_children_iterator;
@@ -23750,7 +23751,7 @@
 		}
 		if (status_found == TRUE) {
 			/* THERE CAN BE ONLY ONE!!! */
-			ast_log(LOG_NOTICE, "Multiple status elements found in tuple. Only one allowed\n");
+			ast_log(LOG_WARNING, "Multiple status elements found in tuple. Only one allowed\n");
 			return FALSE;
 		}
 		status_found = TRUE;
@@ -23818,7 +23819,7 @@
 			continue;
 		}
 		if (pidf_validate_tuple(node_iterator) == FALSE) {
-			ast_log(LOG_NOTICE, "Unable to validate tuple\n");
+			ast_log(LOG_WARNING, "Unable to validate tuple\n");
 			return FALSE;
 		}
 	}