#include <faim/aim.h>
+#ifndef _WIN32
+#include <sys/socket.h>
+#endif
+
+/*
+ * Since not all implementations support MSG_WAITALL, define
+ * an alternate guarenteed read function...
+ *
+ * We keep recv() for systems that can do it because it means
+ * a single system call for the entire packet, where read may
+ * take more for a badly fragmented packet.
+ *
+ */
+faim_internal int aim_recv(int fd, void *buf, size_t count)
+{
+#ifdef MSG_WAITALL
+ return recv(fd, buf, count, MSG_WAITALL);
+#else
+ int left, ret, cur = 0;
+
+ left = count;
+
+ while (left) {
+ ret = recv(fd, ((unsigned char *)buf)+cur, left, 0);
+ if (ret == -1)
+ return -1;
+ if (ret == 0)
+ return cur;
+
+ cur += ret;
+ left -= ret;
+ }
+
+ return cur;
+#endif
+}
+
/*
* Grab a single command sequence off the socket, and enqueue
* it in the incoming event queue in a seperate struct.
*/
-int aim_get_command(struct aim_session_t *sess, struct aim_conn_t *conn)
+faim_export int aim_get_command(struct aim_session_t *sess, struct aim_conn_t *conn)
{
unsigned char generic[6];
struct command_rx_struct *newrx = NULL;
if (conn->fd < 3) /* can happen when people abuse the interface */
return 0;
+ if (conn->status & AIM_CONN_STATUS_INPROGRESS)
+ return aim_conn_completeconnect(sess, conn);
+
/*
* Rendezvous (client-client) connections do not speak
* FLAP, so this function will break on them.
* 4 short -- Number of data bytes that follow.
*/
faim_mutex_lock(&conn->active);
- if (read(conn->fd, generic, 6) < 6){
+ if (aim_recv(conn->fd, generic, 6) < 6){
aim_conn_close(conn);
faim_mutex_unlock(&conn->active);
return -1;
}
/* read the data portion of the packet */
- if (read(conn->fd, newrx->data, newrx->commandlen) < newrx->commandlen){
+ if (aim_recv(conn->fd, newrx->data, newrx->commandlen) < newrx->commandlen){
free(newrx->data);
free(newrx);
aim_conn_close(conn);
* does not keep a pointer, it's lost forever.
*
*/
-void aim_purge_rxqueue(struct aim_session_t *sess)
+faim_export void aim_purge_rxqueue(struct aim_session_t *sess)
{
struct command_rx_struct *cur = NULL;
struct command_rx_struct *tmp;
* XXX: this is something that was handled better in the old connection
* handling method, but eh.
*/
-void aim_rxqueue_cleanbyconn(struct aim_session_t *sess, struct aim_conn_t *conn)
+faim_internal void aim_rxqueue_cleanbyconn(struct aim_session_t *sess, struct aim_conn_t *conn)
{
struct command_rx_struct *currx;