diff options
| author | René Schümann <white06tiger@gmail.com> | 2015-03-26 20:38:11 +0000 |
|---|---|---|
| committer | René Schümann <white06tiger@gmail.com> | 2015-03-26 20:38:11 +0000 |
| commit | 1f7e069bda342dff43e2224060f10fcb098ea62a (patch) | |
| tree | a12ec12d646a4e3a7c97e062a3c8aa7730e4f6d4 /plugins/MirOTR/libotr/src/userstate.h | |
| parent | 52c68e0b3cf78f578da1754fbd6589d1936804f9 (diff) | |
MirOTR: major update to latest libotr 4, with OTR protocol 3 (backwards compatible to 2 and 1, 1 is disabled by default)
NOTE: doesn't build yet, just new libotr without required changes to MirOTR itself
git-svn-id: http://svn.miranda-ng.org/main/trunk@12502 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MirOTR/libotr/src/userstate.h')
| -rw-r--r-- | plugins/MirOTR/libotr/src/userstate.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/plugins/MirOTR/libotr/src/userstate.h b/plugins/MirOTR/libotr/src/userstate.h index 8525df0518..3f1e3b89cf 100644 --- a/plugins/MirOTR/libotr/src/userstate.h +++ b/plugins/MirOTR/libotr/src/userstate.h @@ -1,6 +1,7 @@ /* * Off-the-Record Messaging library - * Copyright (C) 2004-2008 Ian Goldberg, Chris Alexander, Nikita Borisov + * Copyright (C) 2004-2012 Ian Goldberg, Rob Smits, Chris Alexander, + * Willy Lew, Lisa Du, Nikita Borisov * <otr@cypherpunks.ca> * * This library is free software; you can redistribute it and/or @@ -14,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef __USERSTATE_H__ @@ -22,12 +23,16 @@ typedef struct s_OtrlUserState* OtrlUserState; +#include "instag.h" #include "context.h" #include "privkey-t.h" struct s_OtrlUserState { ConnContext *context_root; OtrlPrivKey *privkey_root; + OtrlInsTag *instag_root; + OtrlPendingPrivKey *pending_root; + int timer_running; }; /* Create a new OtrlUserState. Most clients will only need one of @@ -39,7 +44,8 @@ struct s_OtrlUserState { * OtrlUserState. */ OtrlUserState otrl_userstate_create(void); -/* Free a OtrlUserState */ +/* Free a OtrlUserState. If you have a timer running for this userstate, +stop it before freeing the userstate. */ void otrl_userstate_free(OtrlUserState us); #endif |