From 764c7d1009feda7db971ea7ac6bcb2a4acef0efc Mon Sep 17 00:00:00 2001 From: Sven Moritz Hallberg Date: Sun, 3 Feb 2008 22:30:03 +0100 Subject: OTR support, first checkin --- irc.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'irc.h') diff --git a/irc.h b/irc.h index 8be3579e..318e263e 100644 --- a/irc.h +++ b/irc.h @@ -26,6 +26,8 @@ #ifndef _IRC_H #define _IRC_H +#include "otr.h" + #define IRC_MAX_LINE 512 #define IRC_MAX_ARGS 8 @@ -94,6 +96,9 @@ typedef struct irc gint r_watch_source_id; gint w_watch_source_id; gint ping_source_id; + + OtrlUserState otr_us; + GMutex *otr_mutex; /* for locking otr during keygen */ } irc_t; #include "user.h" -- cgit v1.2.3 From 5a71d9c5b14aa749b532666b71b25ce2afcdc5bb Mon Sep 17 00:00:00 2001 From: Sven Moritz Hallberg Date: Sat, 9 Feb 2008 18:58:13 +0100 Subject: - add support for setting ops/voice according to OTR msgstate - add 'otr trust' user command - support non-otr messages during keygen - run otr messages through strip_html - interpret and tags in html messages - record max message size in prpl - add 'encrypted' flag to user_t - cosmetics --- irc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'irc.h') diff --git a/irc.h b/irc.h index 318e263e..77738640 100644 --- a/irc.h +++ b/irc.h @@ -29,7 +29,7 @@ #include "otr.h" #define IRC_MAX_LINE 512 -#define IRC_MAX_ARGS 8 +#define IRC_MAX_ARGS 16 #define IRC_LOGIN_TIMEOUT 60 #define IRC_PING_STRING "PinglBee" -- cgit v1.2.3 From c59530844d25ae814141cf56f0fa810968e8df55 Mon Sep 17 00:00:00 2001 From: Sven Moritz Hallberg Date: Mon, 11 Feb 2008 22:20:35 +0100 Subject: - use a recursive otr_mutex - implement 'otr forget fingerprint' and 'otr forget context' commands --- irc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'irc.h') diff --git a/irc.h b/irc.h index 77738640..8c993e13 100644 --- a/irc.h +++ b/irc.h @@ -98,7 +98,7 @@ typedef struct irc gint ping_source_id; OtrlUserState otr_us; - GMutex *otr_mutex; /* for locking otr during keygen */ + GStaticRecMutex otr_mutex; /* for locking otr during keygen */ } irc_t; #include "user.h" -- cgit v1.2.3 From 522a00f1b1163cedf15a86329c0097601eb7940b Mon Sep 17 00:00:00 2001 From: Sven Moritz Hallberg Date: Fri, 15 Feb 2008 10:27:26 +0100 Subject: remove thread-based keygen replace it with a process-based stub --- irc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'irc.h') diff --git a/irc.h b/irc.h index 8c993e13..8e9c95c5 100644 --- a/irc.h +++ b/irc.h @@ -98,7 +98,8 @@ typedef struct irc gint ping_source_id; OtrlUserState otr_us; - GStaticRecMutex otr_mutex; /* for locking otr during keygen */ + pid_t otr_keygen; + int otr_ntodo; } irc_t; #include "user.h" -- cgit v1.2.3 From 27db43361a3fdd3420b12aa5bf151dce4545273f Mon Sep 17 00:00:00 2001 From: Sven Moritz Hallberg Date: Fri, 15 Feb 2008 18:36:18 +0100 Subject: implement background keygen via child process --- irc.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'irc.h') diff --git a/irc.h b/irc.h index 8e9c95c5..c808c32d 100644 --- a/irc.h +++ b/irc.h @@ -98,8 +98,10 @@ typedef struct irc gint ping_source_id; OtrlUserState otr_us; - pid_t otr_keygen; - int otr_ntodo; + pid_t otr_keygen; /* pid of keygen slave */ + FILE *otr_to; /* pipe to keygen slave */ + FILE *otr_from; /* pipe from keygen slave */ + int otr_ntodo; /* number of keys left to generate */ } irc_t; #include "user.h" -- cgit v1.2.3 From dc9797f7ad4177dc72373ce71d375257fb0271a1 Mon Sep 17 00:00:00 2001 From: Sven Moritz Hallberg Date: Sat, 16 Feb 2008 14:24:44 +0100 Subject: keep track of which keys are queued for generation --- irc.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'irc.h') diff --git a/irc.h b/irc.h index c808c32d..e9f47082 100644 --- a/irc.h +++ b/irc.h @@ -97,11 +97,7 @@ typedef struct irc gint w_watch_source_id; gint ping_source_id; - OtrlUserState otr_us; - pid_t otr_keygen; /* pid of keygen slave */ - FILE *otr_to; /* pipe to keygen slave */ - FILE *otr_from; /* pipe from keygen slave */ - int otr_ntodo; /* number of keys left to generate */ + otr_t *otr; /* OTR state and book keeping */ } irc_t; #include "user.h" -- cgit v1.2.3