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.c | |
| 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.c')
| -rw-r--r-- | plugins/MirOTR/libotr/src/userstate.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/plugins/MirOTR/libotr/src/userstate.c b/plugins/MirOTR/libotr/src/userstate.c index 6de95b8e42..58f5a05578 100644 --- a/plugins/MirOTR/libotr/src/userstate.c +++ b/plugins/MirOTR/libotr/src/userstate.c @@ -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 */ /* system headers */ @@ -38,14 +39,19 @@ OtrlUserState otrl_userstate_create(void) if (!us) return NULL; us->context_root = NULL; us->privkey_root = NULL; - + us->instag_root = NULL; + us->pending_root = NULL; + us->timer_running = 0; return us; } -/* 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) { otrl_context_forget_all(us); otrl_privkey_forget_all(us); + otrl_privkey_pending_forget_all(us); + otrl_instag_forget_all(us); free(us); } |