[asterisk-commits] oej: branch oej/pinepacketrequest r217407 - in /team/oej/pinepacketrequest: ....

[SVN commits to the Asterisk project]

Author: oej
Date: Wed Sep  9 07:01:41 2009
New Revision: 217407

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=217407
Log:
Arrgghh. Stupid oej commits breaking my branches.

Modified:
    team/oej/pinepacketrequest/   (props changed)
    team/oej/pinepacketrequest/channels/chan_sip.c

Propchange: team/oej/pinepacketrequest/
------------------------------------------------------------------------------
    automerge = http://www.codename-pineapple.org/

Propchange: team/oej/pinepacketrequest/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Sep  9 07:01:41 2009
@@ -1,1 +1,1 @@
-/trunk:1-217352
+/trunk:1-217406

Modified: team/oej/pinepacketrequest/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/oej/pinepacketrequest/channels/chan_sip.c?view=diff&rev=217407&r1=217406&r2=217407
==============================================================================
--- team/oej/pinepacketrequest/channels/chan_sip.c (original)
+++ team/oej/pinepacketrequest/channels/chan_sip.c Wed Sep  9 07:01:41 2009
@@ -3503,6 +3503,7 @@
 			res = ast_tcptls_server_write(p->socket.tcptls_session, data->str, len);
 		} else {
 			ast_debug(2, "No p->socket.tcptls_session->f len=%d\n", len);
+			return XMIT_ERROR;
 		}
 	} else {
 		ast_debug(2, "Socket type is TCP but no tcptls_session is present to write to\n");
@@ -11195,6 +11196,7 @@
 	return 0;
 }
 
+/*! \brief Find the channel that is causing the RINGING update */
 static int find_calling_channel(void *obj, void *arg, void *data, int flags)
 {
 	struct ast_channel *c = obj;
@@ -11212,7 +11214,7 @@
 	return res ? CMP_MATCH | CMP_STOP : 0;
 }
 
-/*! \brief Builds XML portion of state NOTIFY messages */
+/*! \brief Builds XML portion of NOTIFY messages for presence or dialog updates */
 static void state_notify_build_xml(int state, int full, const char *exten, const char *context, struct ast_str **tmp, struct sip_pvt *p, int subscribed, const char *mfrom, const char *mto)
 {
 	enum state { NOTIFY_OPEN, NOTIFY_INUSE, NOTIFY_CLOSED } local_state = NOTIFY_OPEN;