Changeset 176c22b for perlconfig.c

Timestamp:

Nov 14, 2012, 3:45:50 PM (12 years ago)

Author:

David Benjamin <davidben@mit.edu>

Children:

472dcbe

Parents:

c42a8d1

git-author:

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

git-committer:

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

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>

File:

• perlconfig.c (modified) (1 diff)

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);
   }