Changeset 1e34e40

Timestamp:

Nov 23, 2003, 6:34:09 PM (22 years ago)

Author:

Erik Nygren <nygren@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:

c1be0c6

Parents:

c9e72d1

Message:

	Handle the case in aim_bstream_send where aim_send returns -1,
	        although there is likely an underlying problem here
		that would lead to this case.

Files:

• ChangeLog (modified) (1 diff)
• libfaim/txqueue.c (modified) (3 diffs)

ChangeLog

@@ -8 +8 @@
                 issues under Solaris and we may need to add some 
                 configure stuff around SA_SIGINFO...]
+        Handle the case in aim_bstream_send where aim_send returns -1,
+                although there is likely an underlying problem here
+                that would lead to this case.
         
 2.0.12

libfaim/txqueue.c

@@ -217 +217 @@
 {
   int wrote = 0;
+  int rv = 0;
   if (!bs || !conn || (count < 0))
     return -EINVAL;
@@ -231 +232 @@
       aim_rxcallback_t userfunc;
       while (count - wrote > 1024) {
-        wrote = wrote + aim_send(conn->fd, bs->data + bs->offset + wrote, 1024);
+        rv = aim_send(conn->fd, bs->data + bs->offset + wrote, 1024);
+        if (rv < 0) {
+          fprintf(stderr, "aim_bstream_send: aim_send failed...\n");
+          return -EINVAL;
+        }
+        wrote = wrote + rv;
+          
         if ((userfunc=aim_callhandler(conn->sessv, conn, 
                                       AIM_CB_FAM_SPECIAL, 
@@ -240 +247 @@
     }
     if (count - wrote) {
-      wrote = wrote + aim_send(conn->fd, bs->data + bs->offset + wrote, count - wrote);
+      rv = aim_send(conn->fd, bs->data + bs->offset + wrote, count - wrote);
+      if (rv < 0) {
+        fprintf(stderr, "aim_bstream_send: aim_send failed...\n");
+        return -EINVAL;
+      }
+      wrote = wrote + rv;
     }