comparison libpurple/protocols/bonjour/jabber.c @ 17554:a1d05bc43d95

Send 'to' and 'from' attributes in the stream start message.

17553:61005dea822b

#include "jabber.h"
#include "bonjour.h"
#include "buddy.h"

static gint
_connect_to_buddy(PurpleBuddy *gb)
{
	gint socket_fd;
	struct sockaddr_in buddy_address;

	g_free(html_body);
}

struct _check_buddy_by_address_t {
	const char *address;
	PurpleBuddy **gb;
	BonjourJabber *bj;
};

static void
_check_buddy_by_address(gpointer key, gpointer value, gpointer data)
{
	PurpleBuddy *gb = value;
	BonjourBuddy *bb;
	struct _check_buddy_by_address_t *cbba = data;

	/*
	 * If the current PurpleBuddy's data is not null and the PurpleBuddy's account
	 * is the same as the account requesting the check then continue to determine
	 * whether the buddies IP matches the target IP.
	 */
	if (cbba->bj->account == gb->account)
	{
		bb = gb->proto_data;
		if ((bb != NULL) && (g_ascii_strcasecmp(bb->ip, cbba->address) == 0))
			*(cbba->gb) = gb;
	}
}

static gint
_read_data(gint socket, char **message)

static void
_client_socket_handler(gpointer data, gint socket, PurpleInputCondition condition)
{
	char *message = NULL;
	gint message_length;
	PurpleBuddy *gb = data;
	PurpleAccount *account = gb->account;
	PurpleConversation *conversation;
	BonjourBuddy *bb = gb->proto_data;
	gboolean closed_conversation = FALSE;
	xmlnode *message_node;

	/* Read the data from the socket */
	if ((message_length = _read_data(socket, &message)) == -1) {

		{
			bb->conversation->stream_started = TRUE;
		}
		else
		{
			/* TODO: This needs to be nonblocking! */
			if (send(bb->conversation->socket, DOCTYPE, strlen(DOCTYPE), 0) == -1)
				purple_debug_error("bonjour", "Unable to start a conversation with %s\n", bb->name);
			else
				bb->conversation->stream_started = TRUE;
		}
	}

	/*
	 * Check that this is not the end of the conversation.  This is

			g_free(bb->conversation);
			bb->conversation = NULL;
		}

		/* Inform the user that the conversation has been closed */
		conversation = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, gb->name, account);
		closed_conv_message = g_strdup_printf(_("%s has closed the conversation."), gb->name);
		purple_conversation_write(conversation, NULL, closed_conv_message, PURPLE_MESSAGE_SYSTEM, time(NULL));
		g_free(closed_conv_message);
	} else if (message_node != NULL) {
		/* Parse the message to get the data and send to the ui */
		_jabber_parse_and_write_message_to_ui(message_node, account->gc, gb);
	} else {
		/* TODO: Deal with receiving only a partial message */
	}

	g_free(message);

}

static void
_server_socket_handler(gpointer data, int server_socket, PurpleInputCondition condition)
{
	PurpleBuddy *gb = NULL;
	struct sockaddr_in their_addr; /* connector's address information */
	socklen_t sin_size = sizeof(struct sockaddr);
	int client_socket;
	BonjourBuddy *bb;
	char *address_text = NULL;

	/* Look for the buddy that has opened the conversation and fill information */
	address_text = inet_ntoa(their_addr.sin_addr);
	cbba = g_new0(struct _check_buddy_by_address_t, 1);
	cbba->address = address_text;
	cbba->gb = &gb;
	cbba->bj = data;
	g_hash_table_foreach(bl->buddies, _check_buddy_by_address, cbba);
	g_free(cbba);
	if (gb == NULL)
	{
		purple_debug_info("bonjour", "We don't like invisible buddies, this is not a superheros comic\n");
		close(client_socket);
		return;
	}
	bb = gb->proto_data;

	/* Check if the conversation has been previously started */
	if (bb->conversation == NULL)
	{
		bb->conversation = g_new(BonjourJabberConversation, 1);
		bb->conversation->socket = client_socket;
		bb->conversation->stream_started = FALSE;
		bb->conversation->buddy_name = g_strdup(gb->name);

		if (bb->conversation->stream_started == FALSE) {
			/* Start the stream */
			send(bb->conversation->socket, DOCTYPE, strlen(DOCTYPE), 0);
			bb->conversation->stream_started = TRUE;
		}

		/* Open a watcher for the client socket */
		bb->conversation->watcher_id = purple_input_add(client_socket, PURPLE_INPUT_READ,
								_client_socket_handler, gb);
	} else {
		close(client_socket);
	}
}

	xmlnode_free(message_node);

	/* Check if the stream for the conversation has been started */
	if (bb->conversation->stream_started == FALSE)
	{
		/* Start the stream */
		if (send(bb->conversation->socket, DOCTYPE, strlen(DOCTYPE), 0) == -1)
		{
			PurpleConversation *conv;

			purple_debug_error("bonjour", "Unable to start a conversation\n");
			purple_debug_warning("bonjour", "send error: %s\n", strerror(errno));

			/* Free all the data related to the conversation */
			g_free(bb->conversation->buddy_name);
			g_free(bb->conversation);
			bb->conversation = NULL;
			g_free(message);
			return 0;
		}

		bb->conversation->stream_started = TRUE;
	}

	/* Send the message */
	ret = (_send_data(bb->conversation->socket, message) == -1);

17554:a1d05bc43d95

#include "jabber.h"
#include "bonjour.h"
#include "buddy.h"

#define STREAM_END "</stream:stream>"
/* TODO: specify version='1.0' and send stream features */
#define DOCTYPE "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" \
		"<stream:stream xmlns=\"jabber:client\" xmlns:stream=\"http://etherx.jabber.org/streams\" from=\"%s\" to=\"%s\">"

