diff options
| author | iphydf <iphydf@users.noreply.github.com> | 2017-01-14 15:46:31 +0000 |
|---|---|---|
| committer | iphydf <iphydf@users.noreply.github.com> | 2017-01-19 00:01:44 +0000 |
| commit | 8f96ca6d860ee6d2fb9a502b0e931b461edb3919 (patch) | |
| tree | bdb077aee7bbb419e183ff6d5b0740a58506463e /toxcore | |
| parent | 6d6a4e1e3a96c6fa3e5e07ed57912baf67691ff2 (diff) | |
Update license headers and remove redundant file name comment.
"All rights reserved" was incorrect. The project was licensed under GPL3,
which means a lot of rights are licensed to everybody in the world, i.e.
not reserved to the "Tox Project".
Diffstat (limited to 'toxcore')
45 files changed, 820 insertions, 795 deletions
diff --git a/toxcore/DHT.c b/toxcore/DHT.c index 611cb0f8..776313ca 100644 --- a/toxcore/DHT.c +++ b/toxcore/DHT.c | |||
| @@ -1,28 +1,26 @@ | |||
| 1 | /* DHT.c | 1 | /* |
| 2 | * | ||
| 3 | * An implementation of the DHT as seen in docs/updates/DHT.md | 2 | * An implementation of the DHT as seen in docs/updates/DHT.md |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2013 Tox project. | ||
| 4 | * | 8 | * |
| 5 | * Copyright (C) 2013 Tox project All Rights Reserved. | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 6 | * | ||
| 7 | * This file is part of Tox. | ||
| 8 | * | ||
| 9 | * Tox is free software: you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | 10 | * |
| 14 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 17 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 18 | * | 15 | * |
| 19 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 21 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | */ | 23 | */ |
| 23 | |||
| 24 | /*----------------------------------------------------------------------------------*/ | ||
| 25 | |||
| 26 | #ifdef HAVE_CONFIG_H | 24 | #ifdef HAVE_CONFIG_H |
| 27 | #include "config.h" | 25 | #include "config.h" |
| 28 | #endif | 26 | #endif |
diff --git a/toxcore/DHT.h b/toxcore/DHT.h index c9b859be..3b058c9b 100644 --- a/toxcore/DHT.h +++ b/toxcore/DHT.h | |||
| @@ -1,26 +1,26 @@ | |||
| 1 | /* DHT.h | 1 | /* |
| 2 | * | ||
| 3 | * An implementation of the DHT as seen in docs/updates/DHT.md | 2 | * An implementation of the DHT as seen in docs/updates/DHT.md |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2013 Tox project. | ||
| 4 | * | 8 | * |
| 5 | * Copyright (C) 2013 Tox project All Rights Reserved. | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 6 | * | ||
| 7 | * This file is part of Tox. | ||
| 8 | * | ||
| 9 | * Tox is free software: you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | 10 | * |
| 14 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 17 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 18 | * | 15 | * |
| 19 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 21 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | */ | 23 | */ |
| 23 | |||
| 24 | #ifndef DHT_H | 24 | #ifndef DHT_H |
| 25 | #define DHT_H | 25 | #define DHT_H |
| 26 | 26 | ||
diff --git a/toxcore/LAN_discovery.c b/toxcore/LAN_discovery.c index 6778e932..75dca605 100644 --- a/toxcore/LAN_discovery.c +++ b/toxcore/LAN_discovery.c | |||
| @@ -1,26 +1,26 @@ | |||
| 1 | /* LAN_discovery.c | 1 | /* |
| 2 | * | 2 | * LAN discovery implementation. |
| 3 | * LAN discovery implementation. | 3 | */ |
| 4 | * | 4 | |
| 5 | * Copyright (C) 2013 Tox project All Rights Reserved. | 5 | /* |
| 6 | * | 6 | * Copyright © 2016-2017 The TokTok team. |
| 7 | * This file is part of Tox. | 7 | * Copyright © 2013 Tox project. |
| 8 | * | 8 | * |
| 9 | * Tox is free software: you can redistribute it and/or modify | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | 10 | * |
| 14 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 17 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 18 | * | 15 | * |
| 19 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 21 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | */ | 23 | */ |
| 23 | |||
| 24 | #ifdef HAVE_CONFIG_H | 24 | #ifdef HAVE_CONFIG_H |
| 25 | #include "config.h" | 25 | #include "config.h" |
| 26 | #endif | 26 | #endif |
diff --git a/toxcore/LAN_discovery.h b/toxcore/LAN_discovery.h index 94c987db..753de524 100644 --- a/toxcore/LAN_discovery.h +++ b/toxcore/LAN_discovery.h | |||
| @@ -1,27 +1,26 @@ | |||
| 1 | /* LAN_discovery.h | 1 | /* |
| 2 | * | 2 | * LAN discovery implementation. |
| 3 | * LAN discovery implementation. | 3 | */ |
| 4 | * | 4 | |
| 5 | * Copyright (C) 2013 Tox project All Rights Reserved. | 5 | /* |
| 6 | * | 6 | * Copyright © 2016-2017 The TokTok team. |
| 7 | * This file is part of Tox. | 7 | * Copyright © 2013 Tox project. |
| 8 | * | 8 | * |
| 9 | * Tox is free software: you can redistribute it and/or modify | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | 10 | * |
| 14 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 17 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 18 | * | 15 | * |
| 19 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 21 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | */ | 23 | */ |
| 23 | |||
| 24 | |||
| 25 | #ifndef LAN_DISCOVERY_H | 24 | #ifndef LAN_DISCOVERY_H |
| 26 | #define LAN_DISCOVERY_H | 25 | #define LAN_DISCOVERY_H |
| 27 | 26 | ||
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index 05a7c09e..db5b484d 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c | |||
| @@ -1,26 +1,26 @@ | |||
| 1 | /* Messenger.c | 1 | /* |
| 2 | * | ||
| 3 | * An implementation of a simple text chat only messenger on the tox network core. | 2 | * An implementation of a simple text chat only messenger on the tox network core. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2013 Tox project. | ||
| 4 | * | 8 | * |
| 5 | * Copyright (C) 2013 Tox project All Rights Reserved. | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 6 | * | ||
| 7 | * This file is part of Tox. | ||
| 8 | * | ||
| 9 | * Tox is free software: you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | 10 | * |
| 14 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 17 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 18 | * | 15 | * |
| 19 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 21 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | */ | 23 | */ |
| 23 | |||
| 24 | #ifdef HAVE_CONFIG_H | 24 | #ifdef HAVE_CONFIG_H |
| 25 | #include "config.h" | 25 | #include "config.h" |
| 26 | #endif | 26 | #endif |
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h index 16220ebe..218ec18b 100644 --- a/toxcore/Messenger.h +++ b/toxcore/Messenger.h | |||
| @@ -1,28 +1,27 @@ | |||
| 1 | /* Messenger.h | 1 | /* |
| 2 | * | 2 | * An implementation of a simple text chat only messenger on the tox network |
| 3 | * An implementation of a simple text chat only messenger on the tox network core. | 3 | * core. |
| 4 | * | 4 | */ |
| 5 | * NOTE: All the text in the messages must be encoded using UTF-8 | 5 | |
| 6 | * | 6 | /* |
| 7 | * Copyright (C) 2013 Tox project All Rights Reserved. | 7 | * Copyright © 2016-2017 The TokTok team. |
| 8 | * | 8 | * Copyright © 2013 Tox project. |
| 9 | * This file is part of Tox. | ||
| 10 | * | 9 | * |
| 11 | * Tox is free software: you can redistribute it and/or modify | 10 | * This file is part of Tox, the free peer to peer instant messenger. |
| 12 | * it under the terms of the GNU General Public License as published by | ||
| 13 | * the Free Software Foundation, either version 3 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | 11 | * |
| 16 | * Tox is distributed in the hope that it will be useful, | 12 | * Tox is free software: you can redistribute it and/or modify |
| 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 | * it under the terms of the GNU General Public License as published by |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 14 | * the Free Software Foundation, either version 3 of the License, or |
| 19 | * GNU General Public License for more details. | 15 | * (at your option) any later version. |
| 20 | * | 16 | * |
| 21 | * You should have received a copy of the GNU General Public License | 17 | * Tox is distributed in the hope that it will be useful, |
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 20 | * GNU General Public License for more details. | ||
| 23 | * | 21 | * |
| 22 | * You should have received a copy of the GNU General Public License | ||
| 23 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 24 | */ | 24 | */ |
| 25 | |||
| 26 | #ifndef MESSENGER_H | 25 | #ifndef MESSENGER_H |
| 27 | #define MESSENGER_H | 26 | #define MESSENGER_H |
| 28 | 27 | ||
diff --git a/toxcore/TCP_client.c b/toxcore/TCP_client.c index 14e75845..e6d8e3b4 100644 --- a/toxcore/TCP_client.c +++ b/toxcore/TCP_client.c | |||
| @@ -1,25 +1,26 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * TCP_client.c -- Implementation of the TCP relay client part of Tox. | 2 | * Implementation of the TCP relay client part of Tox. |
| 3 | * | 3 | */ |
| 4 | * Copyright (C) 2014 Tox project All Rights Reserved. | ||
| 5 | * | ||
| 6 | * This file is part of Tox. | ||
| 7 | * | ||
| 8 | * Tox is free software: you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License as published by | ||
| 10 | * the Free Software Foundation, either version 3 of the License, or | ||
| 11 | * (at your option) any later version. | ||
| 12 | * | ||
| 13 | * Tox is distributed in the hope that it will be useful, | ||
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 16 | * GNU General Public License for more details. | ||
| 17 | * | ||
| 18 | * You should have received a copy of the GNU General Public License | ||
| 19 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 20 | * | ||
| 21 | */ | ||
| 22 | 4 | ||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2014 Tox project. | ||
| 8 | * | ||
| 9 | * This file is part of Tox, the free peer to peer instant messenger. | ||
| 10 | * | ||
| 11 | * Tox is free software: you can redistribute it and/or modify | ||
| 12 | * it under the terms of the GNU General Public License as published by | ||
| 13 | * the Free Software Foundation, either version 3 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | * Tox is distributed in the hope that it will be useful, | ||
| 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 20 | * | ||
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 23 | */ | ||
| 23 | #ifdef HAVE_CONFIG_H | 24 | #ifdef HAVE_CONFIG_H |
| 24 | #include "config.h" | 25 | #include "config.h" |
| 25 | #endif | 26 | #endif |
diff --git a/toxcore/TCP_client.h b/toxcore/TCP_client.h index 5b29f1db..5e912d2a 100644 --- a/toxcore/TCP_client.h +++ b/toxcore/TCP_client.h | |||
| @@ -1,26 +1,26 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * TCP_client.h -- Implementation of the TCP relay client part of Tox. | 2 | * Implementation of the TCP relay client part of Tox. |
| 3 | * | 3 | */ |
| 4 | * Copyright (C) 2014 Tox project All Rights Reserved. | ||
| 5 | * | ||
| 6 | * This file is part of Tox. | ||
| 7 | * | ||
| 8 | * Tox is free software: you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License as published by | ||
| 10 | * the Free Software Foundation, either version 3 of the License, or | ||
| 11 | * (at your option) any later version. | ||
| 12 | * | ||
| 13 | * Tox is distributed in the hope that it will be useful, | ||
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 16 | * GNU General Public License for more details. | ||
| 17 | * | ||
| 18 | * You should have received a copy of the GNU General Public License | ||
| 19 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 20 | * | ||
| 21 | */ | ||
| 22 | |||
| 23 | 4 | ||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2014 Tox project. | ||
| 8 | * | ||
| 9 | * This file is part of Tox, the free peer to peer instant messenger. | ||
| 10 | * | ||
| 11 | * Tox is free software: you can redistribute it and/or modify | ||
| 12 | * it under the terms of the GNU General Public License as published by | ||
| 13 | * the Free Software Foundation, either version 3 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | * Tox is distributed in the hope that it will be useful, | ||
| 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 20 | * | ||
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 23 | */ | ||
| 24 | #ifndef TCP_CLIENT_H | 24 | #ifndef TCP_CLIENT_H |
| 25 | #define TCP_CLIENT_H | 25 | #define TCP_CLIENT_H |
| 26 | 26 | ||
diff --git a/toxcore/TCP_connection.c b/toxcore/TCP_connection.c index a9218210..904b686e 100644 --- a/toxcore/TCP_connection.c +++ b/toxcore/TCP_connection.c | |||
| @@ -1,26 +1,26 @@ | |||
| 1 | /* TCP_connection.c | 1 | /* |
| 2 | * | ||
| 3 | * Handles TCP relay connections between two Tox clients. | 2 | * Handles TCP relay connections between two Tox clients. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2015 Tox project. | ||
| 4 | * | 8 | * |
| 5 | * Copyright (C) 2015 Tox project All Rights Reserved. | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 6 | * | ||
| 7 | * This file is part of Tox. | ||
| 8 | * | ||
| 9 | * Tox is free software: you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | 10 | * |
| 14 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 17 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 18 | * | 15 | * |
| 19 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 21 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | */ | 23 | */ |
| 23 | |||
| 24 | #ifdef HAVE_CONFIG_H | 24 | #ifdef HAVE_CONFIG_H |
| 25 | #include "config.h" | 25 | #include "config.h" |
| 26 | #endif | 26 | #endif |
diff --git a/toxcore/TCP_connection.h b/toxcore/TCP_connection.h index 0532c36f..f023b1ab 100644 --- a/toxcore/TCP_connection.h +++ b/toxcore/TCP_connection.h | |||
| @@ -1,26 +1,26 @@ | |||
| 1 | /* TCP_connection.h | 1 | /* |
| 2 | * | ||
| 3 | * Handles TCP relay connections between two Tox clients. | 2 | * Handles TCP relay connections between two Tox clients. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2015 Tox project. | ||
| 4 | * | 8 | * |
| 5 | * Copyright (C) 2015 Tox project All Rights Reserved. | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 6 | * | ||
| 7 | * This file is part of Tox. | ||
| 8 | * | ||
| 9 | * Tox is free software: you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | 10 | * |
| 14 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 17 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 18 | * | 15 | * |
| 19 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 21 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | */ | 23 | */ |
| 23 | |||
| 24 | #ifndef TCP_CONNECTION_H | 24 | #ifndef TCP_CONNECTION_H |
| 25 | #define TCP_CONNECTION_H | 25 | #define TCP_CONNECTION_H |
| 26 | 26 | ||
diff --git a/toxcore/TCP_server.c b/toxcore/TCP_server.c index d9ace28a..5ea198a6 100644 --- a/toxcore/TCP_server.c +++ b/toxcore/TCP_server.c | |||
| @@ -1,25 +1,26 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * TCP_server.c -- Implementation of the TCP relay server part of Tox. | 2 | * Implementation of the TCP relay server part of Tox. |
| 3 | * | 3 | */ |
| 4 | * Copyright (C) 2014 Tox project All Rights Reserved. | ||
| 5 | * | ||
| 6 | * This file is part of Tox. | ||
| 7 | * | ||
| 8 | * Tox is free software: you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License as published by | ||
| 10 | * the Free Software Foundation, either version 3 of the License, or | ||
| 11 | * (at your option) any later version. | ||
| 12 | * | ||
| 13 | * Tox is distributed in the hope that it will be useful, | ||
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 16 | * GNU General Public License for more details. | ||
| 17 | * | ||
| 18 | * You should have received a copy of the GNU General Public License | ||
| 19 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 20 | * | ||
| 21 | */ | ||
| 22 | 4 | ||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2014 Tox project. | ||
| 8 | * | ||
| 9 | * This file is part of Tox, the free peer to peer instant messenger. | ||
| 10 | * | ||
| 11 | * Tox is free software: you can redistribute it and/or modify | ||
| 12 | * it under the terms of the GNU General Public License as published by | ||
| 13 | * the Free Software Foundation, either version 3 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | * Tox is distributed in the hope that it will be useful, | ||
| 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 20 | * | ||
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 23 | */ | ||
| 23 | #ifdef HAVE_CONFIG_H | 24 | #ifdef HAVE_CONFIG_H |
| 24 | #include "config.h" | 25 | #include "config.h" |
| 25 | #endif | 26 | #endif |
diff --git a/toxcore/TCP_server.h b/toxcore/TCP_server.h index f2618330..b1c42957 100644 --- a/toxcore/TCP_server.h +++ b/toxcore/TCP_server.h | |||
| @@ -1,25 +1,26 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * TCP_server.h -- Implementation of the TCP relay server part of Tox. | 2 | * Implementation of the TCP relay server part of Tox. |
| 3 | * | 3 | */ |
| 4 | * Copyright (C) 2014 Tox project All Rights Reserved. | ||
| 5 | * | ||
| 6 | * This file is part of Tox. | ||
| 7 | * | ||
| 8 | * Tox is free software: you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License as published by | ||
| 10 | * the Free Software Foundation, either version 3 of the License, or | ||
| 11 | * (at your option) any later version. | ||
| 12 | * | ||
| 13 | * Tox is distributed in the hope that it will be useful, | ||
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 16 | * GNU General Public License for more details. | ||
| 17 | * | ||
| 18 | * You should have received a copy of the GNU General Public License | ||
| 19 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 20 | * | ||
| 21 | */ | ||
| 22 | 4 | ||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2014 Tox project. | ||
| 8 | * | ||
| 9 | * This file is part of Tox, the free peer to peer instant messenger. | ||
| 10 | * | ||
| 11 | * Tox is free software: you can redistribute it and/or modify | ||
| 12 | * it under the terms of the GNU General Public License as published by | ||
| 13 | * the Free Software Foundation, either version 3 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | * Tox is distributed in the hope that it will be useful, | ||
| 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 20 | * | ||
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 23 | */ | ||
| 23 | #ifndef TCP_SERVER_H | 24 | #ifndef TCP_SERVER_H |
| 24 | #define TCP_SERVER_H | 25 | #define TCP_SERVER_H |
| 25 | 26 | ||
diff --git a/toxcore/crypto_core.api.h b/toxcore/crypto_core.api.h index 6f0b1b0b..cef1a52c 100644 --- a/toxcore/crypto_core.api.h +++ b/toxcore/crypto_core.api.h | |||
| @@ -1,25 +1,26 @@ | |||
| 1 | %{ | 1 | %{ |
| 2 | /* crypto_core.h | 2 | /* |
| 3 | * | ||
| 4 | * Functions for the core crypto. | 3 | * Functions for the core crypto. |
| 4 | */ | ||
| 5 | |||
| 6 | /* | ||
| 7 | * Copyright © 2016-2017 The TokTok team. | ||
| 8 | * Copyright © 2013 Tox project. | ||
| 5 | * | 9 | * |
| 6 | * Copyright (C) 2013 Tox project All Rights Reserved. | 10 | * This file is part of Tox, the free peer to peer instant messenger. |
| 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 | * | 11 | * |
| 15 | * Tox is distributed in the hope that it will be useful, | 12 | * Tox is free software: you can redistribute it and/or modify |
| 16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 | * it under the terms of the GNU General Public License as published by |
| 17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 14 | * the Free Software Foundation, either version 3 of the License, or |
| 18 | * GNU General Public License for more details. | 15 | * (at your option) any later version. |
| 19 | * | 16 | * |
| 20 | * You should have received a copy of the GNU General Public License | 17 | * Tox is distributed in the hope that it will be useful, |
| 21 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 20 | * GNU General Public License for more details. | ||
| 22 | * | 21 | * |
| 22 | * You should have received a copy of the GNU General Public License | ||
| 23 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 23 | */ | 24 | */ |
| 24 | #ifndef CRYPTO_CORE_H | 25 | #ifndef CRYPTO_CORE_H |
| 25 | #define CRYPTO_CORE_H | 26 | #define CRYPTO_CORE_H |
diff --git a/toxcore/crypto_core.c b/toxcore/crypto_core.c index 4d536cf7..e114b44f 100644 --- a/toxcore/crypto_core.c +++ b/toxcore/crypto_core.c | |||
| @@ -1,28 +1,28 @@ | |||
| 1 | /* net_crypto.c | 1 | /* |
| 2 | * | ||
| 3 | * Functions for the core crypto. | 2 | * Functions for the core crypto. |
| 4 | * | 3 | * |
| 5 | * NOTE: This code has to be perfect. We don't mess around with encryption. | 4 | * NOTE: This code has to be perfect. We don't mess around with encryption. |
| 5 | */ | ||
| 6 | |||
| 7 | /* | ||
| 8 | * Copyright © 2016-2017 The TokTok team. | ||
| 9 | * Copyright © 2013 Tox project. | ||
| 6 | * | 10 | * |
| 7 | * Copyright (C) 2013 Tox project All Rights Reserved. | 11 | * This file is part of Tox, the free peer to peer instant messenger. |
| 8 | * | ||
| 9 | * This file is part of Tox. | ||
| 10 | * | ||
| 11 | * Tox is free software: you can redistribute it and/or modify | ||
| 12 | * it under the terms of the GNU General Public License as published by | ||
| 13 | * the Free Software Foundation, either version 3 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | 12 | * |
| 16 | * Tox is distributed in the hope that it will be useful, | 13 | * Tox is free software: you can redistribute it and/or modify |
| 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 | * it under the terms of the GNU General Public License as published by |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 15 | * the Free Software Foundation, either version 3 of the License, or |
| 19 | * GNU General Public License for more details. | 16 | * (at your option) any later version. |
| 20 | * | 17 | * |
| 21 | * You should have received a copy of the GNU General Public License | 18 | * Tox is distributed in the hope that it will be useful, |
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 21 | * GNU General Public License for more details. | ||
| 23 | * | 22 | * |
| 23 | * You should have received a copy of the GNU General Public License | ||
| 24 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 24 | */ | 25 | */ |
| 25 | |||
| 26 | #ifdef HAVE_CONFIG_H | 26 | #ifdef HAVE_CONFIG_H |
| 27 | #include "config.h" | 27 | #include "config.h" |
| 28 | #endif | 28 | #endif |
diff --git a/toxcore/crypto_core.h b/toxcore/crypto_core.h index 56476e38..fc5756c1 100644 --- a/toxcore/crypto_core.h +++ b/toxcore/crypto_core.h | |||
| @@ -1,24 +1,25 @@ | |||
| 1 | /* crypto_core.h | 1 | /* |
| 2 | * | ||
| 3 | * Functions for the core crypto. | 2 | * Functions for the core crypto. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2013 Tox project. | ||
| 4 | * | 8 | * |
| 5 | * Copyright (C) 2013 Tox project All Rights Reserved. | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 6 | * | ||
| 7 | * This file is part of Tox. | ||
| 8 | * | ||
| 9 | * Tox is free software: you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | 10 | * |
| 14 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 17 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 18 | * | 15 | * |
| 19 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 21 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | */ | 23 | */ |
| 23 | #ifndef CRYPTO_CORE_H | 24 | #ifndef CRYPTO_CORE_H |
| 24 | #define CRYPTO_CORE_H | 25 | #define CRYPTO_CORE_H |
diff --git a/toxcore/crypto_core_mem.c b/toxcore/crypto_core_mem.c index 0f199794..b8f4223e 100644 --- a/toxcore/crypto_core_mem.c +++ b/toxcore/crypto_core_mem.c | |||
| @@ -16,7 +16,9 @@ | |||
| 16 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | 16 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
| 17 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 17 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
| 18 | */ | 18 | */ |
| 19 | 19 | #ifdef HAVE_CONFIG_H | |
| 20 | #include "config.h" | ||
| 21 | #endif | ||
| 20 | 22 | ||
| 21 | #include "crypto_core.h" | 23 | #include "crypto_core.h" |
| 22 | 24 | ||
diff --git a/toxcore/friend_connection.c b/toxcore/friend_connection.c index d4f36c96..2fb768ea 100644 --- a/toxcore/friend_connection.c +++ b/toxcore/friend_connection.c | |||
| @@ -1,26 +1,26 @@ | |||
| 1 | /* friend_connection.c | 1 | /* |
| 2 | * | ||
| 3 | * Connection to friends. | 2 | * Connection to friends. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2014 Tox project. | ||
| 4 | * | 8 | * |
| 5 | * Copyright (C) 2014 Tox project All Rights Reserved. | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 6 | * | ||
| 7 | * This file is part of Tox. | ||
| 8 | * | ||
| 9 | * Tox is free software: you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | 10 | * |
| 14 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 17 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 18 | * | 15 | * |
| 19 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 21 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | */ | 23 | */ |
| 23 | |||
| 24 | #ifdef HAVE_CONFIG_H | 24 | #ifdef HAVE_CONFIG_H |
| 25 | #include "config.h" | 25 | #include "config.h" |
| 26 | #endif | 26 | #endif |
diff --git a/toxcore/friend_connection.h b/toxcore/friend_connection.h index 13ea476d..3fa2ebce 100644 --- a/toxcore/friend_connection.h +++ b/toxcore/friend_connection.h | |||
| @@ -1,27 +1,26 @@ | |||
| 1 | /* friend_connection.h | 1 | /* |
| 2 | * | ||
| 3 | * Connection to friends. | 2 | * Connection to friends. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2014 Tox project. | ||
| 4 | * | 8 | * |
| 5 | * Copyright (C) 2014 Tox project All Rights Reserved. | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 6 | * | ||
| 7 | * This file is part of Tox. | ||
| 8 | * | ||
| 9 | * Tox is free software: you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | 10 | * |
| 14 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 17 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 18 | * | 15 | * |
| 19 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 21 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | */ | 23 | */ |
| 23 | |||
| 24 | |||
| 25 | #ifndef FRIEND_CONNECTION_H | 24 | #ifndef FRIEND_CONNECTION_H |
| 26 | #define FRIEND_CONNECTION_H | 25 | #define FRIEND_CONNECTION_H |
| 27 | 26 | ||
diff --git a/toxcore/friend_requests.c b/toxcore/friend_requests.c index a2979b46..eedd2051 100644 --- a/toxcore/friend_requests.c +++ b/toxcore/friend_requests.c | |||
| @@ -1,26 +1,26 @@ | |||
| 1 | /* friend_requests.c | 1 | /* |
| 2 | * | ||
| 3 | * Handle friend requests. | 2 | * Handle friend requests. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2013 Tox project. | ||
| 4 | * | 8 | * |
| 5 | * Copyright (C) 2013 Tox project All Rights Reserved. | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 6 | * | ||
| 7 | * This file is part of Tox. | ||
| 8 | * | ||
| 9 | * Tox is free software: you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | 10 | * |
| 14 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 17 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 18 | * | 15 | * |
| 19 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 21 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | */ | 23 | */ |
| 23 | |||
| 24 | #ifdef HAVE_CONFIG_H | 24 | #ifdef HAVE_CONFIG_H |
| 25 | #include "config.h" | 25 | #include "config.h" |
| 26 | #endif | 26 | #endif |
diff --git a/toxcore/friend_requests.h b/toxcore/friend_requests.h index 9fb06d00..316e1c67 100644 --- a/toxcore/friend_requests.h +++ b/toxcore/friend_requests.h | |||
| @@ -1,26 +1,26 @@ | |||
| 1 | /* friend_requests.h | 1 | /* |
| 2 | * | ||
| 3 | * Handle friend requests. | 2 | * Handle friend requests. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2014 Tox project. | ||
| 4 | * | 8 | * |
| 5 | * Copyright (C) 2013 Tox project All Rights Reserved. | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 6 | * | ||
| 7 | * This file is part of Tox. | ||
| 8 | * | ||
| 9 | * Tox is free software: you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | 10 | * |
| 14 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 17 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 18 | * | 15 | * |
| 19 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 21 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | */ | 23 | */ |
| 23 | |||
| 24 | #ifndef FRIEND_REQUESTS_H | 24 | #ifndef FRIEND_REQUESTS_H |
| 25 | #define FRIEND_REQUESTS_H | 25 | #define FRIEND_REQUESTS_H |
| 26 | 26 | ||
diff --git a/toxcore/group.c b/toxcore/group.c index e733d550..c4af8fa2 100644 --- a/toxcore/group.c +++ b/toxcore/group.c | |||
| @@ -1,26 +1,26 @@ | |||
| 1 | /* group.c | 1 | /* |
| 2 | * | ||
| 3 | * Slightly better groupchats implementation. | 2 | * Slightly better groupchats implementation. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2014 Tox project. | ||
| 4 | * | 8 | * |
| 5 | * Copyright (C) 2014 Tox project All Rights Reserved. | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 6 | * | ||
| 7 | * This file is part of Tox. | ||
| 8 | * | ||
| 9 | * Tox is free software: you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | 10 | * |
| 14 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 17 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 18 | * | 15 | * |
| 19 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 21 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | */ | 23 | */ |
| 23 | |||
| 24 | #ifdef HAVE_CONFIG_H | 24 | #ifdef HAVE_CONFIG_H |
| 25 | #include "config.h" | 25 | #include "config.h" |
| 26 | #endif | 26 | #endif |
diff --git a/toxcore/group.h b/toxcore/group.h index f9cc1362..2e014da3 100644 --- a/toxcore/group.h +++ b/toxcore/group.h | |||
| @@ -1,27 +1,26 @@ | |||
| 1 | /* group.h | 1 | /* |
| 2 | * | ||
| 3 | * Slightly better groupchats implementation. | 2 | * Slightly better groupchats implementation. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2014 Tox project. | ||
| 4 | * | 8 | * |
| 5 | * Copyright (C) 2014 Tox project All Rights Reserved. | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 6 | * | ||
| 7 | * This file is part of Tox. | ||
| 8 | * | ||
| 9 | * Tox is free software: you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | 10 | * |
| 14 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 17 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 18 | * | 15 | * |
| 19 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 21 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | */ | 23 | */ |
| 23 | |||
| 24 | |||
| 25 | #ifndef GROUP_H | 24 | #ifndef GROUP_H |
| 26 | #define GROUP_H | 25 | #define GROUP_H |
| 27 | 26 | ||
diff --git a/toxcore/list.c b/toxcore/list.c index 015f8f8a..d9bfe021 100644 --- a/toxcore/list.c +++ b/toxcore/list.c | |||
| @@ -1,27 +1,31 @@ | |||
| 1 | /* list.h | 1 | /* |
| 2 | * | ||
| 3 | * Simple struct with functions to create a list which associates ids with data | 2 | * Simple struct with functions to create a list which associates ids with data |
| 4 | * -Allows for finding ids associated with data such as IPs or public keys in a short time | 3 | * -Allows for finding ids associated with data such as IPs or public keys in a short time |
| 5 | * -Should only be used if there are relatively few add/remove calls to the list | 4 | * -Should only be used if there are relatively few add/remove calls to the list |
| 5 | */ | ||
| 6 | |||
| 7 | /* | ||
| 8 | * Copyright © 2016-2017 The TokTok team. | ||
| 9 | * Copyright © 2014 Tox project. | ||
| 6 | * | 10 | * |
| 7 | * Copyright (C) 2014 Tox project All Rights Reserved. | 11 | * This file is part of Tox, the free peer to peer instant messenger. |
| 8 | * | ||
| 9 | * This file is part of Tox. | ||
| 10 | * | ||
| 11 | * Tox is free software: you can redistribute it and/or modify | ||
| 12 | * it under the terms of the GNU General Public License as published by | ||
| 13 | * the Free Software Foundation, either version 3 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | 12 | * |
| 16 | * Tox is distributed in the hope that it will be useful, | 13 | * Tox is free software: you can redistribute it and/or modify |
| 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 | * it under the terms of the GNU General Public License as published by |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 15 | * the Free Software Foundation, either version 3 of the License, or |
| 19 | * GNU General Public License for more details. | 16 | * (at your option) any later version. |
| 20 | * | 17 | * |
| 21 | * You should have received a copy of the GNU General Public License | 18 | * Tox is distributed in the hope that it will be useful, |
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 21 | * GNU General Public License for more details. | ||
| 23 | * | 22 | * |
| 23 | * You should have received a copy of the GNU General Public License | ||
| 24 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 24 | */ | 25 | */ |
| 26 | #ifdef HAVE_CONFIG_H | ||
| 27 | #include "config.h" | ||
| 28 | #endif | ||
| 25 | 29 | ||
| 26 | #include "list.h" | 30 | #include "list.h" |
| 27 | 31 | ||
diff --git a/toxcore/list.h b/toxcore/list.h index aac72e81..cb3b328c 100644 --- a/toxcore/list.h +++ b/toxcore/list.h | |||
| @@ -1,28 +1,28 @@ | |||
| 1 | /* list.h | 1 | /* |
| 2 | * | ||
| 3 | * Simple struct with functions to create a list which associates ids with data | 2 | * Simple struct with functions to create a list which associates ids with data |
| 4 | * -Allows for finding ids associated with data such as IPs or public keys in a short time | 3 | * -Allows for finding ids associated with data such as IPs or public keys in a short time |
| 5 | * -Should only be used if there are relatively few add/remove calls to the list | 4 | * -Should only be used if there are relatively few add/remove calls to the list |
| 5 | */ | ||
| 6 | |||
| 7 | /* | ||
| 8 | * Copyright © 2016-2017 The TokTok team. | ||
| 9 | * Copyright © 2014 Tox project. | ||
| 6 | * | 10 | * |
| 7 | * Copyright (C) 2014 Tox project All Rights Reserved. | 11 | * This file is part of Tox, the free peer to peer instant messenger. |
| 8 | * | ||
| 9 | * This file is part of Tox. | ||
| 10 | * | ||
| 11 | * Tox is free software: you can redistribute it and/or modify | ||
| 12 | * it under the terms of the GNU General Public License as published by | ||
| 13 | * the Free Software Foundation, either version 3 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | 12 | * |
| 16 | * Tox is distributed in the hope that it will be useful, | 13 | * Tox is free software: you can redistribute it and/or modify |
| 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 | * it under the terms of the GNU General Public License as published by |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 15 | * the Free Software Foundation, either version 3 of the License, or |
| 19 | * GNU General Public License for more details. | 16 | * (at your option) any later version. |
| 20 | * | 17 | * |
| 21 | * You should have received a copy of the GNU General Public License | 18 | * Tox is distributed in the hope that it will be useful, |
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 21 | * GNU General Public License for more details. | ||
| 23 | * | 22 | * |
| 23 | * You should have received a copy of the GNU General Public License | ||
| 24 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 24 | */ | 25 | */ |
| 25 | |||
| 26 | #ifndef LIST_H | 26 | #ifndef LIST_H |
| 27 | #define LIST_H | 27 | #define LIST_H |
| 28 | 28 | ||
diff --git a/toxcore/logger.c b/toxcore/logger.c index fae5d205..14bdf88e 100644 --- a/toxcore/logger.c +++ b/toxcore/logger.c | |||
| @@ -1,23 +1,29 @@ | |||
| 1 | /* logger.c | 1 | /* |
| 2 | * | 2 | * Text logging abstraction. |
| 3 | * Copyright (C) 2013, 2015 Tox project All Rights Reserved. | 3 | */ |
| 4 | * | 4 | |
| 5 | * This file is part of Tox. | 5 | /* |
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2013,2015 Tox project. | ||
| 6 | * | 8 | * |
| 7 | * Tox is free software: you can redistribute it and/or modify | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 8 | * it under the terms of the GNU General Public License as published by | ||
| 9 | * the Free Software Foundation, either version 3 of the License, or | ||
| 10 | * (at your option) any later version. | ||
| 11 | * | 10 | * |
| 12 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 15 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 16 | * | 15 | * |
| 17 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 19 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 20 | */ | 23 | */ |
| 24 | #ifdef HAVE_CONFIG_H | ||
| 25 | #include "config.h" | ||
| 26 | #endif | ||
| 21 | 27 | ||
| 22 | #include "logger.h" | 28 | #include "logger.h" |
| 23 | 29 | ||
diff --git a/toxcore/logger.h b/toxcore/logger.h index 96dc7c9c..de4eb072 100644 --- a/toxcore/logger.h +++ b/toxcore/logger.h | |||
| @@ -1,25 +1,26 @@ | |||
| 1 | /* logger.h | 1 | /* |
| 2 | * | 2 | * Logger abstraction backed by callbacks for writing. |
| 3 | * Copyright (C) 2013 Tox project All Rights Reserved. | 3 | */ |
| 4 | * | 4 | |
| 5 | * This file is part of Tox. | 5 | /* |
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2013 Tox project. | ||
| 6 | * | 8 | * |
| 7 | * Tox is free software: you can redistribute it and/or modify | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 8 | * it under the terms of the GNU General Public License as published by | ||
| 9 | * the Free Software Foundation, either version 3 of the License, or | ||
| 10 | * (at your option) any later version. | ||
| 11 | * | 10 | * |
| 12 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 15 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 16 | * | 15 | * |
| 17 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 19 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 20 | */ | 23 | */ |
| 21 | |||
| 22 | |||
| 23 | #ifndef TOXLOGGER_H | 24 | #ifndef TOXLOGGER_H |
| 24 | #define TOXLOGGER_H | 25 | #define TOXLOGGER_H |
| 25 | 26 | ||
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c index 2987a5bd..cc3c5226 100644 --- a/toxcore/net_crypto.c +++ b/toxcore/net_crypto.c | |||
| @@ -1,28 +1,28 @@ | |||
| 1 | /* net_crypto.c | 1 | /* |
| 2 | * | ||
| 3 | * Functions for the core network crypto. | 2 | * Functions for the core network crypto. |
| 4 | * | 3 | * |
| 5 | * NOTE: This code has to be perfect. We don't mess around with encryption. | 4 | * NOTE: This code has to be perfect. We don't mess around with encryption. |
| 5 | */ | ||
| 6 | |||
| 7 | /* | ||
| 8 | * Copyright © 2016-2017 The TokTok team. | ||
| 9 | * Copyright © 2013 Tox project. | ||
| 6 | * | 10 | * |
| 7 | * Copyright (C) 2013 Tox project All Rights Reserved. | 11 | * This file is part of Tox, the free peer to peer instant messenger. |
| 8 | * | ||
| 9 | * This file is part of Tox. | ||
| 10 | * | ||
| 11 | * Tox is free software: you can redistribute it and/or modify | ||
| 12 | * it under the terms of the GNU General Public License as published by | ||
| 13 | * the Free Software Foundation, either version 3 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | 12 | * |
| 16 | * Tox is distributed in the hope that it will be useful, | 13 | * Tox is free software: you can redistribute it and/or modify |
| 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 | * it under the terms of the GNU General Public License as published by |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 15 | * the Free Software Foundation, either version 3 of the License, or |
| 19 | * GNU General Public License for more details. | 16 | * (at your option) any later version. |
| 20 | * | 17 | * |
| 21 | * You should have received a copy of the GNU General Public License | 18 | * Tox is distributed in the hope that it will be useful, |
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 21 | * GNU General Public License for more details. | ||
| 23 | * | 22 | * |
| 23 | * You should have received a copy of the GNU General Public License | ||
| 24 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 24 | */ | 25 | */ |
| 25 | |||
| 26 | #ifdef HAVE_CONFIG_H | 26 | #ifdef HAVE_CONFIG_H |
| 27 | #include "config.h" | 27 | #include "config.h" |
| 28 | #endif | 28 | #endif |
diff --git a/toxcore/net_crypto.h b/toxcore/net_crypto.h index 81885338..5ec5ca94 100644 --- a/toxcore/net_crypto.h +++ b/toxcore/net_crypto.h | |||
| @@ -1,26 +1,26 @@ | |||
| 1 | /* net_crypto.h | 1 | /* |
| 2 | * | ||
| 3 | * Functions for the core network crypto. | 2 | * Functions for the core network crypto. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2013 Tox project. | ||
| 4 | * | 8 | * |
| 5 | * Copyright (C) 2013 Tox project All Rights Reserved. | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 6 | * | ||
| 7 | * This file is part of Tox. | ||
| 8 | * | ||
| 9 | * Tox is free software: you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | 10 | * |
| 14 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 17 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 18 | * | 15 | * |
| 19 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 21 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | */ | 23 | */ |
| 23 | |||
| 24 | #ifndef NET_CRYPTO_H | 24 | #ifndef NET_CRYPTO_H |
| 25 | #define NET_CRYPTO_H | 25 | #define NET_CRYPTO_H |
| 26 | 26 | ||
diff --git a/toxcore/network.c b/toxcore/network.c index 253c0611..e869350f 100644 --- a/toxcore/network.c +++ b/toxcore/network.c | |||
| @@ -1,25 +1,29 @@ | |||
| 1 | /* network.c | 1 | /* |
| 2 | * | ||
| 3 | * Functions for the core networking. | 2 | * Functions for the core networking. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2013 Tox project. | ||
| 4 | * | 8 | * |
| 5 | * Copyright (C) 2013 Tox project All Rights Reserved. | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 6 | * | ||
| 7 | * This file is part of Tox. | ||
| 8 | * | ||
| 9 | * Tox is free software: you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | 10 | * |
| 14 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 17 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 18 | * | 15 | * |
| 19 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 21 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | */ | 23 | */ |
| 24 | #ifdef HAVE_CONFIG_H | ||
| 25 | #include "config.h" | ||
| 26 | #endif | ||
| 23 | 27 | ||
| 24 | #define _DARWIN_C_SOURCE | 28 | #define _DARWIN_C_SOURCE |
| 25 | #define _XOPEN_SOURCE 600 | 29 | #define _XOPEN_SOURCE 600 |
| @@ -28,10 +32,6 @@ | |||
| 28 | #define _WIN32_WINNT 0x501 | 32 | #define _WIN32_WINNT 0x501 |
| 29 | #endif | 33 | #endif |
| 30 | 34 | ||
| 31 | #ifdef HAVE_CONFIG_H | ||
| 32 | #include "config.h" | ||
| 33 | #endif | ||
| 34 | |||
| 35 | #include "network.h" | 35 | #include "network.h" |
| 36 | 36 | ||
| 37 | #include "logger.h" | 37 | #include "logger.h" |
diff --git a/toxcore/network.h b/toxcore/network.h index e7cc0597..45a63e2e 100644 --- a/toxcore/network.h +++ b/toxcore/network.h | |||
| @@ -1,26 +1,26 @@ | |||
| 1 | /* network.h | 1 | /* |
| 2 | * | ||
| 3 | * Datatypes, functions and includes for the core networking. | 2 | * Datatypes, functions and includes for the core networking. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2013 Tox project. | ||
| 4 | * | 8 | * |
| 5 | * Copyright (C) 2013 Tox project All Rights Reserved. | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 6 | * | ||
| 7 | * This file is part of Tox. | ||
| 8 | * | ||
| 9 | * Tox is free software: you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | 10 | * |
| 14 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 17 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 18 | * | 15 | * |
| 19 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 21 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | */ | 23 | */ |
| 23 | |||
| 24 | #ifndef NETWORK_H | 24 | #ifndef NETWORK_H |
| 25 | #define NETWORK_H | 25 | #define NETWORK_H |
| 26 | 26 | ||
diff --git a/toxcore/onion.c b/toxcore/onion.c index 07908f2e..1d5cc71f 100644 --- a/toxcore/onion.c +++ b/toxcore/onion.c | |||
| @@ -1,24 +1,26 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * onion.c -- Implementation of the onion part of docs/Prevent_Tracking.txt | 2 | * Implementation of the onion part of docs/Prevent_Tracking.txt |
| 3 | * | 3 | */ |
| 4 | * Copyright (C) 2013 Tox project All Rights Reserved. | 4 | |
| 5 | * | 5 | /* |
| 6 | * This file is part of Tox. | 6 | * Copyright © 2016-2017 The TokTok team. |
| 7 | * | 7 | * Copyright © 2013 Tox project. |
| 8 | * Tox is free software: you can redistribute it and/or modify | 8 | * |
| 9 | * it under the terms of the GNU General Public License as published by | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 10 | * the Free Software Foundation, either version 3 of the License, or | 10 | * |
| 11 | * (at your option) any later version. | 11 | * Tox is free software: you can redistribute it and/or modify |
| 12 | * | 12 | * it under the terms of the GNU General Public License as published by |
| 13 | * Tox is distributed in the hope that it will be useful, | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 | * (at your option) any later version. |
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 15 | * |
| 16 | * GNU General Public License for more details. | 16 | * Tox is distributed in the hope that it will be useful, |
| 17 | * | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * You should have received a copy of the GNU General Public License | 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 19 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 19 | * GNU General Public License for more details. |
| 20 | * | 20 | * |
| 21 | */ | 21 | * You should have received a copy of the GNU General Public License |
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 23 | */ | ||
| 22 | #ifdef HAVE_CONFIG_H | 24 | #ifdef HAVE_CONFIG_H |
| 23 | #include "config.h" | 25 | #include "config.h" |
| 24 | #endif | 26 | #endif |
diff --git a/toxcore/onion.h b/toxcore/onion.h index 0c2dcc04..1dcaa0fe 100644 --- a/toxcore/onion.h +++ b/toxcore/onion.h | |||
| @@ -1,25 +1,26 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * onion.h -- Implementation of the onion part of docs/Prevent_Tracking.txt | 2 | * Implementation of the onion part of docs/Prevent_Tracking.txt |
| 3 | * | 3 | */ |
| 4 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
| 5 | * | ||
| 6 | * This file is part of Tox. | ||
| 7 | * | ||
| 8 | * Tox is free software: you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License as published by | ||
| 10 | * the Free Software Foundation, either version 3 of the License, or | ||
| 11 | * (at your option) any later version. | ||
| 12 | * | ||
| 13 | * Tox is distributed in the hope that it will be useful, | ||
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 16 | * GNU General Public License for more details. | ||
| 17 | * | ||
| 18 | * You should have received a copy of the GNU General Public License | ||
| 19 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 20 | * | ||
| 21 | */ | ||
| 22 | 4 | ||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2013 Tox project. | ||
| 8 | * | ||
| 9 | * This file is part of Tox, the free peer to peer instant messenger. | ||
| 10 | * | ||
| 11 | * Tox is free software: you can redistribute it and/or modify | ||
| 12 | * it under the terms of the GNU General Public License as published by | ||
| 13 | * the Free Software Foundation, either version 3 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | * Tox is distributed in the hope that it will be useful, | ||
| 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 20 | * | ||
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 23 | */ | ||
| 23 | #ifndef ONION_H | 24 | #ifndef ONION_H |
| 24 | #define ONION_H | 25 | #define ONION_H |
| 25 | 26 | ||
diff --git a/toxcore/onion_announce.c b/toxcore/onion_announce.c index 5d371a99..aa287d12 100644 --- a/toxcore/onion_announce.c +++ b/toxcore/onion_announce.c | |||
| @@ -1,24 +1,26 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * onion_announce.c -- Implementation of the announce part of docs/Prevent_Tracking.txt | 2 | * Implementation of the announce part of docs/Prevent_Tracking.txt |
| 3 | * | 3 | */ |
| 4 | * Copyright (C) 2013 Tox project All Rights Reserved. | 4 | |
| 5 | * | 5 | /* |
| 6 | * This file is part of Tox. | 6 | * Copyright © 2016-2017 The TokTok team. |
| 7 | * | 7 | * Copyright © 2013 Tox project. |
| 8 | * Tox is free software: you can redistribute it and/or modify | 8 | * |
| 9 | * it under the terms of the GNU General Public License as published by | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 10 | * the Free Software Foundation, either version 3 of the License, or | 10 | * |
| 11 | * (at your option) any later version. | 11 | * Tox is free software: you can redistribute it and/or modify |
| 12 | * | 12 | * it under the terms of the GNU General Public License as published by |
| 13 | * Tox is distributed in the hope that it will be useful, | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 | * (at your option) any later version. |
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 15 | * |
| 16 | * GNU General Public License for more details. | 16 | * Tox is distributed in the hope that it will be useful, |
| 17 | * | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * You should have received a copy of the GNU General Public License | 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 19 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 19 | * GNU General Public License for more details. |
| 20 | * | 20 | * |
| 21 | */ | 21 | * You should have received a copy of the GNU General Public License |
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 23 | */ | ||
| 22 | #ifdef HAVE_CONFIG_H | 24 | #ifdef HAVE_CONFIG_H |
| 23 | #include "config.h" | 25 | #include "config.h" |
| 24 | #endif | 26 | #endif |
diff --git a/toxcore/onion_announce.h b/toxcore/onion_announce.h index 821e0c15..548d4b79 100644 --- a/toxcore/onion_announce.h +++ b/toxcore/onion_announce.h | |||
| @@ -1,25 +1,26 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * onion_announce.h -- Implementation of the announce part of docs/Prevent_Tracking.txt | 2 | * Implementation of the announce part of docs/Prevent_Tracking.txt |
| 3 | * | 3 | */ |
| 4 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
| 5 | * | ||
| 6 | * This file is part of Tox. | ||
| 7 | * | ||
| 8 | * Tox is free software: you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License as published by | ||
| 10 | * the Free Software Foundation, either version 3 of the License, or | ||
| 11 | * (at your option) any later version. | ||
| 12 | * | ||
| 13 | * Tox is distributed in the hope that it will be useful, | ||
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 16 | * GNU General Public License for more details. | ||
| 17 | * | ||
| 18 | * You should have received a copy of the GNU General Public License | ||
| 19 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 20 | * | ||
| 21 | */ | ||
| 22 | 4 | ||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2013 Tox project. | ||
| 8 | * | ||
| 9 | * This file is part of Tox, the free peer to peer instant messenger. | ||
| 10 | * | ||
| 11 | * Tox is free software: you can redistribute it and/or modify | ||
| 12 | * it under the terms of the GNU General Public License as published by | ||
| 13 | * the Free Software Foundation, either version 3 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | * Tox is distributed in the hope that it will be useful, | ||
| 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 20 | * | ||
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 23 | */ | ||
| 23 | #ifndef ONION_ANNOUNCE_H | 24 | #ifndef ONION_ANNOUNCE_H |
| 24 | #define ONION_ANNOUNCE_H | 25 | #define ONION_ANNOUNCE_H |
| 25 | 26 | ||
diff --git a/toxcore/onion_client.c b/toxcore/onion_client.c index 6ef22314..d324dbf2 100644 --- a/toxcore/onion_client.c +++ b/toxcore/onion_client.c | |||
| @@ -1,25 +1,27 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * onion_client.c -- Implementation of the client part of docs/Prevent_Tracking.txt | 2 | * Implementation of the client part of docs/Prevent_Tracking.txt (The part that |
| 3 | * (The part that uses the onion stuff to connect to the friend) | 3 | * uses the onion stuff to connect to the friend) |
| 4 | * | 4 | */ |
| 5 | * Copyright (C) 2013 Tox project All Rights Reserved. | 5 | |
| 6 | * | 6 | /* |
| 7 | * This file is part of Tox. | 7 | * Copyright © 2016-2017 The TokTok team. |
| 8 | * | 8 | * Copyright © 2013 Tox project. |
| 9 | * Tox is free software: you can redistribute it and/or modify | 9 | * |
| 10 | * it under the terms of the GNU General Public License as published by | 10 | * This file is part of Tox, the free peer to peer instant messenger. |
| 11 | * the Free Software Foundation, either version 3 of the License, or | 11 | * |
| 12 | * (at your option) any later version. | 12 | * Tox is free software: you can redistribute it and/or modify |
| 13 | * | 13 | * it under the terms of the GNU General Public License as published by |
| 14 | * Tox is distributed in the hope that it will be useful, | 14 | * the Free Software Foundation, either version 3 of the License, or |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 15 | * (at your option) any later version. |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 16 | * |
| 17 | * GNU General Public License for more details. | 17 | * Tox is distributed in the hope that it will be useful, |
| 18 | * | 18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 19 | * You should have received a copy of the GNU General Public License | 19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 20 | * GNU General Public License for more details. |
| 21 | * | 21 | * |
| 22 | */ | 22 | * You should have received a copy of the GNU General Public License |
| 23 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 24 | */ | ||
| 23 | #ifdef HAVE_CONFIG_H | 25 | #ifdef HAVE_CONFIG_H |
| 24 | #include "config.h" | 26 | #include "config.h" |
| 25 | #endif | 27 | #endif |
| @@ -1523,7 +1525,7 @@ static int onion_isconnected(const Onion_Client *onion_c) | |||
| 1523 | } | 1525 | } |
| 1524 | 1526 | ||
| 1525 | /* Consider ourselves online if we are announced to half or more nodes | 1527 | /* Consider ourselves online if we are announced to half or more nodes |
| 1526 | we are connected to */ | 1528 | we are connected to */ |
| 1527 | if (num && announced) { | 1529 | if (num && announced) { |
| 1528 | if ((num / 2) <= announced && (pnodes / 2) <= num) { | 1530 | if ((num / 2) <= announced && (pnodes / 2) <= num) { |
| 1529 | return 1; | 1531 | return 1; |
diff --git a/toxcore/onion_client.h b/toxcore/onion_client.h index afe72ca1..a5a6babf 100644 --- a/toxcore/onion_client.h +++ b/toxcore/onion_client.h | |||
| @@ -1,26 +1,27 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * onion_client.h -- Implementation of the client part of docs/Prevent_Tracking.txt | 2 | * Implementation of the client part of docs/Prevent_Tracking.txt (The part that |
| 3 | * (The part that uses the onion stuff to connect to the friend) | 3 | * uses the onion stuff to connect to the friend) |
| 4 | * | 4 | */ |
| 5 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
| 6 | * | ||
| 7 | * This file is part of Tox. | ||
| 8 | * | ||
| 9 | * Tox is free software: you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | ||
| 14 | * Tox is distributed in the hope that it will be useful, | ||
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 17 | * GNU General Public License for more details. | ||
| 18 | * | ||
| 19 | * You should have received a copy of the GNU General Public License | ||
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 21 | * | ||
| 22 | */ | ||
| 23 | 5 | ||
| 6 | /* | ||
| 7 | * Copyright © 2016-2017 The TokTok team. | ||
| 8 | * Copyright © 2013 Tox project. | ||
| 9 | * | ||
| 10 | * This file is part of Tox, the free peer to peer instant messenger. | ||
| 11 | * | ||
| 12 | * Tox is free software: you can redistribute it and/or modify | ||
| 13 | * it under the terms of the GNU General Public License as published by | ||
| 14 | * the Free Software Foundation, either version 3 of the License, or | ||
| 15 | * (at your option) any later version. | ||
| 16 | * | ||
| 17 | * Tox is distributed in the hope that it will be useful, | ||
| 18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 20 | * GNU General Public License for more details. | ||
| 21 | * | ||
| 22 | * You should have received a copy of the GNU General Public License | ||
| 23 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 24 | */ | ||
| 24 | #ifndef ONION_CLIENT_H | 25 | #ifndef ONION_CLIENT_H |
| 25 | #define ONION_CLIENT_H | 26 | #define ONION_CLIENT_H |
| 26 | 27 | ||
diff --git a/toxcore/ping.c b/toxcore/ping.c index bf61b095..36c32c61 100644 --- a/toxcore/ping.c +++ b/toxcore/ping.c | |||
| @@ -1,28 +1,28 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * ping.c -- Buffered pinging using cyclic arrays. | 2 | * Buffered pinging using cyclic arrays. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2013 Tox project. | ||
| 8 | * Copyright © 2013 plutooo | ||
| 3 | * | 9 | * |
| 10 | * This file is part of Tox, the free peer to peer instant messenger. | ||
| 4 | * This file is donated to the Tox Project. | 11 | * This file is donated to the Tox Project. |
| 5 | * Copyright 2013 plutooo | ||
| 6 | * | ||
| 7 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
| 8 | * | 12 | * |
| 9 | * This file is part of Tox. | 13 | * Tox is free software: you can redistribute it and/or modify |
| 14 | * it under the terms of the GNU General Public License as published by | ||
| 15 | * the Free Software Foundation, either version 3 of the License, or | ||
| 16 | * (at your option) any later version. | ||
| 10 | * | 17 | * |
| 11 | * Tox is free software: you can redistribute it and/or modify | 18 | * Tox is distributed in the hope that it will be useful, |
| 12 | * it under the terms of the GNU General Public License as published by | 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 13 | * the Free Software Foundation, either version 3 of the License, or | 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 14 | * (at your option) any later version. | 21 | * GNU General Public License for more details. |
| 15 | * | ||
| 16 | * Tox is distributed in the hope that it will be useful, | ||
| 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 20 | * | ||
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 23 | * | 22 | * |
| 23 | * You should have received a copy of the GNU General Public License | ||
| 24 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 24 | */ | 25 | */ |
| 25 | |||
| 26 | #ifdef HAVE_CONFIG_H | 26 | #ifdef HAVE_CONFIG_H |
| 27 | #include "config.h" | 27 | #include "config.h" |
| 28 | #endif | 28 | #endif |
diff --git a/toxcore/ping.h b/toxcore/ping.h index 4674c674..cc3428c5 100644 --- a/toxcore/ping.h +++ b/toxcore/ping.h | |||
| @@ -1,25 +1,27 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * ping.h -- Buffered pinging using cyclic arrays. | 2 | * Buffered pinging using cyclic arrays. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2013 Tox project. | ||
| 8 | * Copyright © 2013 plutooo | ||
| 3 | * | 9 | * |
| 10 | * This file is part of Tox, the free peer to peer instant messenger. | ||
| 4 | * This file is donated to the Tox Project. | 11 | * This file is donated to the Tox Project. |
| 5 | * Copyright 2013 plutooo | ||
| 6 | * | ||
| 7 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
| 8 | * | ||
| 9 | * This file is part of Tox. | ||
| 10 | * | 12 | * |
| 11 | * Tox is free software: you can redistribute it and/or modify | 13 | * Tox is free software: you can redistribute it and/or modify |
| 12 | * it under the terms of the GNU General Public License as published by | 14 | * it under the terms of the GNU General Public License as published by |
| 13 | * the Free Software Foundation, either version 3 of the License, or | 15 | * the Free Software Foundation, either version 3 of the License, or |
| 14 | * (at your option) any later version. | 16 | * (at your option) any later version. |
| 15 | * | 17 | * |
| 16 | * Tox is distributed in the hope that it will be useful, | 18 | * Tox is distributed in the hope that it will be useful, |
| 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 19 | * GNU General Public License for more details. | 21 | * GNU General Public License for more details. |
| 20 | * | 22 | * |
| 21 | * You should have received a copy of the GNU General Public License | 23 | * You should have received a copy of the GNU General Public License |
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 24 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. |
| 23 | */ | 25 | */ |
| 24 | #ifndef PING_H | 26 | #ifndef PING_H |
| 25 | #define PING_H | 27 | #define PING_H |
diff --git a/toxcore/ping_array.c b/toxcore/ping_array.c index ee7ff8be..ea3e5101 100644 --- a/toxcore/ping_array.c +++ b/toxcore/ping_array.c | |||
| @@ -1,27 +1,26 @@ | |||
| 1 | /* ping_array.c | 1 | /* |
| 2 | * | ||
| 3 | * Implementation of an efficient array to store that we pinged something. | 2 | * Implementation of an efficient array to store that we pinged something. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2014 Tox project. | ||
| 4 | * | 8 | * |
| 9 | * This file is part of Tox, the free peer to peer instant messenger. | ||
| 5 | * | 10 | * |
| 6 | * Copyright (C) 2014 Tox project All Rights Reserved. | 11 | * Tox is free software: you can redistribute it and/or modify |
| 7 | * | 12 | * it under the terms of the GNU General Public License as published by |
| 8 | * This file is part of Tox. | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 9 | * | 14 | * (at your option) any later version. |
| 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 | * | 15 | * |
| 20 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 21 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 22 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 23 | */ | 23 | */ |
| 24 | |||
| 25 | #ifdef HAVE_CONFIG_H | 24 | #ifdef HAVE_CONFIG_H |
| 26 | #include "config.h" | 25 | #include "config.h" |
| 27 | #endif | 26 | #endif |
diff --git a/toxcore/ping_array.h b/toxcore/ping_array.h index 364ad833..bdf3c6db 100644 --- a/toxcore/ping_array.h +++ b/toxcore/ping_array.h | |||
| @@ -1,24 +1,25 @@ | |||
| 1 | /* ping_array.h | 1 | /* |
| 2 | * | ||
| 3 | * Implementation of an efficient array to store that we pinged something. | 2 | * Implementation of an efficient array to store that we pinged something. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2013 Tox project. | ||
| 4 | * | 8 | * |
| 5 | * Copyright (C) 2013 Tox project All Rights Reserved. | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 6 | * | ||
| 7 | * This file is part of Tox. | ||
| 8 | * | ||
| 9 | * Tox is free software: you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | 10 | * |
| 14 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 17 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 18 | * | 15 | * |
| 19 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 21 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | */ | 23 | */ |
| 23 | #ifndef PING_ARRAY_H | 24 | #ifndef PING_ARRAY_H |
| 24 | #define PING_ARRAY_H | 25 | #define PING_ARRAY_H |
diff --git a/toxcore/tox.api.h b/toxcore/tox.api.h index 13330753..c72d9fad 100644 --- a/toxcore/tox.api.h +++ b/toxcore/tox.api.h | |||
| @@ -1,27 +1,27 @@ | |||
| 1 | %{ | 1 | %{ |
| 2 | /* tox.h | 2 | /* |
| 3 | * | ||
| 4 | * The Tox public API. | 3 | * The Tox public API. |
| 4 | */ | ||
| 5 | |||
| 6 | /* | ||
| 7 | * Copyright © 2016-2017 The TokTok team. | ||
| 8 | * Copyright © 2013 Tox project. | ||
| 5 | * | 9 | * |
| 6 | * Copyright (C) 2013 Tox project All Rights Reserved. | 10 | * This file is part of Tox, the free peer to peer instant messenger. |
| 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 | * | 11 | * |
| 15 | * Tox is distributed in the hope that it will be useful, | 12 | * Tox is free software: you can redistribute it and/or modify |
| 16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 | * it under the terms of the GNU General Public License as published by |
| 17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 14 | * the Free Software Foundation, either version 3 of the License, or |
| 18 | * GNU General Public License for more details. | 15 | * (at your option) any later version. |
| 19 | * | 16 | * |
| 20 | * You should have received a copy of the GNU General Public License | 17 | * Tox is distributed in the hope that it will be useful, |
| 21 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 20 | * GNU General Public License for more details. | ||
| 22 | * | 21 | * |
| 22 | * You should have received a copy of the GNU General Public License | ||
| 23 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 23 | */ | 24 | */ |
| 24 | |||
| 25 | #ifndef TOX_H | 25 | #ifndef TOX_H |
| 26 | #define TOX_H | 26 | #define TOX_H |
| 27 | 27 | ||
diff --git a/toxcore/tox.c b/toxcore/tox.c index 3276d2d5..0acd551b 100644 --- a/toxcore/tox.c +++ b/toxcore/tox.c | |||
| @@ -1,32 +1,32 @@ | |||
| 1 | /* tox.c | 1 | /* |
| 2 | * | ||
| 3 | * The Tox public API. | 2 | * The Tox public API. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2013 Tox project. | ||
| 4 | * | 8 | * |
| 5 | * Copyright (C) 2013 Tox project All Rights Reserved. | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 6 | * | ||
| 7 | * This file is part of Tox. | ||
| 8 | * | ||
| 9 | * Tox is free software: you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | 10 | * |
| 14 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 17 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 18 | * | 15 | * |
| 19 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 21 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | */ | 23 | */ |
| 23 | |||
| 24 | #define _XOPEN_SOURCE 600 | ||
| 25 | |||
| 26 | #ifdef HAVE_CONFIG_H | 24 | #ifdef HAVE_CONFIG_H |
| 27 | #include "config.h" | 25 | #include "config.h" |
| 28 | #endif | 26 | #endif |
| 29 | 27 | ||
| 28 | #define _XOPEN_SOURCE 600 | ||
| 29 | |||
| 30 | #define TOX_DEFINED | 30 | #define TOX_DEFINED |
| 31 | typedef struct Messenger Tox; | 31 | typedef struct Messenger Tox; |
| 32 | #include "tox.h" | 32 | #include "tox.h" |
diff --git a/toxcore/tox.h b/toxcore/tox.h index bd8dfa7b..eb644ef8 100644 --- a/toxcore/tox.h +++ b/toxcore/tox.h | |||
| @@ -1,26 +1,26 @@ | |||
| 1 | /* tox.h | 1 | /* |
| 2 | * | ||
| 3 | * The Tox public API. | 2 | * The Tox public API. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2013 Tox project. | ||
| 4 | * | 8 | * |
| 5 | * Copyright (C) 2013 Tox project All Rights Reserved. | 9 | * This file is part of Tox, the free peer to peer instant messenger. |
| 6 | * | ||
| 7 | * This file is part of Tox. | ||
| 8 | * | ||
| 9 | * Tox is free software: you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation, either version 3 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | 10 | * |
| 14 | * Tox is distributed in the hope that it will be useful, | 11 | * Tox is free software: you can redistribute it and/or modify |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * it under the terms of the GNU General Public License as published by |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * the Free Software Foundation, either version 3 of the License, or |
| 17 | * GNU General Public License for more details. | 14 | * (at your option) any later version. |
| 18 | * | 15 | * |
| 19 | * You should have received a copy of the GNU General Public License | 16 | * Tox is distributed in the hope that it will be useful, |
| 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 21 | * | 20 | * |
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | */ | 23 | */ |
| 23 | |||
| 24 | #ifndef TOX_H | 24 | #ifndef TOX_H |
| 25 | #define TOX_H | 25 | #define TOX_H |
| 26 | 26 | ||
diff --git a/toxcore/util.c b/toxcore/util.c index b390b169..e1bbf4db 100644 --- a/toxcore/util.c +++ b/toxcore/util.c | |||
| @@ -1,33 +1,34 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * util.c -- Utilities. | 2 | * Utilities. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2013 Tox project. | ||
| 8 | * Copyright © 2013 plutooo | ||
| 3 | * | 9 | * |
| 10 | * This file is part of Tox, the free peer to peer instant messenger. | ||
| 4 | * This file is donated to the Tox Project. | 11 | * This file is donated to the Tox Project. |
| 5 | * Copyright 2013 plutooo | ||
| 6 | * | ||
| 7 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
| 8 | * | ||
| 9 | * This file is part of Tox. | ||
| 10 | * | 12 | * |
| 11 | * Tox is free software: you can redistribute it and/or modify | 13 | * Tox is free software: you can redistribute it and/or modify |
| 12 | * it under the terms of the GNU General Public License as published by | 14 | * it under the terms of the GNU General Public License as published by |
| 13 | * the Free Software Foundation, either version 3 of the License, or | 15 | * the Free Software Foundation, either version 3 of the License, or |
| 14 | * (at your option) any later version. | 16 | * (at your option) any later version. |
| 15 | * | 17 | * |
| 16 | * Tox is distributed in the hope that it will be useful, | 18 | * Tox is distributed in the hope that it will be useful, |
| 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 19 | * GNU General Public License for more details. | 21 | * GNU General Public License for more details. |
| 20 | * | 22 | * |
| 21 | * You should have received a copy of the GNU General Public License | 23 | * You should have received a copy of the GNU General Public License |
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 24 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. |
| 23 | */ | 25 | */ |
| 24 | |||
| 25 | #define _XOPEN_SOURCE 600 | ||
| 26 | |||
| 27 | #ifdef HAVE_CONFIG_H | 26 | #ifdef HAVE_CONFIG_H |
| 28 | #include "config.h" | 27 | #include "config.h" |
| 29 | #endif | 28 | #endif |
| 30 | 29 | ||
| 30 | #define _XOPEN_SOURCE 600 | ||
| 31 | |||
| 31 | #include "util.h" | 32 | #include "util.h" |
| 32 | 33 | ||
| 33 | #include "crypto_core.h" /* for CRYPTO_PUBLIC_KEY_SIZE */ | 34 | #include "crypto_core.h" /* for CRYPTO_PUBLIC_KEY_SIZE */ |
diff --git a/toxcore/util.h b/toxcore/util.h index daa5a26d..8777e191 100644 --- a/toxcore/util.h +++ b/toxcore/util.h | |||
| @@ -1,27 +1,28 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * util.h -- Utilities. | 2 | * Utilities. |
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * Copyright © 2016-2017 The TokTok team. | ||
| 7 | * Copyright © 2013 Tox project. | ||
| 8 | * Copyright © 2013 plutooo | ||
| 3 | * | 9 | * |
| 10 | * This file is part of Tox, the free peer to peer instant messenger. | ||
| 4 | * This file is donated to the Tox Project. | 11 | * This file is donated to the Tox Project. |
| 5 | * Copyright 2013 plutooo | ||
| 6 | * | 12 | * |
| 7 | * Copyright (C) 2013 Tox project All Rights Reserved. | 13 | * Tox is free software: you can redistribute it and/or modify |
| 14 | * it under the terms of the GNU General Public License as published by | ||
| 15 | * the Free Software Foundation, either version 3 of the License, or | ||
| 16 | * (at your option) any later version. | ||
| 8 | * | 17 | * |
| 9 | * This file is part of Tox. | 18 | * Tox is distributed in the hope that it will be useful, |
| 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 21 | * GNU General Public License for more details. | ||
| 10 | * | 22 | * |
| 11 | * Tox is free software: you can redistribute it and/or modify | 23 | * You should have received a copy of the GNU General Public License |
| 12 | * it under the terms of the GNU General Public License as published by | 24 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. |
| 13 | * the Free Software Foundation, either version 3 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | * Tox is distributed in the hope that it will be useful, | ||
| 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 20 | * | ||
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
| 23 | */ | 25 | */ |
| 24 | |||
| 25 | #ifndef UTIL_H | 26 | #ifndef UTIL_H |
| 26 | #define UTIL_H | 27 | #define UTIL_H |
| 27 | 28 | ||