Changeset 13a3c1db for zephyr.c

Timestamp:

May 30, 2007, 12:05:27 AM (17 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

4508e21

Parents:

1fd5e4c1

git-author:

Nelson Elhage <nelhage@mit.edu> (05/30/07 00:05:16)

git-committer:

Nelson Elhage <nelhage@mit.edu> (05/30/07 00:05:27)

Message:

Refactoring message processing: All new messages, incoming or
outgoing, get added to the owl_global_messagequeue by protocol code,
and then passed to owl_proces_message, which serves as a single
central code path for adding messages to the message list.

File:

• zephyr.c (modified) (2 diffs)

zephyr.c

@@ -638 +638 @@
   /* display the message as an admin message in the receive window */
   mout=owl_function_make_outgoing_zephyr(owl_global_get_zaway_msg(&g), tmpbuff, "Automated reply:");
-  owl_function_add_message(mout);
+  owl_global_messagequeue_addmsg(&g, mout);
   owl_free(tmpbuff);
 #endif
@@ -1054 +1054 @@
 #endif
 }
+
+#ifdef HAVE_LIBZEPHYR
+void owl_zephyr_process_events() {
+  int zpendcount=0;
+  ZNotice_t notice;
+  struct sockaddr_in from;
+  owl_message *m=NULL;
+
+  while(owl_zephyr_zpending() && zpendcount < 20) {
+    if (owl_zephyr_zpending()) {
+      ZReceiveNotice(&notice, &from);
+      zpendcount++;
+
+      /* is this an ack from a zephyr we sent? */
+      if (owl_zephyr_notice_is_ack(&notice)) {
+        owl_zephyr_handle_ack(&notice);
+        continue;
+      }
+
+      /* if it's a ping and we're not viewing pings then skip it */
+      if (!owl_global_is_rxping(&g) && !strcasecmp(notice.z_opcode, "ping")) {
+        continue;
+      }
+
+      /* create the new message */
+      m=owl_malloc(sizeof(owl_message));
+      owl_message_create_from_znotice(m, &notice);
+
+      owl_global_messagequeue_addmsg(&g, m);
+    }
+  }
+}
+
+#else
+void owl_zephyr_process_events() {
+  
+}
+#endif