comparison libgaim/protocols/oscar/flap_connection.c @ 15129:8138277e9369

[gaim-migrate @ 17915] * Add a little cushion to the rate average calculation to hopefully account for any inaccuracies due to network lag and stuff * If one of our connections is disconnected, close the socket and don't try to write to it again. This will hopefully fix a weird race condition that Kevin was running into? committer: Tailor Script <[e-mail]>

15128:1cf62d550a7a

		{
			guint32 new_current;

			new_current = rateclass_get_new_current(conn, rateclass, &now);

			if (new_current < rateclass->alert)
				/* Not ready to send this SNAC yet--keep waiting. */
				return TRUE;

			rateclass->current = new_current;
			rateclass->last.tv_sec = now.tv_sec;

		guint32 new_current;

		gettimeofday(&now, NULL);
		new_current = rateclass_get_new_current(conn, rateclass, &now);

		if (new_current < rateclass->alert)
		{
			enqueue = TRUE;
		}
		else
		{
			rateclass->current = new_current;

		if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
			/* No worries */
			return;

		/* Error! */
		flap_connection_schedule_destroy(conn,
				OSCAR_DISCONNECT_LOST_CONNECTION, strerror(errno));
		return;
	}

	/* Add everything to our outgoing buffer */
	gaim_circ_buffer_append(conn->buffer_outgoing, bs->data, count);

	/* If we haven't already started writing stuff, then start the cycle */
	if (conn->watcher_outgoing == 0)
	{
		conn->watcher_outgoing = gaim_input_add(conn->fd,
				GAIM_INPUT_WRITE, send_cb, conn);
		send_cb(conn, conn->fd, 0);
	}

15129:8138277e9369

		{
			guint32 new_current;

			new_current = rateclass_get_new_current(conn, rateclass, &now);

			if (new_current < rateclass->alert + 100)
				/* (Add 100ms padding to account for inaccuracies in the calculation) */
				/* Not ready to send this SNAC yet--keep waiting. */
				return TRUE;

			rateclass->current = new_current;
			rateclass->last.tv_sec = now.tv_sec;

		guint32 new_current;

		gettimeofday(&now, NULL);
		new_current = rateclass_get_new_current(conn, rateclass, &now);

		if (new_current < rateclass->alert + 100)
		{
			/* (Add 100ms padding to account for inaccuracies in the calculation) */
			enqueue = TRUE;
		}
		else
		{
			rateclass->current = new_current;

		if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
			/* No worries */
			return;

		/* Error! */
		gaim_input_remove(conn->watcher_outgoing);
		conn->watcher_outgoing = 0;
		close(conn->fd);
		conn->fd = -1;
		flap_connection_schedule_destroy(conn,
				OSCAR_DISCONNECT_LOST_CONNECTION, strerror(errno));
		return;
	}

	/* Add everything to our outgoing buffer */
	gaim_circ_buffer_append(conn->buffer_outgoing, bs->data, count);

	/* If we haven't already started writing stuff, then start the cycle */
	if ((conn->watcher_outgoing == 0) && (conn->fd != -1))
	{
		conn->watcher_outgoing = gaim_input_add(conn->fd,
				GAIM_INPUT_WRITE, send_cb, conn);
		send_cb(conn, conn->fd, 0);
	}