Changeset d0d65df

Timestamp:

Feb 17, 2003, 3:47:41 PM (22 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

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

Children:

985f85b

Parents:

a2641cd9

Message:

The message object now uses a list of attributes internally, in
  prep. for supporting new messaging protocols
owl_function_info now uses fmtext instead of one staticly sized
  buffer

Files:

• ChangeLog (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• functions.c (modified) (2 diffs)
• message.c (modified) (26 diffs)
• owl.h (modified) (3 diffs)

ChangeLog

@@ -7 +7 @@
         Fixed a case sensitivity probelm in owl_message_is_personal and
            owl_message_is_private
+        The message object now uses a list of attributes internally, in
+          prep. for supporting new messaging protocols
+        owl_function_info now uses fmtext instead of one staticly sized
+          buffer
 
 1.2.8

Makefile.in

@@ -12 +12 @@
      global.o text.o fmtext.o editwin.o util.o logging.o readconfig.o keys.o \
      functions.o zwrite.o viewwin.o help.o filter.o regex.o history.o view.o \
-     dict.o variable.o varstubs.o filterelement.o \
+     dict.o variable.o varstubs.o filterelement.o pair.o \
      keypress.o keymap.o keybinding.o cmd.o context.o perlglue.o zcrypt.o
 

functions.c

@@ -1088 +1088 @@
 void owl_function_info() {
   owl_message *m;
+  owl_fmtext fm;
   ZNotice_t *n;
-  char buff[5000], tmpbuff[1024];
+  char buff[10000], tmpbuff[1024];
   char *ptr;
   int i, j, fields, len;
   owl_view *v;
 
+  owl_fmtext_init_null(&fm);
+  
   v=owl_global_get_current_view(&g);
   m=owl_view_get_element(v, owl_global_get_curmsg(&g));
@@ -1101 +1104 @@
   }
 
-  sprintf(buff,     "Msg Id    : %i\n", owl_message_get_id(m));
+  owl_fmtext_append_normal(&fm, "Msg Id    : ");
+  sprintf(buff, "%i", owl_message_get_id(m));
+  owl_fmtext_append_normal(&fm, buff);
+  owl_fmtext_append_normal(&fm, "\n");
   if (owl_message_is_type_zephyr(m)) {
-    sprintf(buff, "%sType      : zephyr\n", buff);
+    owl_fmtext_append_normal(&fm, "Type      : zephyr\n");
   } else if (owl_message_is_type_admin(m)) {
-    sprintf(buff, "%sType      : admin\n", buff);
+    owl_fmtext_append_normal(&fm, "Type      : admin\n");
   } else if (owl_message_is_type_generic(m)) {
-    sprintf(buff, "%sType      : generic\n", buff);
+    owl_fmtext_append_normal(&fm, "Type      : generic\n");
   } else {
-    sprintf(buff, "%sType      : unknown\n", buff);
+    owl_fmtext_append_normal(&fm, "Type      : unknown\n");
   }
   if (owl_message_is_direction_in(m)) {
-    sprintf(buff, "%sDirection : in\n", buff);
+    owl_fmtext_append_normal(&fm, "Direction : in\n");
   } else if (owl_message_is_direction_out(m)) {
-    sprintf(buff, "%sDirection : out\n", buff);
+    owl_fmtext_append_normal(&fm, "Direction : out\n");
   } else if (owl_message_is_direction_none(m)) {
-    sprintf(buff, "%sDirection : none\n", buff);
+    owl_fmtext_append_normal(&fm, "Direction : none\n");
   } else {
-    sprintf(buff, "%sDirection : unknown\n", buff);
-  }
-  sprintf(buff, "%sTime      : %s\n", buff, owl_message_get_timestr(m));
-
-  if (!owl_message_is_type_zephyr(m)) {
-    owl_function_popless_text(buff);
-    return;
-  }
-
-
-  if (owl_message_is_direction_out(m)) {
-    sprintf(buff, "%sClass     : %s\n", buff, owl_message_get_class(m));
-    sprintf(buff, "%sInstance  : %s\n", buff, owl_message_get_instance(m));
-    sprintf(buff, "%sSender    : %s\n", buff, owl_message_get_sender(m));
-    sprintf(buff, "%sRecip     : %s\n", buff, owl_message_get_recipient(m));
-    sprintf(buff, "%sOpcode    : %s\n", buff, owl_message_get_opcode(m));
-    
-    owl_function_popless_text(buff);
-    return;
-  }
-
-  n=owl_message_get_notice(m);
-
-  sprintf(buff, "%sClass     : %s\n", buff, owl_message_get_class(m));
-  sprintf(buff, "%sInstance  : %s\n", buff, owl_message_get_instance(m));
-  sprintf(buff, "%sSender    : %s\n", buff, owl_message_get_sender(m));
-  sprintf(buff, "%sRecip     : %s\n", buff, owl_message_get_recipient(m));
-  sprintf(buff, "%sOpcode    : %s\n", buff, owl_message_get_opcode(m));
-  strcat(buff,    "Kind      : ");
-  if (n->z_kind==UNSAFE) {
-    strcat(buff, "UNSAFE\n");
-  } else if (n->z_kind==UNACKED) {
-    strcat(buff, "UNACKED\n");
-  } else if (n->z_kind==ACKED) {
-    strcat(buff, "ACKED\n");
-  } else if (n->z_kind==HMACK) {
-    strcat(buff, "HMACK\n");
-  } else if (n->z_kind==HMCTL) {
-    strcat(buff, "HMCTL\n");
-  } else if (n->z_kind==SERVACK) {
-    strcat(buff, "SERVACK\n");
-  } else if (n->z_kind==SERVNAK) {
-    strcat(buff, "SERVNAK\n");
-  } else if (n->z_kind==CLIENTACK) {
-    strcat(buff, "CLIENTACK\n");
-  } else if (n->z_kind==STAT) {
-    strcat(buff, "STAT\n");
-  } else {
-    strcat(buff, "ILLEGAL VALUE\n");
-  }
-  sprintf(buff, "%sTime      : %s\n", buff, owl_message_get_timestr(m));
-  sprintf(buff, "%sHost      : %s\n", buff, owl_message_get_hostname(m));
-  sprintf(buff, "%sPort      : %i\n", buff, n->z_port);
-  strcat(buff,    "Auth      : ");
-  if (n->z_auth == ZAUTH_FAILED) {
-    strcat(buff, "FAILED\n");
-  } else if (n->z_auth == ZAUTH_NO) {
-    strcat(buff, "NO\n");
-  } else if (n->z_auth == ZAUTH_YES) {
-    strcat(buff, "YES\n");
-  } else {
-    sprintf(buff, "%sUnknown State (%i)\n", buff, n->z_auth);
-  }
-  sprintf(buff, "%sCheckd Ath: %i\n", buff, n->z_checked_auth);
-  sprintf(buff, "%sMulti notc: %s\n", buff, n->z_multinotice);
-  sprintf(buff, "%sNum other : %i\n", buff, n->z_num_other_fields);
-  sprintf(buff, "%sMsg Len   : %i\n", buff, n->z_message_len);
-
-  sprintf(buff, "%sFields    : %i\n", buff, owl_zephyr_get_num_fields(n));
-
-  fields=owl_zephyr_get_num_fields(n);
-  for (i=0; i<fields; i++) {
-    sprintf(buff, "%sField %i   : ", buff, i+1);
-
-    ptr=owl_zephyr_get_field(n, i+1, &len);
-    if (!ptr) break;
-    if (len<30) {
-      strncpy(tmpbuff, ptr, len);
-      tmpbuff[len]='\0';
-    } else {
-      strncpy(tmpbuff, ptr, 30);
-      tmpbuff[30]='\0';
-      strcat(tmpbuff, "...");
-    }
-
-    /* just for testing for now */
-    for (j=0; j<strlen(tmpbuff); j++) {
-      if (tmpbuff[j]=='\n') tmpbuff[j]='~';
-      if (tmpbuff[j]=='\r') tmpbuff[j]='!';
-    }
-
-    strcat(buff, tmpbuff);
-    strcat(buff, "\n");
-  }
-  sprintf(buff, "%sDefault Fm: %s\n", buff, n->z_default_format);
+    owl_fmtext_append_normal(&fm, "Direction : unknown\n");
+  }
+  owl_fmtext_append_normal(&fm, "Time      : ");
+  owl_fmtext_append_normal(&fm, owl_message_get_timestr(m));
+  owl_fmtext_append_normal(&fm, "\n");
+
+  if (owl_message_is_type_zephyr(m)) {
+
+    if (owl_message_is_direction_in(m)) {
+      n=owl_message_get_notice(m);
+      owl_fmtext_append_normal(&fm, "Class     : ");
+      owl_fmtext_append_normal(&fm, owl_message_get_class(m));
+      owl_fmtext_append_normal(&fm, "\n");
+      owl_fmtext_append_normal(&fm, "Instance  : ");
+      owl_fmtext_append_normal(&fm, owl_message_get_instance(m));
+      owl_fmtext_append_normal(&fm, "\n");
+      owl_fmtext_append_normal(&fm, "Sender    : ");
+      owl_fmtext_append_normal(&fm, owl_message_get_sender(m));
+      owl_fmtext_append_normal(&fm, "\n");
+      owl_fmtext_append_normal(&fm, "Recipient : ");
+      owl_fmtext_append_normal(&fm, owl_message_get_recipient(m));
+      owl_fmtext_append_normal(&fm, "\n");
+      owl_fmtext_append_normal(&fm, "Opcode    : ");
+      owl_fmtext_append_normal(&fm, owl_message_get_opcode(m));
+      owl_fmtext_append_normal(&fm, "\n");
+      owl_fmtext_append_normal(&fm, "Kind      : ");
+      if (n->z_kind==UNSAFE) {
+        owl_fmtext_append_normal(&fm, "UNSAFE\n");
+      } else if (n->z_kind==UNACKED) {
+        owl_fmtext_append_normal(&fm, "UNACKED\n");
+      } else if (n->z_kind==ACKED) {
+        owl_fmtext_append_normal(&fm, "ACKED\n");
+      } else if (n->z_kind==HMACK) {
+        owl_fmtext_append_normal(&fm, "HMACK\n");
+      } else if (n->z_kind==HMCTL) {
+        owl_fmtext_append_normal(&fm, "HMCTL\n");
+      } else if (n->z_kind==SERVACK) {
+        owl_fmtext_append_normal(&fm, "SERVACK\n");
+      } else if (n->z_kind==SERVNAK) {
+        owl_fmtext_append_normal(&fm, "SERVNACK\n");
+      } else if (n->z_kind==CLIENTACK) {
+        owl_fmtext_append_normal(&fm, "CLIENTACK\n");
+      } else if (n->z_kind==STAT) {
+        owl_fmtext_append_normal(&fm, "STAT\n");
+      } else {
+        owl_fmtext_append_normal(&fm, "ILLEGAL VALUE\n");
+      }
+
+      owl_fmtext_append_normal(&fm, "Time      : ");
+      owl_fmtext_append_normal(&fm, owl_message_get_timestr(m));
+      owl_fmtext_append_normal(&fm, "\n");
+      owl_fmtext_append_normal(&fm, "Host      : ");
+      owl_fmtext_append_normal(&fm, owl_message_get_hostname(m));
+      owl_fmtext_append_normal(&fm, "\n");
+      sprintf(buff, "Port      : %i\n", n->z_port);
+      owl_fmtext_append_normal(&fm, buff);
+
+      owl_fmtext_append_normal(&fm,    "Auth      : ");
+      if (n->z_auth == ZAUTH_FAILED) {
+        owl_fmtext_append_normal(&fm, "FAILED\n");
+      } else if (n->z_auth == ZAUTH_NO) {
+        owl_fmtext_append_normal(&fm, "NO\n");
+      } else if (n->z_auth == ZAUTH_YES) {
+        owl_fmtext_append_normal(&fm, "YES\n");
+      } else {
+        sprintf(buff, "Unknown State (%i)\n", n->z_auth);
+        owl_fmtext_append_normal(&fm, buff);
+      }
+
+      sprintf(buff, "Checkd Ath: %i\n", buff, n->z_checked_auth);
+      sprintf(buff, "%sMulti notc: %s\n", buff, n->z_multinotice);
+      sprintf(buff, "%sNum other : %i\n", buff, n->z_num_other_fields);
+      sprintf(buff, "%sMsg Len   : %i\n", buff, n->z_message_len);
+      owl_fmtext_append_normal(&fm, buff);
+      
+      sprintf(buff, "Fields    : %i\n", owl_zephyr_get_num_fields(n));
+      owl_fmtext_append_normal(&fm, buff);
+      
+      fields=owl_zephyr_get_num_fields(n);
+      for (i=0; i<fields; i++) {
+        sprintf(buff, "Field %i   : ", i+1);
         
-  owl_function_popless_text(buff);
+        ptr=owl_zephyr_get_field(n, i+1, &len);
+        if (!ptr) break;
+        if (len<30) {
+          strncpy(tmpbuff, ptr, len);
+          tmpbuff[len]='\0';
+        } else {
+          strncpy(tmpbuff, ptr, 30);
+          tmpbuff[30]='\0';
+          strcat(tmpbuff, "...");
+        }
+        
+        /* just for testing for now */
+        for (j=0; j<strlen(tmpbuff); j++) {
+          if (tmpbuff[j]=='\n') tmpbuff[j]='~';
+          if (tmpbuff[j]=='\r') tmpbuff[j]='!';
+        }
+        
+        strcat(buff, tmpbuff);
+        strcat(buff, "\n");
+        owl_fmtext_append_normal(&fm, buff);
+      }
+      owl_fmtext_append_normal(&fm, "Default Fm:");
+      owl_fmtext_append_normal(&fm, n->z_default_format);
+    }
+  }
+  
+  owl_function_popless_fmtext(&fm);
 }
 

