pidgin3: comparison libgaim/protocols/oscar/flap

-:1cc75906700c
+:df290cda81a3
 			flap_connection_send_close(od, conn);
 		close(conn->fd);
 		conn->fd = -1;
 	}
+	if (conn->watcher_incoming != 0)
+	{
+		gaim_input_remove(conn->watcher_incoming);
+		conn->watcher_incoming = 0;
+	}
+	if (conn->watcher_outgoing != 0)
+	{
+		gaim_input_remove(conn->watcher_outgoing);
+		conn->watcher_outgoing = 0;
+	}
+	g_free(conn->buffer_incoming.data.data);
+	conn->buffer_incoming.data.data = NULL;
+	gaim_circ_buffer_destroy(conn->buffer_outgoing);
+	conn->buffer_outgoing = NULL;
 }
 static void
 flap_connection_destroy_rates(struct rateclass *head)
 {
 	OscarData *od;
 	GaimAccount *account;
 	conn = data;
 	od = conn->od;
+	account = gaim_connection_get_account(od->gc);
 	gaim_debug_info("oscar", "Destroying oscar connection of "
 			"type 0x%04hx\n", conn->type);
-	flap_connection_close(od, conn);
-	g_free(conn->cookie);
-	if (conn->watcher_incoming != 0)
-		gaim_input_remove(conn->watcher_incoming);
-	if (conn->watcher_outgoing != 0)
-		gaim_input_remove(conn->watcher_outgoing);
-	g_free(conn->buffer_incoming.data.data);
-	gaim_circ_buffer_destroy(conn->buffer_outgoing);
-	/*
-	 * Free conn->internal, if necessary
-	 */
-	if (conn->type == SNAC_FAMILY_CHAT)
-		flap_connection_destroy_chat(od, conn);
-	g_slist_free(conn->groups);
-	flap_connection_destroy_rates(conn->rates);
 	od->oscar_connections = g_slist_remove(od->oscar_connections, conn);
-	account = gaim_connection_get_account(od->gc);
 	/*
 	 * TODO: If we don't have a SNAC_FAMILY_LOCATE connection then
 	 * we should try to request one instead of disconnecting.
 	 */
 	if (!account->disconnecting && ((od->oscar_connections == NULL)
 			|| (!flap_connection_getbytype(od, SNAC_FAMILY_LOCATE))))
 	{
 		/* No more FLAP connections!  Sign off this GaimConnection! */
-		const gchar *tmp;
+		gchar *tmp;
 		if (conn->disconnect_reason == OSCAR_DISCONNECT_REMOTE_CLOSED)
-			tmp = _("Server closed the connection.");
+			tmp = g_strdup(_("Server closed the connection."));
 		else if (conn->disconnect_reason == OSCAR_DISCONNECT_LOST_CONNECTION)
-			tmp = _("Lost connection with server for an unknown reason.");
+			tmp = g_strdup_printf(_("Lost connection with server:\n%s"),
+					conn->error_message);
 		else if (conn->disconnect_reason == OSCAR_DISCONNECT_INVALID_DATA)
-			tmp = _("Received invalid data on connection with server.");
+			tmp = g_strdup(_("Received invalid data on connection with server."));
 		else if (conn->disconnect_reason == OSCAR_DISCONNECT_COULD_NOT_CONNECT)
-			tmp = _("Could not establish a connection with the server.");
+			tmp = g_strdup_printf(_("Could not establish a connection with the server:\n%s"),
+					conn->error_message);
 		else
 			/*
 			 * We shouldn't print a message for some disconnect_reasons.
 			 * Like OSCAR_DISCONNECT_LOCAL_CLOSED.
 			 */
 			tmp = NULL;
 		if (tmp != NULL)
+		{
 			gaim_connection_error(od->gc, tmp);
-	}
+			g_free(tmp);
+		}
+	}
+	flap_connection_close(od, conn);
+	g_free(conn->error_message);
+	g_free(conn->cookie);
+	/*
+	 * Free conn->internal, if necessary
+	 */
+	if (conn->type == SNAC_FAMILY_CHAT)
+		flap_connection_destroy_chat(od, conn);
+	g_slist_free(conn->groups);
+	flap_connection_destroy_rates(conn->rates);
 	g_free(conn);
 	return FALSE;
 }
+/**
+* See the comments for the parameters of
+* flap_connection_schedule_destroy().
+*/
 void
