[asterisk-commits] file: trunk r371620 - in /trunk: ./ channels/chan_motif.c

[SVN commits to the Asterisk project]

Author: file
Date: Wed Aug 22 10:55:26 2012
New Revision: 371620

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=371620
Log:
Add support for call-id logging to chan_motif.

Review: https://reviewboard.asterisk.org/r/2077/
........

Merged revisions 371619 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/channels/chan_motif.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-11-merged (original)
+++ branch-11-merged Wed Aug 22 10:55:26 2012
@@ -1,1 +1,1 @@
-/branches/11:1-371121,371143,371146,371200,371227,371258,371272,371295,371324,371355,371382,371395,371399,371425-371426,371438,371482,371492,371507,371516,371518,371520,371546,371571,371592
+/branches/11:1-371121,371143,371146,371200,371227,371258,371272,371295,371324,371355,371382,371395,371399,371425-371426,371438,371482,371492,371507,371516,371518,371520,371546,371571,371592,371619

Modified: trunk/channels/chan_motif.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_motif.c?view=diff&rev=371620&r1=371619&r2=371620
==============================================================================
--- trunk/channels/chan_motif.c (original)
+++ trunk/channels/chan_motif.c Wed Aug 22 10:55:26 2012
@@ -170,6 +170,7 @@
 	struct ast_format_cap *peercap;       /*!< Peer codec capabilities */
 	unsigned int outgoing:1;              /*!< Whether this is an outgoing leg or not */
 	unsigned int gone:1;                  /*!< In the eyes of Jingle this session is already gone */
+	struct ast_callid *callid;            /*!< Bound session call-id */
 };
 
 static const char desc[] = "Motif Jingle Channel";
@@ -436,6 +437,10 @@
 	ast_format_cap_destroy(session->jointcap);
 	ast_format_cap_destroy(session->peercap);
 
+	if (session->callid) {
+		ast_callid_unref(session->callid);
+	}
+
 	ast_string_field_free_memory(session);
 }
 
@@ -539,11 +544,15 @@
 static struct jingle_session *jingle_alloc(struct jingle_endpoint *endpoint, const char *from, const char *sid)
 {
 	struct jingle_session *session;
+	struct ast_callid *callid;
 	struct ast_sockaddr tmp;
 
 	if (!(session = ao2_alloc(sizeof(*session), jingle_session_destructor))) {
 		return NULL;
 	}
+
+	callid = ast_read_threadstorage_callid();
+	session->callid = (callid ? callid : ast_create_callid());
 
 	if (ast_string_field_init(session, 512)) {
 		ao2_ref(session, -1);
@@ -572,7 +581,8 @@
 
 	if (!(session->cap = ast_format_cap_alloc_nolock()) ||
 	    !(session->jointcap = ast_format_cap_alloc_nolock()) ||
-	    !(session->peercap = ast_format_cap_alloc_nolock())) {
+	    !(session->peercap = ast_format_cap_alloc_nolock()) ||
+	    !session->callid) {
 		ao2_ref(session, -1);
 		return NULL;
 	}
@@ -617,6 +627,8 @@
 	ast_channel_tech_set(chan, &jingle_tech);
 	ast_channel_tech_pvt_set(chan, session);
 	session->owner = chan;
+
+	ast_channel_callid_set(chan, session->callid);
 
 	ast_format_cap_copy(ast_channel_nativeformats(chan), session->cap);
 	ast_codec_choose(&session->prefs, session->cap, 1, &tmpfmt);
@@ -1346,6 +1358,8 @@
 	iks_filter_remove_rule(session->connection->filter, session->rule);
 	session->rule = NULL;
 
+	ast_callid_threadassoc_add(session->callid);
+
 	/* If no error occurred they accepted our session-initiate message happily */
 	if (!error) {
 		struct ast_channel *chan;
@@ -1358,7 +1372,8 @@
 		ao2_unlock(session);
 
 		jingle_send_transport_info(session, iks_find_attrib(pak->x, "from"));
-		return IKS_FILTER_EAT;
+
+		goto end;
 	}
 
 	/* Assume that because this is an error the session is gone, there is only one case where this is incorrect - a redirect */
@@ -1427,6 +1442,9 @@
 	} else {
 		jingle_queue_hangup_with_cause(session, AST_CAUSE_PROTOCOL_ERROR);
 	}
+
+end:
+	ast_callid_threadassoc_remove();
 
 	return IKS_FILTER_EAT;
 }
@@ -2384,6 +2402,11 @@
 		session = ao2_find(endpoint->state->sessions, sid, OBJ_KEY);
 	}
 
+	/* If a session is present associate the callid with this thread */
+	if (session) {
+		ast_callid_threadassoc_add(session->callid);
+	}
+
 	/* Iterate through supported action handlers looking for one that is able to handle this */
 	for (i = 0; i < ARRAY_LEN(jingle_action_handlers); i++) {
 		if (!strcasecmp(jingle_action_handlers[i].action, action)) {
@@ -2400,6 +2423,7 @@
 
 	/* If a session was successfully found for this message deref it now since the handler is done */
 	if (session) {
+		ast_callid_threadassoc_remove();
 		ao2_ref(session, -1);
 	}