message.c

@@ -14 +14 @@
 static const char fileIdent[] = "$Id$";
 
-void owl_message_init_raw(owl_message *m) {
+void owl_message_init(owl_message *m) {
   time_t t;
 
@@ -21 +21 @@
   owl_message_set_direction_none(m);
   m->delete=0;
-  m->sender=owl_strdup("");
-  m->class=owl_strdup("");
-  m->inst=owl_strdup("");
-  m->recip=owl_strdup("");
-  m->opcode=owl_strdup("");
-  m->realm=owl_strdup("");
-  m->zsig=owl_strdup("");
   strcpy(m->hostname, "");
   m->zwriteline=strdup("");
 
+  owl_list_create(&(m->attributes));
+  
   /* save the time */
   t=time(NULL);
@@ -37 +32 @@
 }
 
+void owl_message_set_attribute(owl_message *m, char *attrname, char *attrvalue) {
+  /* add the named attribute to the message.  If an attribute with the
+     name already exists, replace the old value with the new value */
+
+  int i, j;
+  owl_pair *p;
+
+  /* look for an existing pair with this key, and nuke the entry if
+     found */
+  j=owl_list_get_size(&(m->attributes));
+  for (i=0; i<j; i++) {
+    p=owl_list_get_element(&(m->attributes), i);
+    if (!strcmp(owl_pair_get_key(p), attrname)) {
+      owl_free(owl_pair_get_key(p));
+      owl_free(owl_pair_get_value(p));
+      owl_free(p);
+      owl_list_remove_element(&(m->attributes), i);
+      break;
+    }
+  }
+
+  p=owl_malloc(sizeof(owl_pair));
+  owl_pair_create(p, owl_strdup(attrname), owl_strdup(attrvalue));
+  owl_list_append_element(&(m->attributes), p);
+}
+
+char *owl_message_get_attribute_value(owl_message *m, char *attrname) {
+  /* return the value associated with the named attribute, or NULL if
+     the attribute does not exist */
+  int i, j;
+  owl_pair *p;
+
+  j=owl_list_get_size(&(m->attributes));
+  for (i=0; i<j; i++) {
+    p=owl_list_get_element(&(m->attributes), i);
+    if (!strcmp(owl_pair_get_key(p), attrname)) {
+      return(owl_pair_get_value(p));
+    }
+  }
+  owl_function_debugmsg("No attribute %s found", attrname);
+  return(NULL);
+}
+
 
 owl_fmtext *owl_message_get_fmtext(owl_message *m) {
@@ -43 +81 @@
 
 void owl_message_set_class(owl_message *m, char *class) {
-  if (m->class) owl_free(m->class);
-  m->class=owl_strdup(class);
+  owl_message_set_attribute(m, "class", class);
 }
 
 char *owl_message_get_class(owl_message *m) {
-  return(m->class);
+  char *class;
+
+  class=owl_message_get_attribute_value(m, "class");
+  if (!class) return("");
+  return(class);
 }
 
 void owl_message_set_instance(owl_message *m, char *inst) {
-  if (m->inst) owl_free(m->inst);
-  m->inst=owl_strdup(inst);
+  owl_message_set_attribute(m, "instance", inst);
 }
 
 char *owl_message_get_instance(owl_message *m) {
-  return(m->inst);
+  char *instance;
+
+  instance=owl_message_get_attribute_value(m, "instance");
+  if (!instance) return("");
+  return(instance);
 }
 
 void owl_message_set_sender(owl_message *m, char *sender) {
-  if (m->sender) owl_free(m->sender);
-  m->sender=owl_strdup(sender);
+  owl_message_set_attribute(m, "sender", sender);
 }
 
 char *owl_message_get_sender(owl_message *m) {
-  return(m->sender);
+  char *sender;
+
+  sender=owl_message_get_attribute_value(m, "sender");
+  if (!sender) return("");
+  return(sender);
 }
 
 void owl_message_set_zsig(owl_message *m, char *zsig) {
-  if (m->zsig) owl_free(m->zsig);
-  m->zsig=owl_strdup(zsig);
+  owl_message_set_attribute(m, "zsig", zsig);
 }
 
 char *owl_message_get_zsig(owl_message *m) {
-  return(m->zsig);
+  char *zsig;
+
+  zsig=owl_message_get_attribute_value(m, "zsig");
+  if (!zsig) return("");
+  return(zsig);
 }
 
 void owl_message_set_recipient(owl_message *m, char *recip) {
-  if (m->recip) owl_free(m->recip);
-  m->recip=owl_strdup(recip);
+  owl_message_set_attribute(m, "recipient", recip);
 }
 
 char *owl_message_get_recipient(owl_message *m) {
   /* this is stupid for outgoing messages, we need to fix it. */
+
+  char *recip;
      
   if (m->type==OWL_MESSAGE_TYPE_ZEPHYR) {
-    return(m->recip);
+    recip=owl_message_get_attribute_value(m, "recipient");
   } else if (owl_message_is_direction_out(m)) {
-    return(m->zwriteline);
+    recip=m->zwriteline;
   } else {
-    return(m->recip);
-  }
+    recip=owl_message_get_attribute_value(m, "recipient");
+  }
+  if (!recip) return("");
+  return(recip);
 }
 
 void owl_message_set_realm(owl_message *m, char *realm) {
-  if (m->realm) owl_free(m->realm);
-  m->realm=owl_strdup(realm);
+  owl_message_set_attribute(m, "realm", realm);
 }
 
 char *owl_message_get_realm(owl_message *m) {
-  return(m->realm);
-}
+  char *realm;
+  
+  realm=owl_message_get_attribute_value(m, "realm");
+  if (!realm) return("");
+  return(realm);
+}
+
+void owl_message_set_body(owl_message *m, char *body) {
+  owl_message_set_attribute(m, "body", body);
+}
+
+char *owl_message_get_body(owl_message *m) {
+  char *body;
+
+  body=owl_message_get_attribute_value(m, "body");
+  if (!body) return("");
+  return(body);
+}
+
 
 void owl_message_set_opcode(owl_message *m, char *opcode) {
-  if (m->opcode) free(m->opcode);
-  m->opcode=owl_strdup(opcode);
+  owl_message_set_attribute(m, "opcode", opcode);
 }
 
 char *owl_message_get_opcode(owl_message *m) {
-  return(m->opcode);
+  char *opcode;
+
+  opcode=owl_message_get_attribute_value(m, "opcode");
+  if (!opcode) return("");
+  return(opcode);
 }
 
@@ -142 +214 @@
 char *owl_message_get_text(owl_message *m) {
   return(owl_fmtext_get_text(&(m->fmtext)));
-}
-
-char *owl_message_get_body(owl_message *m) {
-  return(m->body);
 }
 
@@ -315 +383 @@
   char *indent;
 
-  owl_message_init_raw(m);
-
-  m->body=owl_strdup(text);
+  owl_message_init(m);
+
+  owl_message_set_body(m, text);
 
   indent=owl_malloc(strlen(text)+owl_text_num_lines(text)*OWL_MSGTAB+10);
@@ -336 +404 @@
   char *indent;
 
-  owl_message_init_raw(m);
+  owl_message_init(m);
   owl_message_set_type_admin(m);
 
-  m->body=owl_strdup(text);
+  owl_message_set_body(m, text);
 
   /* do something to make it clear the notice shouldn't be used for now */
@@ -361 +429 @@
   struct hostent *hent;
   int k, ret;
-  char *ptr, *tmp;
-
-  m->id=owl_global_get_nextmsgid(&g);
+  char *ptr, *tmp, *tmp2;
+
+  owl_message_init(m);
+  
   owl_message_set_type_zephyr(m);
   owl_message_set_direction_in(m);
@@ -376 +445 @@
 
   /* set other info */
