comparison libpurple/protocols/bonjour/jabber.c @ 17500:bca2780f7669

Improve error handling while connecting to a bonjour buddy.

17499:85440932397b

static gint
_connect_to_buddy(PurpleBuddy *gb)
{
	gint socket_fd;
	gint retorno = 0;
	struct sockaddr_in buddy_address;
	BonjourBuddy *bb = gb->proto_data;

	/* Create a socket and make it non-blocking */
	socket_fd = socket(PF_INET, SOCK_STREAM, 0);

	buddy_address.sin_family = PF_INET;
	buddy_address.sin_port = htons(bb->port_p2pj);
	inet_aton(bb->ip, &(buddy_address.sin_addr));
	memset(&(buddy_address.sin_zero), '\0', 8);

	retorno = connect(socket_fd, (struct sockaddr*)&buddy_address, sizeof(struct sockaddr));
	if (retorno == -1) {
		purple_debug_warning("bonjour", "Error connecting to buddy %s at %s:%d error: %s\n", purple_buddy_get_name(gb), bb->ip ? bb->ip : "(null)", buddy_address.sin_port, strerror(errno));
	}
	fcntl(socket_fd, F_SETFL, O_NONBLOCK);

	return socket_fd;
}

#if 0 /* this isn't used anywhere... */

	gint partial_message_length = 0;

	/* Read chunks of 512 bytes till the end of the data */
	while ((partial_message_length = recv(socket, partial_data, 512, 0)) > 0)
	{
			g_string_append_len(data, partial_data, partial_message_length);
			total_message_length += partial_message_length;
	}

	if (partial_message_length == -1)
	{
		purple_debug_warning("bonjour", "receive error: %s\n", strerror(errno));

			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);
	}
}

	char *message_from_ui = NULL;
	char *stripped_message = NULL;
	gint ret;

	gb = purple_find_buddy(data->account, to);
	if (gb == NULL)
		/* You can not send a message to an offline buddy */
		return -10000;

	bb = (BonjourBuddy *)gb->proto_data;

	/* Enclose the message from the UI within a "font" node */
	message_body_node = xmlnode_new("body");
	stripped_message = purple_markup_strip_html(body);
	xmlnode_insert_data(message_body_node, stripped_message, strlen(stripped_message));

	xmlnode_insert_child(message_node, message_html_node);
	xmlnode_insert_child(message_node, message_x_node);

	message = xmlnode_to_str(message_node, &message_length);
	xmlnode_free(message_node);

	/* Check if there is a previously open conversation */
	if (bb->conversation == NULL)
	{
		bb->conversation = g_new(BonjourJabberConversation, 1);
		bb->conversation->socket = _connect_to_buddy(gb);
		bb->conversation->stream_started = FALSE;
		bb->conversation->buddy_name = g_strdup(gb->name);
		bb->conversation->watcher_id = purple_input_add(bb->conversation->socket,
				PURPLE_INPUT_READ, _client_socket_handler, gb);
	}

	/* Check if the stream for the conversation has been started */
	if (bb->conversation->stream_started == FALSE)
	{
		/* Start the stream */

17500:bca2780f7669

static gint
_connect_to_buddy(PurpleBuddy *gb)
{
	gint socket_fd;
	struct sockaddr_in buddy_address;
	BonjourBuddy *bb = gb->proto_data;

	purple_debug_info("bonjour", "Connecting to buddy %s at %s:%d.\n",
		purple_buddy_get_name(gb), bb->ip ? bb->ip : "(null)", bb->port_p2pj);

	/* Create a socket and make it non-blocking */
	socket_fd = socket(PF_INET, SOCK_STREAM, 0);
	if (socket_fd < 0) {
		purple_debug_warning("bonjour", "Error opening socket: %s\n", strerror(errno));
		return -1;
	}

	buddy_address.sin_family = PF_INET;
	buddy_address.sin_port = htons(bb->port_p2pj);
	inet_aton(bb->ip, &(buddy_address.sin_addr));
	memset(&(buddy_address.sin_zero), '\0', 8);

	/* TODO: make this nonblocking before connecting */
	if (connect(socket_fd, (struct sockaddr*)&buddy_address, sizeof(struct sockaddr)) == 0)
		fcntl(socket_fd, F_SETFL, O_NONBLOCK);
	else {
		purple_debug_warning("bonjour", "Error connecting to buddy %s at %s:%d error: %s\n", purple_buddy_get_name(gb), bb->ip ? bb->ip : "(null)", bb->port_p2pj, strerror(errno));
		close(socket_fd);
		socket_fd = -1;
	}

	return socket_fd;
}

#if 0 /* this isn't used anywhere... */

	gint partial_message_length = 0;

	/* Read chunks of 512 bytes till the end of the data */
	while ((partial_message_length = recv(socket, partial_data, 512, 0)) > 0)
	{
		g_string_append_len(data, partial_data, partial_message_length);
		total_message_length += partial_message_length;
	}

	if (partial_message_length == -1)
	{
		purple_debug_warning("bonjour", "receive error: %s\n", strerror(errno));

			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);
	}
}

	char *message_from_ui = NULL;
	char *stripped_message = NULL;
	gint ret;

	gb = purple_find_buddy(data->account, to);
	if (gb == NULL) {
		purple_debug_info("bonjour", "Can't send a message to an offline buddy (%s).\n", to);
		/* You can not send a message to an offline buddy */
		return -10000;
	}

	bb = (BonjourBuddy *)gb->proto_data;

	/* Check if there is a previously open conversation */
	if (bb->conversation == NULL)
	{
		int socket = _connect_to_buddy(gb);
		if (socket < 0)
			return -10001;

		bb->conversation = g_new(BonjourJabberConversation, 1);
		bb->conversation->socket = socket;
		bb->conversation->stream_started = FALSE;
		bb->conversation->buddy_name = g_strdup(gb->name);
		bb->conversation->watcher_id = purple_input_add(bb->conversation->socket,
				PURPLE_INPUT_READ, _client_socket_handler, gb);
	}

	/* Enclose the message from the UI within a "font" node */
	message_body_node = xmlnode_new("body");
	stripped_message = purple_markup_strip_html(body);
	xmlnode_insert_data(message_body_node, stripped_message, strlen(stripped_message));

	xmlnode_insert_child(message_node, message_html_node);
	xmlnode_insert_child(message_node, message_x_node);

	message = xmlnode_to_str(message_node, &message_length);
	xmlnode_free(message_node);

	/* Check if the stream for the conversation has been started */
	if (bb->conversation->stream_started == FALSE)
	{
		/* Start the stream */