* aim_rxhandlers.c.
*/
+#define FAIM_INTERNAL
#include <faim/aim.h>
+
+#ifndef _WIN32
#include <sys/socket.h>
+#endif
/*
* Since not all implementations support MSG_WAITALL, define
* take more for a badly fragmented packet.
*
*/
-static int aim_recv(int fd, void *buf, size_t count)
+faim_internal int aim_recv(int fd, void *buf, size_t count)
{
#ifdef MSG_WAITALL
return recv(fd, buf, count, MSG_WAITALL);
left = count;
while (left) {
- ret = read(fd, ((unsigned char *)buf)+cur, left);
+ ret = recv(fd, ((unsigned char *)buf)+cur, left, 0);
if (ret == -1)
return -1;
if (ret == 0)
if (!sess || !conn)
return 0;
+ if (conn->fd == -1)
+ return -1; /* its a aim_conn_close()'d connection */
+
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.
*/
if (conn->type == AIM_CONN_TYPE_RENDEZVOUS)
return aim_get_command_rendezvous(sess, conn);
- if (conn->type == AIM_CONN_TYPE_RENDEZVOUS_OUT)
+ if (conn->type == AIM_CONN_TYPE_RENDEZVOUS_OUT) {
+ printf("out on fd %d\n", conn->fd);
return 0;
+ }
/*
* Read FLAP header. Six bytes: