Changeset 6197702 for irc.h

Timestamp:

2010-10-09T18:41:19Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d150a9d

Parents:

23b29c6 (diff), 27b407f (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:

Merging OTR branch. It's more or less a plugin if you enable it, and
otherwise a no-op. DO NOT INSTALL THIS ON PUBLIC SERVERS.

File:

• irc.h (modified) (5 diffs)

irc.h

@@ -28 +28 @@
 
 #define IRC_MAX_LINE 512
-#define IRC_MAX_ARGS 8
+#define IRC_MAX_ARGS 16
 
 #define IRC_LOGIN_TIMEOUT 60
@@ -86 +86 @@
         gint login_source_id; /* To slightly delay some events at login time. */
         
+        struct otr *otr; /* OTR state and book keeping, used by the OTR plugin.
+                            TODO: Some mechanism for plugindata. */
+        
         struct bee *b;
 } irc_t;
@@ -93 +96 @@
         /* Replaced with iu->last_channel IRC_USER_PRIVATE = 1, */
         IRC_USER_AWAY = 2,
+        
+        IRC_USER_OTR_ENCRYPTED = 0x10000,
+        IRC_USER_OTR_TRUSTED   = 0x20000,
 } irc_user_flags_t;
 
@@ -214 +220 @@
 } irc_channel_del_user_type_t;
 
+/* These are a glued a little bit to the core/bee layer and a little bit to
+   IRC. The first user is OTR, and I guess at some point we'll get to shape
+   this a little bit more as other uses come up. */
+typedef struct irc_plugin
+{
+        /* Called at the end of irc_new(). Can be used to add settings, etc. */
+        gboolean (*irc_new)( irc_t *irc );
+        /* At the end of irc_free(). */
+        void (*irc_free)( irc_t *irc );
+        
+        /* Problem with the following two functions is ordering if multiple
+           plugins are handling them. Let's keep fixing that problem for
+           whenever it becomes important. */
+        
+        /* Called by bee_irc_user_privmsg_cb(). Return NULL if you want to
+           abort sending the msg. */
+        char* (*filter_msg_out)( irc_user_t *iu, char *msg, int flags );
+        /* Called by bee_irc_user_msg(). Return NULL if you swallowed the
+           message and don't want anything to go to the user. */
+        char* (*filter_msg_in)( irc_user_t *iu, char *msg, int flags );
+        
+        /* From storage.c functions. Ideally these should not be used
+           and instead data should be stored in settings which will get
+           saved automatically. Consider these deprecated! */
+        void (*storage_load)( irc_t *irc );
+        void (*storage_save)( irc_t *irc );
+        void (*storage_remove)( const char *nick );
+} irc_plugin_t;
+
+extern GSList *irc_plugins; /* struct irc_plugin */
+
 /* irc.c */
 extern GSList *irc_connection_list;
@@ -238 +275 @@
 
 void irc_umode_set( irc_t *irc, const char *s, gboolean allow_priv );
+
+void register_irc_plugin( const struct irc_plugin *p );
 
 /* irc_channel.c */