comparison src/protocols/oscar/peer.c @ 14089:10e8eb6a4910

[gaim-migrate @ 16712] Pretty large commit here. Basically I got sick of having to verify that gc is still valid on all the callback functions for gaim_proxy_connect(). The fix for this for gaim_proxy_connect() to return something that allows the connection attempt to be canceled. It's not quite there yet, but this is a good first step. I changed gaim_proxy_connect() to return a reference to a new GaimProxyConnectInfo (this used to be called PHB). Eventually this can be passed to a function that'll cancel the connection attempt. I also decided to add an error_cb instead of using connect_cb and passing a file descriptor of -1. And proxy.c will also pass an error message to callers which should explain the reason that the connection attempt failed. Oh, and proxy.c now never calls gaim_connection_error() committer: Tailor Script <[e-mail]>

14088:223570831b0b

/**
 * We tried to make an outgoing connection to a remote user.  It
 * either connected or failed to connect.
 */
static void
peer_connection_established_cb(gpointer data, gint source, GaimInputCondition cond)
{
	NewPeerConnectionData *new_conn_data;
	GaimConnection *gc;
	PeerConnection *conn;

					GAIM_MESSAGE_SYSTEM, time(NULL));
			g_free(tmp);
		}

		if (gaim_proxy_connect(account, conn->verifiedip, conn->port,
				peer_connection_established_cb, new_conn_data) == 0)
		{
			/* Connecting... */
			return;
		}
	}

						GAIM_MESSAGE_SYSTEM, time(NULL));
				g_free(tmp);
			}

			if (gaim_proxy_connect(account, conn->clientip, conn->port,
					peer_connection_established_cb, new_conn_data) == 0)
			{
				/* Connecting... */
				return;
			}
		}

		}

		if (gaim_proxy_connect(account,
				(conn->proxyip != NULL) ? conn->proxyip : PEER_PROXY_SERVER,
				PEER_PROXY_PORT,
				peer_proxy_connection_established_cb, new_conn_data) == 0)
		{
			/* Connecting... */
			return;
		}
	}

14089:10e8eb6a4910

/**
 * We tried to make an outgoing connection to a remote user.  It
 * either connected or failed to connect.
 */
static void
peer_connection_established_cb(gpointer data, gint source)
{
	NewPeerConnectionData *new_conn_data;
	GaimConnection *gc;
	PeerConnection *conn;

					GAIM_MESSAGE_SYSTEM, time(NULL));
			g_free(tmp);
		}

		if (gaim_proxy_connect(account, conn->verifiedip, conn->port,
				peer_connection_established_cb, NULL, new_conn_data) != NULL)
		{
			/* Connecting... */
			return;
		}
	}

						GAIM_MESSAGE_SYSTEM, time(NULL));
				g_free(tmp);
			}

			if (gaim_proxy_connect(account, conn->clientip, conn->port,
					peer_connection_established_cb, NULL, new_conn_data) != NULL)
			{
				/* Connecting... */
				return;
			}
		}

		}

		if (gaim_proxy_connect(account,
				(conn->proxyip != NULL) ? conn->proxyip : PEER_PROXY_SERVER,
				PEER_PROXY_PORT,
				peer_proxy_connection_established_cb, NULL, new_conn_data) != NULL)
		{
			/* Connecting... */
			return;
		}
	}