Changeset 719119de for message.c

Timestamp:

Jan 3, 2011, 8:20:52 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

c23f678

Parents:

d222c44

git-author:

David Benjamin <davidben@mit.edu> (12/15/10 00:46:46)

git-committer:

David Benjamin <davidben@mit.edu> (01/03/11 20:20:52)

Message:

Build reply commands from scratch on outgoing zwrites

We currently reuse the original zwrite line which is problematic when
the user passed -m. Instead regenerates the zwrite line from the
parsed owl_zwrite.

Repurpose the zwriteline attribute because anyone using the old
attribute probably has the same bug.

File:

• message.c (modified) (2 diffs)

message.c

@@ -964 +964 @@
   int ret;
   char hostbuff[5000];
+  char *replyline;
   
   owl_message_init(m);
@@ -981 +982 @@
   owl_message_set_opcode(m, owl_zwrite_get_opcode(z));
   owl_message_set_realm(m, owl_zwrite_get_realm(z)); /* also a hack, but not here */
-  if(z->zwriteline) {
-    owl_message_set_zwriteline(m, z->zwriteline);
-  }
+
+  /* Although not strictly the zwriteline, anyone using the unsantized version
+   * of it probably has a bug. */
+  replyline = owl_zwrite_get_replyline(z);
+  owl_message_set_zwriteline(m, replyline);
+  owl_free(replyline);
+
   owl_message_set_body(m, body);
   owl_message_set_zsig(m, owl_zwrite_get_zsig(z));