Changeset 24ccc01 for message.c

Timestamp:

Aug 26, 2009, 11:50:56 PM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

e2ebf39

Parents:

36486be

git-author:

Nelson Elhage <nelhage@mit.edu> (08/19/09 23:41:06)

git-committer:

Nelson Elhage <nelhage@mit.edu> (08/26/09 23:50:56)

Message:

Replace owl_message_create_from_zwriteline with owl_message_create_from_zwrite.

By passing in a zwrite structure instead of a line, we make it easier to
construct faked messages without having to go through generaring and
parsing a zwrite command line. We change owl_zephyr_handle_ack to fake a
zwrite structure, fixing the segfault on zephyring users with
quotes (fixes #94), as well as logging errors sending instanced personals
slightly better.

File:

• message.c (modified) (3 diffs)

message.c

@@ -898 +898 @@
 }
 
-void owl_message_create_from_zwriteline(owl_message *m, const char *line, const char *body, const char *zsig)
-{
-  owl_zwrite z;
+void owl_message_create_from_zwrite(owl_message *m, const owl_zwrite *z, const char *body)
+{
   int ret;
   char hostbuff[5000];
   
   owl_message_init(m);
-
-  /* create a zwrite for the purpose of filling in other message fields */
-  owl_zwrite_create_from_line(&z, line);
 
   /* set things */
@@ -913 +909 @@
   owl_message_set_type_zephyr(m);
   owl_message_set_sender(m, owl_zephyr_get_sender());
-  owl_message_set_class(m, owl_zwrite_get_class(&z));
-  owl_message_set_instance(m, owl_zwrite_get_instance(&z));
-  if (owl_zwrite_get_numrecips(&z)>0) {
-    char *longzuser = long_zuser(owl_zwrite_get_recip_n(&z, 0));
+  owl_message_set_class(m, owl_zwrite_get_class(z));
+  owl_message_set_instance(m, owl_zwrite_get_instance(z));
+  if (owl_zwrite_get_numrecips(z)>0) {
+    char *longzuser = long_zuser(owl_zwrite_get_recip_n(z, 0));
     owl_message_set_recipient(m,
                               longzuser); /* only gets the first user, must fix */
     owl_free(longzuser);
   }
-  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 */
-  owl_message_set_zwriteline(m, line);
+  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);
+  }
   owl_message_set_body(m, body);
-  owl_message_set_zsig(m, zsig);
+  owl_message_set_zsig(m, owl_zwrite_get_zsig(z));
   
   /* save the hostname */
@@ -937 +935 @@
 
   /* set the "isprivate" attribute if it's a private zephyr. */
-  if (owl_zwrite_is_personal(&z)) {
+  if (owl_zwrite_is_personal(z)) {
     owl_message_set_isprivate(m);
   }
-
-  owl_zwrite_free(&z);
 }