Changeset 1e2fab5

Timestamp:

May 25, 2013, 3:46:12 PM (11 years ago)

Author:

Geoffrey Thomas <geofft@ldpreload.com>

Branches:

release-1.9

Children:

7558e19

Parents:

fc2b7ae

git-author:

David Benjamin <davidben@mit.edu> (11/14/12 15:22:41)

git-committer:

Geoffrey Thomas <geofft@ldpreload.com> (05/25/13 15:46:12)

Message:

Fix display of pseudologins

After b9517cf7ce2959a6e86a52d25a98b1d03df56d58, they lost fields and
auth keys. They're faked, so they don't really have fields or auth, but
put them in anyway to appease existing styles.

Reported-By: Kevin Chen <kchen@mit.edu>
(cherry picked from commit 6401db33a7a1c3156833113bbe6e9eec7a571406)

Files:

• perl/lib/BarnOwl/Message/Zephyr.pm (modified) (2 diffs)
• perlconfig.c (modified) (1 diff)

perl/lib/BarnOwl/Message/Zephyr.pm

@@ -51 +51 @@
     my ($m) = @_;
     return undef if (!$m->is_loginout);
+    return undef if (!defined($m->fields));
     return $m->fields->[2];
 }
@@ -57 +58 @@
     my ($m) = @_;
     return undef if (!$m->is_loginout);
+    return undef if (!defined($m->fields));
     return $m->fields->[0];
 }

perlconfig.c

@@ -92 +92 @@
                                       owl_new_sv(owl_message_get_##field(m)), 0)
 
-  if (owl_message_get_notice(m)) {
+  if (owl_message_is_type_zephyr(m) && owl_message_is_direction_in(m)) {
     /* Handle zephyr-specific fields... */
-    AV *av_zfields;
-
-    av_zfields = newAV();
-    for (f = owl_zephyr_first_raw_field(owl_message_get_notice(m)); f != NULL;
-         f = owl_zephyr_next_raw_field(owl_message_get_notice(m), f)) {
-      ptr=owl_zephyr_field_as_utf8(owl_message_get_notice(m), f);
-      av_push(av_zfields, owl_new_sv(ptr));
-      g_free(ptr);
+    AV *av_zfields = newAV();
+    if (owl_message_get_notice(m)) {
+      for (f = owl_zephyr_first_raw_field(owl_message_get_notice(m)); f != NULL;
+           f = owl_zephyr_next_raw_field(owl_message_get_notice(m), f)) {
+        ptr = owl_zephyr_field_as_utf8(owl_message_get_notice(m), f);
+        av_push(av_zfields, owl_new_sv(ptr));
+        g_free(ptr);
+      }
+      (void)hv_store(h, "auth", strlen("auth"),
+                     owl_new_sv(owl_zephyr_get_authstr(owl_message_get_notice(m))), 0);
+    } else {
+      /* Incoming zephyrs without a ZNotice_t are pseudo-logins. To appease
+       * existing styles, put in bogus 'auth' and 'fields' keys. */
+      (void)hv_store(h, "auth", strlen("auth"), owl_new_sv("NO"), 0);
     }
     (void)hv_store(h, "fields", strlen("fields"), newRV_noinc((SV*)av_zfields), 0);
-
-    (void)hv_store(h, "auth", strlen("auth"), 
-                   owl_new_sv(owl_zephyr_get_authstr(owl_message_get_notice(m))),0);
   }