-  m->sender=owl_strdup(n->z_sender);
-  m->class=owl_strdup(n->z_class);
-  m->inst=owl_strdup(n->z_class_inst);
-  m->recip=owl_strdup(n->z_recipient);
+  owl_message_set_sender(m, n->z_sender);
+  owl_message_set_class(m, n->z_class);
+  owl_message_set_instance(m, n->z_class_inst);
+  owl_message_set_recipient(m, n->z_recipient);
   if (n->z_opcode) {
-    m->opcode=owl_strdup(n->z_opcode);
+    owl_message_set_opcode(m, n->z_opcode);
   } else {
-    n->z_opcode=owl_strdup("");
-  }
-  m->zsig=owl_strdup(n->z_message);
+    owl_message_set_opcode(m, "");
+  }
+  owl_message_set_zsig(m, n->z_message);
 
   if ((ptr=strchr(n->z_recipient, '@'))!=NULL) {
-    m->realm=owl_strdup(ptr+1);
+    owl_message_set_realm(m, ptr+1);
   } else {
-    m->realm=owl_strdup(ZGetRealm());
+    owl_message_set_realm(m, ZGetRealm());
   }
 
@@ -401 +470 @@
   tmp[k]='\0';
   if (owl_global_is_newlinestrip(&g)) {
-    m->body=owl_util_stripnewlines(tmp);
+    tmp2=owl_util_stripnewlines(tmp);
+    owl_message_set_body(m, tmp2);
     owl_free(tmp);
+    owl_free(tmp2);
   } else {
-    m->body=tmp;
+    owl_message_set_body(m, tmp);
   }
 
