Changeset b9517cf

Timestamp:

Jul 25, 2011, 1:35:30 AM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.9

Children:

a74a044

Parents:

f271129

git-author:

David Benjamin <davidben@mit.edu> (07/25/11 01:24:06)

git-committer:

David Benjamin <davidben@mit.edu> (07/25/11 01:35:30)

Message:

Explicitly store whether an owl_message has a ZNotice_t

We should remove it altogether in perlmessages, but in the meantime, we
shouldn't be crashing on faked incoming zephyr messages. Also drop the
attempted fake ZNotice_t in owl_perlconfig_hashref2message. No one could
have relied on it safely today because any such message would crash on
delete.

Files:

• functions.c (modified) (1 diff)
• message.c (modified) (4 diffs)
• owl.h (modified) (1 diff)
• perlconfig.c (modified) (3 diffs)

functions.c

@@ -1423 +1423 @@
     owl_fmtext_appendf_normal(&fm, "  Opcode    : %s\n", owl_message_get_opcode(m));
 #ifdef HAVE_LIBZEPHYR
-    if (owl_message_is_direction_in(m)) {
+    n = owl_message_get_notice(m);
+    if (n != NULL) {
       char *tmpbuff, *tmpbuff2;
       int i, fields;
-
-      n=owl_message_get_notice(m);
 
       if (!owl_message_is_pseudo(m)) {

message.c

@@ -33 +33 @@
   owl_message_set_direction_none(m);
   m->delete=0;
+
+#ifdef HAVE_LIBZEPHYR
+  m->has_notice = false;
+#endif
 
   owl_message_set_hostname(m, "");
@@ -490 +494 @@
 const ZNotice_t *owl_message_get_notice(const owl_message *m)
 {
-  return(&(m->notice));
+  return m->has_notice ? &m->notice : NULL;
 }
 #else
@@ -781 +785 @@
   /* first save the full notice */
   m->notice = *n;
+  m->has_notice = true;
 
   /* a little gross, we'll replace \r's with ' ' for now */
@@ -996 +1001 @@
   owl_pair *p;
 #ifdef HAVE_LIBZEPHYR    
-  if (owl_message_is_type_zephyr(m) && owl_message_is_direction_in(m)) {
+  if (m->has_notice) {
     ZFreeNotice(&(m->notice));
   }

owl.h

@@ -356 +356 @@
   int direction;
 #ifdef HAVE_LIBZEPHYR
+  bool has_notice;
   ZNotice_t notice;
 #endif

perlconfig.c

@@ -91 +91 @@
                                       owl_new_sv(owl_message_get_##field(m)), 0)
 
-  if (owl_message_is_type_zephyr(m)
-      && owl_message_is_direction_in(m)) {
+  if (owl_message_get_notice(m)) {
     /* Handle zephyr-specific fields... */
     AV *av_zfields;
@@ -173 +172 @@
    message2hashref and hashref2message. Currently we lose
    zephyr-specific properties stored in the ZNotice_t
-
-   This has been somewhat addressed, but is still not lossless.
  */
 CALLER_OWN owl_message *owl_perlconfig_hashref2message(SV *msg)
@@ -220 +217 @@
       owl_message_set_attribute(m, "adminheader", "");
   }
-#ifdef HAVE_LIBZEPHYR
-  if (owl_message_is_type_zephyr(m)) {
-    ZNotice_t *n = &(m->notice);
-    n->z_kind = ACKED;
-    n->z_port = 0;
-    n->z_auth = ZAUTH_NO;
-    n->z_checked_auth = 0;
-    n->z_class = zstr(owl_message_get_class(m));
-    n->z_class_inst = zstr(owl_message_get_instance(m));
-    n->z_opcode = zstr(owl_message_get_opcode(m));
-    n->z_sender = zstr(owl_message_get_sender(m));
-    n->z_recipient = zstr(owl_message_get_recipient(m));
-    n->z_default_format = zstr("[zephyr created from perl]");
-    n->z_multinotice = zstr("[zephyr created from perl]");
-    n->z_num_other_fields = 0;
-    n->z_message = g_strdup_printf("%s%c%s", owl_message_get_zsig(m), '\0', owl_message_get_body(m));
-    n->z_message_len = strlen(owl_message_get_zsig(m)) + strlen(owl_message_get_body(m)) + 1;
-  }
-#endif
   return m;
 }