Changeset dd16bdd

Timestamp:

Oct 27, 2006, 1:19:54 AM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

1b6b2f3

Parents:

39c036d

Message:

Initial support for creating and injecting messages into the
display. Note that at the moment, you can easily segfault owl from
perl by injecting messages that don't contain fields owl assumes they
will.

Files:

• message.c (modified) (5 diffs)
• perlglue.xs (modified) (3 diffs)
• perlwrap.pm (modified) (3 diffs)

message.c

@@ -341 +341 @@
   m->type=OWL_MESSAGE_TYPE_AIM;
 }
+
+void owl_message_set_type(owl_message *m, int type)
+{
+  m->type=type;
+}
                                                 
 int owl_message_is_type_admin(owl_message *m)
@@ -396 +401 @@
 {
   m->direction=OWL_MESSAGE_DIRECTION_NONE;
+}
+
+void owl_message_set_direction(owl_message *m, int direction)
+{
+  m->direction=direction;
 }
 
@@ -631 +641 @@
 }
 
+int owl_message_parse_type(char *type) {
+  if(!strcmp(type, "admin")) {
+    return OWL_MESSAGE_TYPE_ADMIN;
+  } else if(!strcmp(type, "zephyr")) {
+    return OWL_MESSAGE_TYPE_ZEPHYR;
+  } if(!strcmp(type, "aim")) {
+    return OWL_MESSAGE_TYPE_AIM;
+  } else if(!strcmp(type, "jabber")) {
+    return OWL_MESSAGE_TYPE_JABBER;
+  } else if(!strcmp(type, "icq")) {
+    return OWL_MESSAGE_TYPE_ICQ;
+  } else if(!strcmp(type, "yahoo")) {
+    return OWL_MESSAGE_TYPE_YAHOO;
+  } else if(!strcmp(type, "msn")) {
+    return OWL_MESSAGE_TYPE_MSN;
+  } else if(!strcmp(type, "loopback")) {
+    return OWL_MESSAGE_TYPE_LOOPBACK;
+  } else {
+    return OWL_MESSAGE_TYPE_GENERIC;
+  }
+}
+
 char *owl_message_get_direction(owl_message *m) {
   switch (m->direction) {
@@ -644 +676 @@
 }
 
+int owl_message_parse_direction(char *d) {
+  if(!strcmp(d, "in")) {
+    return OWL_MESSAGE_DIRECTION_IN;
+  } else if(!strcmp(d, "out")) {
+    return OWL_MESSAGE_DIRECTION_OUT;
+  } else {
+    return OWL_MESSAGE_DIRECTION_NONE;
+  }
+}
+
+
 char *owl_message_get_login(owl_message *m) {
   if (owl_message_is_login(m)) {
@@ -653 +696 @@
   }
 }
+
 
 char *owl_message_get_header(owl_message *m) {

perlglue.xs

@@ +1 @@
+/* -*- mode: c; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 static const char fileIdent[] = "$Id$";
 
@@ -90 +91 @@
                 cmd.description = description;
                 cmd.validctx = OWL_CTX_ANY;
-
                 cmd.cmd_aliased_to = NULL;
                 cmd.cmd_args_fn = NULL;
@@ -98 +98 @@
                 cmd.cmd_ctxv_fn = NULL;
                 cmd.cmd_ctxi_fn = NULL;
+                owl_cmddict_add_cmd(owl_global_get_cmddict(&g), &cmd);
 
-                owl_cmddict_add_cmd(owl_global_get_cmddict(&g), &cmd);
+void queue_message(msg)
+        SV *msg
+        PREINIT:
+                char * key;
+                char * val;
+                owl_message *m;
+                HV * hash;
+                HE * ent;
+                I32 count;
+                I32 len;
+        CODE:
+                if(!SvROK(msg) || SvTYPE(SvRV(msg)) != SVt_PVHV) {
+                        croak("Usage: owl::queue_message($message)");
+                }
+                
+                hash = (HV*)SvRV(msg);
+                m = owl_malloc(sizeof(owl_message));
+                owl_message_init(m);
+                
+                count = hv_iterinit(hash);
+                while((ent = hv_iternext(hash))) {
+                        key = hv_iterkey(ent, &len);
+                        val = SvPV_nolen(hv_iterval(hash, ent));
+                        if(!strcmp(key, "type")) {
+                                owl_message_set_type(m, owl_message_parse_type(val));
+                        } else if(!strcmp(key, "direction")) {
+                                owl_message_set_direction(m, owl_message_parse_direction(val));
+                        } else {
+                                owl_message_set_attribute(m, key, val);
+                        }
+                }
+
+                owl_global_messagequeue_addmsg(&g, m);

perlwrap.pm

@@ -62 +62 @@
 package owl::Message;
 
+sub new {
+    my $class = shift;
+    my %args = (@_);
+    if($class eq __PACKAGE__ && $args{type}) {
+        $class = "owl::Message::" . ucfirst $args{type};
+    }
+    return bless {%args}, $class;
+}
+
 sub type        { return shift->{"type"}; }
 sub direction   { return shift->{"direction"}; }
@@ -84 +93 @@
 sub is_admin    { return (shift->{"type"} eq "admin"); }
 sub is_generic  { return (shift->{"type"} eq "generic"); }
+sub is_jabber   { return (shift->{"type"} eq "jabber"); }
 
 # These are overridden by appropriate message types
@@ -251 +261 @@
 #####################################################################
 
+package owl::Message::Jabber;
+
+@ISA = qw( owl::Message );
+
+#####################################################################
+#####################################################################
+
 # switch to package main when we're done
 package main;