-flap_connection_destroy(FlapConnection *conn, OscarDisconnectReason reason)
+flap_connection_destroy(FlapConnection *conn, OscarDisconnectReason reason, const gchar *error_message)
 {
 	if (conn->destroy_timeout != 0)
 		gaim_timeout_remove(conn->destroy_timeout);
 	conn->disconnect_reason = reason;
+	g_free(conn->error_message);
+	conn->error_message = g_strdup(error_message);
 	flap_connection_destroy_cb(conn);
 }
 /**
 * Schedule Gaim to destroy the given FlapConnection as soon as we
 * return control back to the program's main loop.  We must do this
 * if we want to destroy the connection but we are still using it
 * for some reason.
+*
+* @param reason The reason for the disconnection.
+* @param error_message A brief error message that gives more detail
+*        regarding the reason for the disconnecting.  This should
+*        be NULL for everything except OSCAR_DISCONNECT_LOST_CONNECTION,
+*        in which case it should contain the value of strerror(errno),
+*        and OSCAR_DISCONNECT_COULD_NOT_CONNECT, in which case it
+*        should contain the error_message passed back from the call
+*        to gaim_proxy_connect().
 */
 void
-flap_connection_schedule_destroy(FlapConnection *conn, OscarDisconnectReason reason)
+flap_connection_schedule_destroy(FlapConnection *conn, OscarDisconnectReason reason, const gchar *error_message)
 {
 	if (conn->destroy_timeout != 0)
 		/* Already taken care of */
 		return;
 	gaim_debug_info("oscar", "Scheduling destruction of FLAP "
 			"connection of type 0x%04hx\n", conn->type);
 	conn->disconnect_reason = reason;
+	conn->error_message = g_strdup(error_message);
 	conn->destroy_timeout = gaim_timeout_add(0, flap_connection_destroy_cb, conn);
 }
 /**
 * In OSCAR, every connection has a set of SNAC groups associated
 				/* Error! */
 				gaim_debug_warning("oscar", "Expecting FLAP version "
 					"0x00000001 but received FLAP version %08lx.  Closing connection.\n",
 					flap_version);
 				flap_connection_schedule_destroy(conn,
-						OSCAR_DISCONNECT_INVALID_DATA);
+						OSCAR_DISCONNECT_INVALID_DATA, NULL);
 		}
 		else
 			conn->connected = TRUE;
 	} else if (frame->channel == 0x02) {
 			/* Check if the FLAP server closed the connection */
 			if (read == 0)
 			{
 				flap_connection_schedule_destroy(conn,
-						OSCAR_DISCONNECT_REMOTE_CLOSED);
+						OSCAR_DISCONNECT_REMOTE_CLOSED, NULL);
 				break;
 			}
 			/* If there was an error then close the connection */
 			if (read == -1)
 					/* No worries */
 					break;
 				/* Error! */
 				flap_connection_schedule_destroy(conn,
-						OSCAR_DISCONNECT_LOST_CONNECTION);
+						OSCAR_DISCONNECT_LOST_CONNECTION, strerror(errno));
 				break;
 			}
 			/* If we don't even have a complete FLAP header then do nothing */
 			if (read < 6)
 			/* All FLAP frames must start with the byte 0x2a */
 			if (aimutil_get8(&header[0]) != 0x2a)
 			{
 				flap_connection_schedule_destroy(conn,
-						OSCAR_DISCONNECT_INVALID_DATA);
+						OSCAR_DISCONNECT_INVALID_DATA, NULL);
 				break;
 			}
 			/* Initialize a new temporary FlapFrame for incoming data */
 			conn->buffer_incoming.channel = aimutil_get8(&header[1]);
 			/* Check if the FLAP server closed the connection */
 			if (read == 0)
 			{
 				flap_connection_schedule_destroy(conn,
-						OSCAR_DISCONNECT_REMOTE_CLOSED);
+						OSCAR_DISCONNECT_REMOTE_CLOSED, NULL);
 				break;
 			}
 			if (read == -1)
 			{
 					/* No worries */
 					break;
 				/* Error! */
 				flap_connection_schedule_destroy(conn,
-						OSCAR_DISCONNECT_LOST_CONNECTION);
+						OSCAR_DISCONNECT_LOST_CONNECTION, strerror(errno));
 				break;
 			}
 			conn->buffer_incoming.data.offset += read;
 			if (conn->buffer_incoming.data.offset < conn->buffer_incoming.data.len)
 		if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
 			/* No worries */
 			return;
 		/* Error! */
-		flap_connection_schedule_destroy(conn, OSCAR_DISCONNECT_LOST_CONNECTION);
+		flap_connection_schedule_destroy(conn,
+				OSCAR_DISCONNECT_LOST_CONNECTION, strerror(errno));
 		return;
 	}
 	gaim_circ_buffer_mark_read(conn->buffer_outgoing, ret);
 }

comparison: libgaim/protocols/oscar/flap_connection.c

libgaim/protocols/oscar/flap_connection.c

Mercurial > pidgin3 / file comparison

comparison: libgaim/protocols/oscar/flap_connection.c

libgaim/protocols/oscar/flap_connection.c