summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/Messenger.c18
-rw-r--r--core/Messenger.h18
-rw-r--r--core/net_crypto.h2
-rw-r--r--docs/TODO.txt4
4 files changed, 40 insertions, 2 deletions
diff --git a/core/Messenger.c b/core/Messenger.c
index 7603a04f..0660ba94 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -2,6 +2,24 @@
2* 2*
3* An implementation of a simple text chat only messenger on the tox network core. 3* An implementation of a simple text chat only messenger on the tox network core.
4* 4*
5
6 Copyright (C) 2013 Tox project All Rights Reserved.
7
8 This file is part of Tox.
9
10 Tox is free software: you can redistribute it and/or modify
11 it under the terms of the GNU General Public License as published by
12 the Free Software Foundation, either version 3 of the License, or
13 (at your option) any later version.
14
15 Tox is distributed in the hope that it will be useful,
16 but WITHOUT ANY WARRANTY; without even the implied warranty of
17 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 GNU General Public License for more details.
19
20 You should have received a copy of the GNU General Public License
21 along with Tox. If not, see <http://www.gnu.org/licenses/>.
22
5*/ 23*/
6 24
7#include "Messenger.h" 25#include "Messenger.h"
diff --git a/core/Messenger.h b/core/Messenger.h
index 42ce20ca..4bdf5859 100644
--- a/core/Messenger.h
+++ b/core/Messenger.h
@@ -2,6 +2,24 @@
2* 2*
3* An implementation of a simple text chat only messenger on the tox network core. 3* An implementation of a simple text chat only messenger on the tox network core.
4* 4*
5
6 Copyright (C) 2013 Tox project All Rights Reserved.
7
8 This file is part of Tox.
9
10 Tox is free software: you can redistribute it and/or modify
11 it under the terms of the GNU General Public License as published by
12 the Free Software Foundation, either version 3 of the License, or
13 (at your option) any later version.
14
15 Tox is distributed in the hope that it will be useful,
16 but WITHOUT ANY WARRANTY; without even the implied warranty of
17 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 GNU General Public License for more details.
19
20 You should have received a copy of the GNU General Public License
21 along with Tox. If not, see <http://www.gnu.org/licenses/>.
22
5*/ 23*/
6 24
7 25
diff --git a/core/net_crypto.h b/core/net_crypto.h
index 6d223256..fe655c92 100644
--- a/core/net_crypto.h
+++ b/core/net_crypto.h
@@ -28,7 +28,7 @@
28 28
29//TODO: move this to network.h 29//TODO: move this to network.h
30#ifndef WIN32 30#ifndef WIN32
31#include "../nacl/build/localhost/include/amd64/crypto_box.h" //${HOSTNAME%.*} doesn't work... set env var later 31#include "../nacl/build/Linux/include/amd64/crypto_box.h" //${HOSTNAME%.*} doesn't work... set env var later
32#endif 32#endif
33//Our public key. 33//Our public key.
34extern uint8_t self_public_key[crypto_box_PUBLICKEYBYTES]; 34extern uint8_t self_public_key[crypto_box_PUBLICKEYBYTES];
diff --git a/docs/TODO.txt b/docs/TODO.txt
index c1b0f96b..92817a18 100644
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -4,7 +4,7 @@ Things to do now:
4 4
5-Figure out the best way to do "lossless" UDP. (Done) 5-Figure out the best way to do "lossless" UDP. (Done)
6 6
7-Start work on the im protocol. 7-Start work on the im protocol.(simple im part pretty much done)
8 8
9-Start coding the gui (In Progress (Using Qt5)) 9-Start coding the gui (In Progress (Using Qt5))
10 10
@@ -21,6 +21,8 @@ Things to do now:
21 21
22-Crypto (Done (needs testing)) 22-Crypto (Done (needs testing))
23 23
24-Harden the DHT (Research in progress)
25
24-Find and fix bugs in the code. 26-Find and fix bugs in the code.
25 27
26Things to do later: 28Things to do later: