Changeset 0743696

Timestamp:

Sep 14, 2010, 2:11:44 AM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

ba042db

Parents:

f544216

git-author:

David Benjamin <davidben@mit.edu> (08/21/10 23:23:08)

git-committer:

David Benjamin <davidben@mit.edu> (09/14/10 02:11:44)

Message:

Don't ignore the error code when doing a zwrite

Display a com_err-supplied error message. It's about time we fix the
false "Waiting for ack..." messages. Also, on an error in a zephyr with
multiple recipients, abort instead of continuing to send, to match the
zwrite binary.

Files:

• functions.c (modified) (2 diffs)
• zwrite.c (modified) (3 diffs)

functions.c

@@ -345 +345 @@
 {
   owl_message *m;
+  int ret;
 
   if(strcmp(z->cmd, "zcrypt") == 0) {
@@ -356 +357 @@
     owl_zwrite_set_message(z, msg);
   }
-  owl_zwrite_send_message(z);
+  ret = owl_zwrite_send_message(z);
+  if (ret != 0) {
+    owl_function_makemsg("Error sending zephyr: %s", error_message(ret));
+    return;
+  }
   owl_function_makemsg("Waiting for ack...");
 

zwrite.c

@@ -254 +254 @@
 int owl_zwrite_send_message(const owl_zwrite *z)
 {
-  int i, j;
+  int i, j, ret = 0;
   char *to = NULL;
 
@@ -267 +267 @@
         to = owl_strdup( owl_list_get_element(&(z->recips), i));
       }
-      send_zephyr(z->opcode, z->zsig, z->class, z->inst, to, z->message);
+      ret = send_zephyr(z->opcode, z->zsig, z->class, z->inst, to, z->message);
+      /* Abort on the first error, to match the zwrite binary. */
+      if (ret != 0)
+        break;
       owl_free(to);
       to = NULL;
@@ -273 +276 @@
   } else {
     to = owl_sprintf( "@%s", z->realm);
-    send_zephyr(z->opcode, z->zsig, z->class, z->inst, to, z->message);
+    ret = send_zephyr(z->opcode, z->zsig, z->class, z->inst, to, z->message);
   }
   owl_free(to);
-  return(0);
+  return ret;
 }