comparison libpurple/protocols/jabber/jabber.c @ 26014:bd598b606ca4

Restructure Jingle code to more easily support multiple application types. Actually negotiate a rawudp transport rather than pretending to use iceudp.

26013:5a774d0817d8

#include "ping.h"
#include "si.h"
#include "xdata.h"
#include "pep.h"
#include "adhoccommands.h"
#include "jingle.h"

#ifdef USE_VV
#include <gst/farsight/fs-conference-iface.h>

#define XEP_0167_AUDIO_CAP "urn:xmpp:tmp:jingle:apps:rtp#audio"
#define XEP_0167_VIDEO_CAP "urn:xmpp:tmp:jingle:apps:rtp#video"
#define GTALK_CAP "http://www.google.com/session/phone"

#endif

#define JABBER_CONNECT_STEPS (js->gsc ? 9 : 5)

{
	JabberStream *js = gc->proto_data;

#ifdef USE_VV
	/* Close all of the open Jingle sessions on this stream */
	jabber_jingle_session_terminate_sessions(js);
#endif

	/* Don't perform any actions on the ssl connection
	 * if we were forcibly disconnected because it will crash
	 * on some SSL backends.

	if(!(jid = jabber_id_new(who)))
		return;

#ifdef USE_VV
	jabber_jingle_session_terminate_session_media(js, who);
#endif
	if((jb = jabber_buddy_find(js, who, TRUE)) &&
			(jbr = jabber_buddy_find_resource(jb, jid->resource))) {
		if(jbr->thread_id) {
			g_free(jbr->thread_id);

PurpleMedia *
jabber_initiate_media(PurpleConnection *gc, const char *who, 
		      PurpleMediaSessionType type)
{
	return jabber_jingle_session_initiate_media(gc->proto_data, who, type);
}

gboolean jabber_can_do_media(PurpleConnection *gc, const char *who, 
                             PurpleMediaSessionType type)
{

	}
	/* XMPP will only support two-way media, AFAIK... */
	if (type == (PURPLE_MEDIA_AUDIO | PURPLE_MEDIA_VIDEO)) {
		purple_debug_info("jabber", 
				  "Checking audio/video XEP support for %s\n", who);
		return (jabber_buddy_has_capability(jb, XEP_0167_AUDIO_CAP) ||
				jabber_buddy_has_capability(jb, GTALK_CAP)) && 
				jabber_buddy_has_capability(jb, XEP_0167_VIDEO_CAP);
	} else if (type == (PURPLE_MEDIA_AUDIO)) {
		purple_debug_info("jabber", 
				  "Checking audio XEP support for %s\n", who);
		return jabber_buddy_has_capability(jb, XEP_0167_AUDIO_CAP) ||
				jabber_buddy_has_capability(jb, GTALK_CAP);
	} else if (type == (PURPLE_MEDIA_VIDEO)) {
		purple_debug_info("jabber", 
				  "Checking video XEP support for %s\n", who);
		return jabber_buddy_has_capability(jb, XEP_0167_VIDEO_CAP);
	}

	return FALSE;
}

26014:bd598b606ca4

#include "ping.h"
#include "si.h"
#include "xdata.h"
#include "pep.h"
#include "adhoccommands.h"

#include "jingle/jingle.h"
#include "jingle/rtp.h"

#ifdef USE_VV
#include <gst/farsight/fs-conference-iface.h>

#define GTALK_CAP "http://www.google.com/session/phone"

#endif

#define JABBER_CONNECT_STEPS (js->gsc ? 9 : 5)

{
	JabberStream *js = gc->proto_data;

#ifdef USE_VV
	/* Close all of the open Jingle sessions on this stream */
	jingle_terminate_sessions(js);
#endif

	/* Don't perform any actions on the ssl connection
	 * if we were forcibly disconnected because it will crash
	 * on some SSL backends.

	if(!(jid = jabber_id_new(who)))
		return;

#ifdef USE_VV
	jingle_rtp_terminate_session(js, who);
#endif
	if((jb = jabber_buddy_find(js, who, TRUE)) &&
			(jbr = jabber_buddy_find_resource(jb, jid->resource))) {
		if(jbr->thread_id) {
			g_free(jbr->thread_id);

PurpleMedia *
jabber_initiate_media(PurpleConnection *gc, const char *who, 
		      PurpleMediaSessionType type)
{
	return jingle_rtp_initiate_media(gc->proto_data, who, type);
}

gboolean jabber_can_do_media(PurpleConnection *gc, const char *who, 
                             PurpleMediaSessionType type)
{

	}
	/* XMPP will only support two-way media, AFAIK... */
	if (type == (PURPLE_MEDIA_AUDIO | PURPLE_MEDIA_VIDEO)) {
		purple_debug_info("jabber", 
				  "Checking audio/video XEP support for %s\n", who);
		return (jabber_buddy_has_capability(jb, JINGLE_APP_RTP_SUPPORT_AUDIO) ||
				jabber_buddy_has_capability(jb, GTALK_CAP)) && 
				jabber_buddy_has_capability(jb, JINGLE_APP_RTP_SUPPORT_VIDEO);
	} else if (type == (PURPLE_MEDIA_AUDIO)) {
		purple_debug_info("jabber", 
				  "Checking audio XEP support for %s\n", who);
		return jabber_buddy_has_capability(jb, JINGLE_APP_RTP_SUPPORT_AUDIO) ||
				jabber_buddy_has_capability(jb, GTALK_CAP);
	} else if (type == (PURPLE_MEDIA_VIDEO)) {
		purple_debug_info("jabber", 
				  "Checking video XEP support for %s\n", who);
		return jabber_buddy_has_capability(jb, JINGLE_APP_RTP_SUPPORT_VIDEO);
	}

	return FALSE;
}