pidgin: a781312b: jingle: termininate the sesion with reas...

malu at pidgin.im malu at pidgin.im
Mon Dec 6 17:40:42 EST 2010


----------------------------------------------------------------------
Revision: a781312b0b11ce6f62ec8741adf87e6c2cada216
Parent:   5bf6c7070fe27d6defcb578ffc5670b8c44c292c
Author:   malu at pidgin.im
Date:     12/06/10 17:38:56
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a781312b0b11ce6f62ec8741adf87e6c2cada216

Changelog: 

jingle: termininate the sesion with reason unsupported-applications if we get an unsupported content type

Changes against parent 5bf6c7070fe27d6defcb578ffc5670b8c44c292c

  patched  libpurple/protocols/jabber/jingle/jingle.c

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/jingle.c	c64e56b0f7160bdde0e113d39851e02deb11990f
+++ libpurple/protocols/jabber/jingle/jingle.c	0beb3712f08617bca74947582a4919825ef90ba1
@@ -98,7 +98,8 @@ jingle_handle_content_add(JingleSession 
 		if (pending_content == NULL) {
 			purple_debug_error("jingle",
 					"Error parsing \"content-add\" content.\n");
-			/* XXX: send error here */
+			jabber_iq_send(jingle_session_terminate_packet(session,
+				"unsupported-applications"));
 		} else {
 			jingle_session_add_pending_content(session,
 					pending_content);
@@ -127,7 +128,8 @@ jingle_handle_content_modify(JingleSessi
 			g_free(local_senders);
 		} else {
 			purple_debug_error("jingle", "content_modify: unknown content\n");
-			/* XXX: send error */
+			jabber_iq_send(jingle_session_terminate_packet(session,
+				"unknown-applications"));
 		}
 	}
 }
@@ -176,7 +178,8 @@ jingle_handle_description_info(JingleSes
 				jingle_session_find_content(session, name, creator);
 		if (parsed_content == NULL) {
 			purple_debug_error("jingle", "Error parsing content\n");
-			/* XXX: send error */
+			jabber_iq_send(jingle_session_terminate_packet(session,
+				"unsupported-applications"));
 		} else {
 			jingle_content_handle_action(parsed_content, content,
 					JINGLE_DESCRIPTION_INFO);
@@ -206,7 +209,8 @@ jingle_handle_session_accept(JingleSessi
 				jingle_session_find_content(session, name, creator);
 		if (parsed_content == NULL) {
 			purple_debug_error("jingle", "Error parsing content\n");
-			/* XXX: send error */
+			jabber_iq_send(jingle_session_terminate_packet(session,
+				"unsupported-applications"));
 		} else {
 			jingle_content_handle_action(parsed_content, content,
 					JINGLE_SESSION_ACCEPT);
@@ -230,7 +234,8 @@ jingle_handle_session_initiate(JingleSes
 		JingleContent *parsed_content = jingle_content_parse(content);
 		if (parsed_content == NULL) {
 			purple_debug_error("jingle", "Error parsing content\n");
-			/* XXX: send error */
+			jabber_iq_send(jingle_session_terminate_packet(session,
+				"unsupported-applications"));
 		} else {
 			jingle_session_add_content(session, parsed_content);
 			jingle_content_handle_action(parsed_content, content,
@@ -281,7 +286,8 @@ jingle_handle_transport_info(JingleSessi
 				jingle_session_find_content(session, name, creator);
 		if (parsed_content == NULL) {
 			purple_debug_error("jingle", "Error parsing content\n");
-			/* XXX: send error */
+			jabber_iq_send(jingle_session_terminate_packet(session,
+				"unsupported-applications"));
 		} else {
 			jingle_content_handle_action(parsed_content, content,
 					JINGLE_TRANSPORT_INFO);


More information about the Commits mailing list