static gint
_connect_to_buddy(PurpleBuddy *gb)
{
	gint socket_fd;
	struct sockaddr_in buddy_address;

	g_free(html_body);
}

struct _check_buddy_by_address_t {
	const char *address;
	PurpleBuddy **pb;
	BonjourJabber *bj;
};

static void
_check_buddy_by_address(gpointer key, gpointer value, gpointer data)
{
	PurpleBuddy *pb = value;
	BonjourBuddy *bb;
	struct _check_buddy_by_address_t *cbba = data;

	/*
	 * If the current PurpleBuddy's data is not null and the PurpleBuddy's account
	 * is the same as the account requesting the check then continue to determine
	 * whether the buddies IP matches the target IP.
	 */
	if (cbba->bj->account == pb->account)
	{
		bb = pb->proto_data;
		if ((bb != NULL) && (g_ascii_strcasecmp(bb->ip, cbba->address) == 0))
			*(cbba->pb) = pb;
	}
}

static gint
_read_data(gint socket, char **message)

static void
_client_socket_handler(gpointer data, gint socket, PurpleInputCondition condition)
{
	char *message = NULL;
	gint message_length;
	PurpleBuddy *pb = data;
	PurpleAccount *account = pb->account;
	PurpleConversation *conversation;
	BonjourBuddy *bb = pb->proto_data;
	gboolean closed_conversation = FALSE;
	xmlnode *message_node;

	/* Read the data from the socket */
	if ((message_length = _read_data(socket, &message)) == -1) {

		{
			bb->conversation->stream_started = TRUE;
		}
		else
		{
			char *stream_start = g_strdup_printf(DOCTYPE, purple_account_get_username(pb->account),
							     purple_buddy_get_name(pb));

			/* TODO: This needs to be nonblocking! */
			if (send(bb->conversation->socket, stream_start, strlen(stream_start), 0) == -1)
				purple_debug_error("bonjour", "Unable to start a conversation with %s\n", bb->name);
			else
				bb->conversation->stream_started = TRUE;

			g_free(stream_start);
		}
	}

	/*
	 * Check that this is not the end of the conversation.  This is

			g_free(bb->conversation);
			bb->conversation = NULL;
		}

		/* Inform the user that the conversation has been closed */
		conversation = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, pb->name, account);
		closed_conv_message = g_strdup_printf(_("%s has closed the conversation."), pb->name);
		purple_conversation_write(conversation, NULL, closed_conv_message, PURPLE_MESSAGE_SYSTEM, time(NULL));
		g_free(closed_conv_message);
	} else if (message_node != NULL) {
		/* Parse the message to get the data and send to the ui */
		_jabber_parse_and_write_message_to_ui(message_node, account->gc, pb);
	} else {
		/* TODO: Deal with receiving only a partial message */
	}

	g_free(message);

}

static void
_server_socket_handler(gpointer data, int server_socket, PurpleInputCondition condition)
{
	PurpleBuddy *pb = NULL;
	struct sockaddr_in their_addr; /* connector's address information */
	socklen_t sin_size = sizeof(struct sockaddr);
	int client_socket;
	BonjourBuddy *bb;
	char *address_text = NULL;

	/* Look for the buddy that has opened the conversation and fill information */
	address_text = inet_ntoa(their_addr.sin_addr);
	cbba = g_new0(struct _check_buddy_by_address_t, 1);
	cbba->address = address_text;
	cbba->pb = &pb;
	cbba->bj = data;
	g_hash_table_foreach(bl->buddies, _check_buddy_by_address, cbba);
	g_free(cbba);
	if (pb == NULL)
	{
		purple_debug_info("bonjour", "We don't like invisible buddies, this is not a superheros comic\n");
		close(client_socket);
		return;
	}
	bb = pb->proto_data;

	/* Check if the conversation has been previously started */
	if (bb->conversation == NULL)
	{
		bb->conversation = g_new(BonjourJabberConversation, 1);
		bb->conversation->socket = client_socket;
		bb->conversation->stream_started = FALSE;
		bb->conversation->buddy_name = g_strdup(pb->name);

		if (bb->conversation->stream_started == FALSE) {
			char *stream_start = g_strdup_printf(DOCTYPE, purple_account_get_username(pb->account),
							     purple_buddy_get_name(pb));
			/* Start the stream */
			send(bb->conversation->socket, stream_start, strlen(stream_start), 0);
			bb->conversation->stream_started = TRUE;
			g_free(stream_start);
		}

		/* Open a watcher for the client socket */
		bb->conversation->watcher_id = purple_input_add(client_socket, PURPLE_INPUT_READ,
								_client_socket_handler, pb);
	} else {
		close(client_socket);
	}
}

	xmlnode_free(message_node);

	/* Check if the stream for the conversation has been started */
	if (bb->conversation->stream_started == FALSE)
	{
		char *stream_start = g_strdup_printf(DOCTYPE, purple_account_get_username(pb->account),
						     purple_buddy_get_name(pb));
		/* Start the stream */
		if (send(bb->conversation->socket, stream_start, strlen(stream_start), 0) == -1)
		{
			PurpleConversation *conv;

			purple_debug_error("bonjour", "Unable to start a conversation\n");
			purple_debug_warning("bonjour", "send error: %s\n", strerror(errno));

			/* Free all the data related to the conversation */
			g_free(bb->conversation->buddy_name);
			g_free(bb->conversation);
			bb->conversation = NULL;
			g_free(message);
			g_free(stream_start);
			return 0;
		}

		g_free(stream_start);
		bb->conversation->stream_started = TRUE;
	}

	/* Send the message */
	ret = (_send_data(bb->conversation->socket, message) == -1);