@@ -411 +482 @@
     char *out;
 
-    out=owl_malloc(strlen(m->body)*16+20);
-    ret=zcrypt_decrypt(out, m->body, m->class, m->inst);
+    out=owl_malloc(strlen(owl_message_get_body(m))*16+20);
+    ret=zcrypt_decrypt(out, owl_message_get_body(m), owl_message_get_class(m), owl_message_get_instance(m));
     if (ret==0) {
-      owl_free(m->body);
-      m->body=out;
+      owl_message_set_body(m, out);
     } else {
       owl_free(out);
@@ -449 +519 @@
   int ret;
   
-  owl_message_init_raw(m);
+  owl_message_init(m);
 
   /* create a zwrite for the purpose of filling in other message fields */
@@ -460 +530 @@
   owl_message_set_class(m, owl_zwrite_get_class(&z));
   owl_message_set_instance(m, owl_zwrite_get_instance(&z));
-  m->recip=long_zuser(owl_zwrite_get_recip_n(&z, 0)); /* only gets the first user, must fix */
+  owl_message_set_recipient(m,
+                            long_zuser(owl_zwrite_get_recip_n(&z, 0))); /* only gets the first user, must fix */
   owl_message_set_opcode(m, owl_zwrite_get_opcode(&z));
-  m->realm=owl_strdup(owl_zwrite_get_realm(&z)); /* also a hack, but not here */
+  owl_message_set_realm(m, owl_zwrite_get_realm(&z)); /* also a hack, but not here */
   m->zwriteline=owl_strdup(line);
-  m->body=owl_strdup(body);
+  owl_message_set_body(m, body);
   owl_message_set_zsig(m, zsig);
   
@@ -487 +558 @@
 void _owl_message_make_text_from_config(owl_message *m) {
   char *body, *indent;
-  
+
   owl_fmtext_init_null(&(m->fmtext));
 
@@ -571 +642 @@
   
   /* get the body */
-  body=owl_malloc(strlen(m->body)+30);
-  strcpy(body, m->body);
+  body=owl_malloc(strlen(owl_message_get_body(m))+30);
+  strcpy(body, owl_message_get_body(m));
 
   /* add a newline if we need to */
@@ -584 +655 @@
 
   /* edit the from addr for printing */
-  strcpy(frombuff, m->sender);
+  strcpy(frombuff, owl_message_get_sender(m));
   ptr=strchr(frombuff, '@');
   if (ptr && !strncmp(ptr+1, ZGetRealm(), strlen(ZGetRealm()))) {
@@ -594 +665 @@
   owl_fmtext_append_normal(&(m->fmtext), OWL_TABSTR);
 
-  if (!strcasecmp(n->z_opcode, "ping") && owl_message_is_private(m)) {
+  if (!strcasecmp(owl_message_get_opcode(m), "ping") && owl_message_is_private(m)) {
     owl_fmtext_append_bold(&(m->fmtext), "PING");
     owl_fmtext_append_normal(&(m->fmtext), " from ");
@@ -625 +696 @@
     owl_fmtext_append_normal(&(m->fmtext), "\n");
   } else {
-    owl_fmtext_append_normal(&(m->fmtext), m->class);
+    owl_fmtext_append_normal(&(m->fmtext), owl_message_get_class(m));
     owl_fmtext_append_normal(&(m->fmtext), " / ");
-    owl_fmtext_append_normal(&(m->fmtext), m->inst);
+    owl_fmtext_append_normal(&(m->fmtext), owl_message_get_instance(m));
     owl_fmtext_append_normal(&(m->fmtext), " / ");
     owl_fmtext_append_bold(&(m->fmtext), frombuff);
@@ -637 +708 @@
     if (n->z_opcode[0]!='\0') {
       owl_fmtext_append_normal(&(m->fmtext), " [");
-      owl_fmtext_append_normal(&(m->fmtext), n->z_opcode);
+      owl_fmtext_append_normal(&(m->fmtext), owl_message_get_opcode(m));
       owl_fmtext_append_normal(&(m->fmtext), "] ");
     }
@@ -672 +743 @@
 
   /* get the body */
-  body=owl_malloc(strlen(m->body)+30);
-  strcpy(body, m->body);
+  body=owl_malloc(strlen(owl_message_get_body(m)+30));
+  strcpy(body, owl_message_get_body(m));
 
   /* add a newline if we need to */
@@ -685 +756 @@
 
   /* edit the from addr for printing */
-  strcpy(frombuff, m->sender);
+  strcpy(frombuff, owl_message_get_sender(m));
   ptr=strchr(frombuff, '@');
   if (ptr && !strncmp(ptr+1, ZGetRealm(), strlen(ZGetRealm()))) {
@@ -695 +766 @@
   owl_fmtext_append_normal(&(m->fmtext), OWL_TABSTR);
 
-  if (!strcasecmp(n->z_opcode, "ping")) {
+  if (!strcasecmp(owl_message_get_opcode(m), "ping")) {
     owl_fmtext_append_bold(&(m->fmtext), "PING");
     owl_fmtext_append_normal(&(m->fmtext), " from ");
     owl_fmtext_append_bold(&(m->fmtext), frombuff);
     owl_fmtext_append_normal(&(m->fmtext), "\n");
-  } else if (!strcasecmp(n->z_class, "login")) {
+  } else if (!strcasecmp(owl_message_get_class(m), "login")) {
     char *ptr, host[LINE], tty[LINE];
     int len;
@@ -711 +782 @@
     tty[len]='\0';
     
-    if (!strcasecmp(n->z_opcode, "user_login")) {
+    if (!strcasecmp(owl_message_get_opcode(m), "user_login")) {
       owl_fmtext_append_bold(&(m->fmtext), "LOGIN");
-    } else if (!strcasecmp(n->z_opcode, "user_logout")) {
+    } else if (!strcasecmp(owl_message_get_opcode(m), "user_logout")) {
       owl_fmtext_append_bold(&(m->fmtext), "LOGOUT");
     }
     owl_fmtext_append_normal(&(m->fmtext), " for ");
-    ptr=short_zuser(n->z_class_inst);
+    ptr=short_zuser(owl_message_get_instance(m));
     owl_fmtext_append_bold(&(m->fmtext), ptr);
     owl_free(ptr);
@@ -727 +798 @@
   } else {
     owl_fmtext_append_normal(&(m->fmtext), "From: ");
-    if (strcasecmp(m->class, "message")) {
+    if (strcasecmp(owl_message_get_class(m), "message")) {
       owl_fmtext_append_normal(&(m->fmtext), "Class ");
-      owl_fmtext_append_normal(&(m->fmtext), m->class);
+      owl_fmtext_append_normal(&(m->fmtext), owl_message_get_class(m));
       owl_fmtext_append_normal(&(m->fmtext), " / Instance ");
-      owl_fmtext_append_normal(&(m->fmtext), m->inst);
+      owl_fmtext_append_normal(&(m->fmtext), owl_message_get_instance(m));
       owl_fmtext_append_normal(&(m->fmtext), " / ");
     }
@@ -769 +840 @@
   char *ptr;
 
-  strcpy(buff, m->zsig);
+  strcpy(buff, owl_message_get_zsig(m));
   ptr=strchr(buff, '\n');
   if (ptr) ptr[0]='\0';
@@ -775 +846 @@
 
 void owl_message_free(owl_message *m) {
+  int i, j;
+  owl_pair *p;
+    
   if (owl_message_is_type_zephyr(m) && owl_message_is_direction_in(m)) {
     ZFreeNotice(&(m->notice));
   }
-  if (m->sender) owl_free(m->sender);
-  if (m->recip) owl_free(m->recip);
-  if (m->class) owl_free(m->class);
-  if (m->inst) owl_free(m->inst);
-  if (m->opcode) owl_free(m->opcode);
   if (m->time) owl_free(m->time);
-  if (m->realm) owl_free(m->realm);
-  if (m->body) owl_free(m->body);
   if (m->zwriteline) owl_free(m->zwriteline);
+
+  /* free all the attributes */
+  j=owl_list_get_size(&(m->attributes));
+  for (i=0; i<j; i++) {
+    p=owl_list_get_element(&(m->attributes), i);
+    owl_free(owl_pair_get_key(p));
+    owl_free(owl_pair_get_value(p));
+    owl_free(p);
+  }
+
+  owl_list_free_simple(&(m->attributes));
  
   owl_fmtext_free(&(m->fmtext));

owl.h

@@ -39 +39 @@
 #define OWL_MESSAGE_TYPE_GENERIC    1
 #define OWL_MESSAGE_TYPE_ZEPHYR     2
+#define OWL_MESSAGE_TYPE_AIM        3
+#define OWL_MESSAGE_TYPE_JABBER     4
+#define OWL_MESSAGE_TYPE_ICQ        5
+#define OWL_MESSAGE_TYPE_YAHOO      6
+#define OWL_MESSAGE_TYPE_MSN        7
 
 #define OWL_MESSAGE_DIRECTION_NONE  0
@@ -225 +230 @@
 } owl_zwrite;
 
+typedef struct _owl_pair {
+  void *key;
+  void *value;
+} owl_pair;
+
 typedef struct _owl_message {
   int id;
@@ -233 +243 @@
   int delete;
   char hostname[MAXHOSTNAMELEN];
-  char *sender;
-  char *recip;
-  char *class;
-  char *inst;
-  char *opcode;
+  owl_list attributes; /* this is a list of pairs */
   char *time;
-  char *realm;
-  char *body;
   char *zwriteline;
-  char *zsig;
 } owl_message;