Changeset 4eb4c0f for protocols/jabber/jabber.h

Timestamp:

2008-02-16T17:15:31Z (16 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

fd9fa52

Parents:

8961950 (diff), ca60550 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge in upstream changes

File:

• protocols/jabber/jabber.h (modified) (4 diffs)

protocols/jabber/jabber.h

@@ -49 +49 @@
 typedef enum
 {
-        JBFLAG_PROBED_XEP85 = 1,        /* Set this when we sent our probe packet to make
+        JBFLAG_PROBED_XEP85 = 1,        /* Set this when we sent our probe packet to make
                                            sure it gets sent only once. */
-        JBFLAG_DOES_XEP85 = 2,          /* Set this when the resource seems to support
+        JBFLAG_DOES_XEP85 = 2,          /* Set this when the resource seems to support
                                            XEP85 (typing notification shite). */
-        JBFLAG_IS_CHATROOM = 4,         /* It's convenient to use this JID thingy for
+        JBFLAG_IS_CHATROOM = 4,         /* It's convenient to use this JID thingy for
                                            groupchat state info too. */
-        JBFLAG_IS_ANONYMOUS = 8,        /* For anonymous chatrooms, when we don't have
+        JBFLAG_IS_ANONYMOUS = 8,        /* For anonymous chatrooms, when we don't have
                                            have a real JID. */
 } jabber_buddy_flags_t;
+
+typedef enum
+{
+        JCFLAG_MESSAGE_SENT = 1,        /* Set this after sending the first message, so
+                                           we can detect echoes/backlogs. */
+} jabber_chat_flags_t;
 
 struct jabber_data
@@ -95 +101 @@
 struct jabber_cache_entry
 {
+        time_t saved_at;
         struct xt_node *node;
         jabber_cache_event func;
@@ -140 +147 @@
 #define JABBER_PACKET_ID "BeeP"
 #define JABBER_CACHED_ID "BeeC"
+
+/* The number of seconds to keep cached packets before garbage collecting
+   them. This gc is done on every keepalive (every minute). */
+#define JABBER_CACHE_MAX_AGE 600
 
 /* RFC 392[01] stuff */
@@ -161 +172 @@
 #define XMLNS_MUC          "http://jabber.org/protocol/muc"     /* XEP-0045 */
 #define XMLNS_MUC_USER     "http://jabber.org/protocol/muc#user"/* XEP-0045 */
+#define XMLNS_CAPS         "http://jabber.org/protocol/caps"    /* XEP-0115 */
 
 /* iq.c */