Changeset e374dee for libfaim/rxqueue.c

Timestamp:

Oct 10, 2003, 5:12:30 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

fe6f1d3

Parents:

f4d0975

Message:

*** empty log message ***

File:

• libfaim/rxqueue.c (modified) (4 diffs)

libfaim/rxqueue.c

@@ -83 +83 @@
  * Read a FLAP header from conn into fr, and return the number of bytes in the payload.
  */
-static faim_shortfunc int aim_get_command_flap(aim_session_t *sess, aim_conn_t *conn, aim_frame_t *fr)
+static int aim_get_command_flap(aim_session_t *sess, aim_conn_t *conn, aim_frame_t *fr)
 {
         fu8_t flaphdr_raw[6];
@@ -165 +165 @@
 
         if (!sess || !conn)
-                return -1;
+                return -EINVAL;
 
         if (conn->fd == -1)
@@ -177 +177 @@
 
         if (!(newrx = (aim_frame_t *)calloc(sizeof(aim_frame_t), 1)))
-                return -1;
+                return -ENOMEM;
 
         /*
@@ -183 +183 @@
          * function will break on them.
          */
-        if (conn->type == AIM_CONN_TYPE_RENDEZVOUS)
-                payloadlen = aim_get_command_rendezvous(sess, conn, newrx);
-        else if (conn->type == AIM_CONN_TYPE_RENDEZVOUS_OUT) {
-                faimdprintf(sess, 0, "AIM_CONN_TYPE_RENDEZVOUS_OUT on fd %d\n", conn->fd);
+        if (conn->type == AIM_CONN_TYPE_RENDEZVOUS) {
+                int ret = aim_get_command_rendezvous(sess, conn, newrx);
+
+                if (ret < 0) {
+                        free(newrx);
+                        return -1;
+                }
+
+                payloadlen = ret;
+        } else if (conn->type == AIM_CONN_TYPE_LISTENER) {
+                faimdprintf(sess, 0, "AIM_CONN_TYPE_LISTENER on fd %d\n", conn->fd);
                 free(newrx);
                 return -1;