diff options
90 files changed, 1508 insertions, 1468 deletions
diff --git a/auto_tests/file_saving_test.c b/auto_tests/file_saving_test.c index 05841e0f..643b8fe1 100644 --- a/auto_tests/file_saving_test.c +++ b/auto_tests/file_saving_test.c | |||
@@ -1,27 +1,27 @@ | |||
1 | /* file_saving_test.c | 1 | /* |
2 | * | ||
3 | * Small test for checking if obtaining savedata, saving it to disk and using | 2 | * Small test for checking if obtaining savedata, saving it to disk and using |
4 | * works correctly. | 3 | * works correctly. |
4 | */ | ||
5 | |||
6 | /* | ||
7 | * Copyright © 2016-2017 The TokTok team. | ||
8 | * Copyright © 2016 Tox project. | ||
5 | * | 9 | * |
6 | * Copyright (C) 2016 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 | #include <stdio.h> | 25 | #include <stdio.h> |
26 | #include <stdlib.h> | 26 | #include <stdlib.h> |
27 | #include <string.h> | 27 | #include <string.h> |
diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c index fa71d920..d7e66d33 100644 --- a/other/DHT_bootstrap.c +++ b/other/DHT_bootstrap.c | |||
@@ -1,27 +1,28 @@ | |||
1 | 1 | /* | |
2 | /* DHT boostrap | 2 | * DHT bootstrap |
3 | * | 3 | * |
4 | * A simple DHT boostrap node for tox. | 4 | * A simple DHT boostrap node for tox. |
5 | */ | ||
6 | |||
7 | /* | ||
8 | * Copyright © 2016-2017 The TokTok team. | ||
9 | * Copyright © 2013 Tox project. | ||
5 | * | 10 | * |
6 | * Copyright (C) 2013 Tox project All Rights Reserved. | 11 | * 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 | * | 12 | * |
15 | * Tox is distributed in the hope that it will be useful, | 13 | * Tox is free software: you can redistribute it and/or modify |
16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 | * it under the terms of the GNU General Public License as published by |
17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 15 | * the Free Software Foundation, either version 3 of the License, or |
18 | * GNU General Public License for more details. | 16 | * (at your option) any later version. |
19 | * | 17 | * |
20 | * You should have received a copy of the GNU General Public License | 18 | * Tox is distributed in the hope that it will be useful, |
21 | * 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. | ||
22 | * | 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/>. | ||
23 | */ | 25 | */ |
24 | |||
25 | #define _XOPEN_SOURCE 600 | 26 | #define _XOPEN_SOURCE 600 |
26 | 27 | ||
27 | #ifdef HAVE_CONFIG_H | 28 | #ifdef HAVE_CONFIG_H |
diff --git a/other/bootstrap_daemon/src/command_line_arguments.c b/other/bootstrap_daemon/src/command_line_arguments.c index 262dd4c8..bf7a0f8c 100644 --- a/other/bootstrap_daemon/src/command_line_arguments.c +++ b/other/bootstrap_daemon/src/command_line_arguments.c | |||
@@ -1,27 +1,27 @@ | |||
1 | /* command_line_arguments.c | 1 | /* |
2 | * | ||
3 | * Tox DHT bootstrap daemon. | 2 | * Tox DHT bootstrap daemon. |
4 | * Command line argument handling. | 3 | * Command line argument handling. |
4 | */ | ||
5 | |||
6 | /* | ||
7 | * Copyright © 2016-2017 The TokTok team. | ||
8 | * Copyright © 2015-2016 Tox project. | ||
5 | * | 9 | * |
6 | * Copyright (C) 2015-2016 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 | #include "command_line_arguments.h" | 25 | #include "command_line_arguments.h" |
26 | 26 | ||
27 | #include "global.h" | 27 | #include "global.h" |
diff --git a/other/bootstrap_daemon/src/command_line_arguments.h b/other/bootstrap_daemon/src/command_line_arguments.h index 1d30f428..d2c5d077 100644 --- a/other/bootstrap_daemon/src/command_line_arguments.h +++ b/other/bootstrap_daemon/src/command_line_arguments.h | |||
@@ -1,27 +1,27 @@ | |||
1 | /* command_line_arguments.h | 1 | /* |
2 | * | ||
3 | * Tox DHT bootstrap daemon. | 2 | * Tox DHT bootstrap daemon. |
4 | * Command line argument handling. | 3 | * Command line argument handling. |
4 | */ | ||
5 | |||
6 | /* | ||
7 | * Copyright © 2016-2017 The TokTok team. | ||
8 | * Copyright © 2015-2016 Tox project. | ||
5 | * | 9 | * |
6 | * Copyright (C) 2015-2016 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 COMMAND_LINE_ARGUMENTS_H | 25 | #ifndef COMMAND_LINE_ARGUMENTS_H |
26 | #define COMMAND_LINE_ARGUMENTS_H | 26 | #define COMMAND_LINE_ARGUMENTS_H |
27 | 27 | ||
diff --git a/other/bootstrap_daemon/src/config.c b/other/bootstrap_daemon/src/config.c index 1dffc843..aa8978a5 100644 --- a/other/bootstrap_daemon/src/config.c +++ b/other/bootstrap_daemon/src/config.c | |||
@@ -1,27 +1,27 @@ | |||
1 | /* config.c | 1 | /* |
2 | * | ||
3 | * Tox DHT bootstrap daemon. | 2 | * Tox DHT bootstrap daemon. |
4 | * Functionality related to dealing with the config file. | 3 | * Functionality related to dealing with the config file. |
4 | */ | ||
5 | |||
6 | /* | ||
7 | * Copyright © 2016-2017 The TokTok team. | ||
8 | * Copyright © 2014-2016 Tox project. | ||
5 | * | 9 | * |
6 | * Copyright (C) 2014-2016 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 | #include "config.h" | 25 | #include "config.h" |
26 | 26 | ||
27 | #include "config_defaults.h" | 27 | #include "config_defaults.h" |
diff --git a/other/bootstrap_daemon/src/config.h b/other/bootstrap_daemon/src/config.h index 93e7fc49..5ad5caae 100644 --- a/other/bootstrap_daemon/src/config.h +++ b/other/bootstrap_daemon/src/config.h | |||
@@ -1,27 +1,27 @@ | |||
1 | /* config.h | 1 | /* |
2 | * | ||
3 | * Tox DHT bootstrap daemon. | 2 | * Tox DHT bootstrap daemon. |
4 | * Functionality related to dealing with the config file. | 3 | * Functionality related to dealing with the config file. |
4 | */ | ||
5 | |||
6 | /* | ||
7 | * Copyright © 2016-2017 The TokTok team. | ||
8 | * Copyright © 2014-2016 Tox project. | ||
5 | * | 9 | * |
6 | * Copyright (C) 2014-2016 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 CONFIG_H | 25 | #ifndef CONFIG_H |
26 | #define CONFIG_H | 26 | #define CONFIG_H |
27 | 27 | ||
diff --git a/other/bootstrap_daemon/src/config_defaults.h b/other/bootstrap_daemon/src/config_defaults.h index 17bffd3a..89ab3afe 100644 --- a/other/bootstrap_daemon/src/config_defaults.h +++ b/other/bootstrap_daemon/src/config_defaults.h | |||
@@ -1,27 +1,27 @@ | |||
1 | /* config_defaults.h | 1 | /* |
2 | * | ||
3 | * Tox DHT bootstrap daemon. | 2 | * Tox DHT bootstrap daemon. |
4 | * Default config options for when they are missing in the config file. | 3 | * Default config options for when they are missing in the config file. |
4 | */ | ||
5 | |||
6 | /* | ||
7 | * Copyright © 2016-2017 The TokTok team. | ||
8 | * Copyright © 2014-2016 Tox project. | ||
5 | * | 9 | * |
6 | * Copyright (C) 2014-2016 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 CONFIG_DEFAULTS_H | 25 | #ifndef CONFIG_DEFAULTS_H |
26 | #define CONFIG_DEFAULTS_H | 26 | #define CONFIG_DEFAULTS_H |
27 | 27 | ||
diff --git a/other/bootstrap_daemon/src/global.h b/other/bootstrap_daemon/src/global.h index 9ae3ec45..ec579364 100644 --- a/other/bootstrap_daemon/src/global.h +++ b/other/bootstrap_daemon/src/global.h | |||
@@ -1,27 +1,27 @@ | |||
1 | /* global.h | 1 | /* |
2 | * | ||
3 | * Tox DHT bootstrap daemon. | 2 | * Tox DHT bootstrap daemon. |
4 | * Globally used defines. | 3 | * Globally used defines. |
4 | */ | ||
5 | |||
6 | /* | ||
7 | * Copyright © 2016-2017 The TokTok team. | ||
8 | * Copyright © 2014-2016 Tox project. | ||
5 | * | 9 | * |
6 | * Copyright (C) 2014-2016 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 GLOBAL_H | 25 | #ifndef GLOBAL_H |
26 | #define GLOBAL_H | 26 | #define GLOBAL_H |
27 | 27 | ||
diff --git a/other/bootstrap_daemon/src/log.c b/other/bootstrap_daemon/src/log.c index ae418f93..7431838c 100644 --- a/other/bootstrap_daemon/src/log.c +++ b/other/bootstrap_daemon/src/log.c | |||
@@ -1,27 +1,27 @@ | |||
1 | /* log.c | 1 | /* |
2 | * | ||
3 | * Tox DHT bootstrap daemon. | 2 | * Tox DHT bootstrap daemon. |
4 | * Logging utility with support of multipel logging backends. | 3 | * Logging utility with support of multiple logging backends. |
5 | * | 4 | */ |
6 | * Copyright (C) 2015-2016 Tox project All Rights Reserved. | 5 | |
7 | * | 6 | /* |
8 | * This file is part of Tox. | 7 | * Copyright © 2016-2017 The TokTok team. |
8 | * Copyright © 2015-2016 Tox project. | ||
9 | * | 9 | * |
10 | * 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. |
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 | #include "log.h" | 25 | #include "log.h" |
26 | 26 | ||
27 | #include "global.h" | 27 | #include "global.h" |
diff --git a/other/bootstrap_daemon/src/log.h b/other/bootstrap_daemon/src/log.h index cb374968..167047a7 100644 --- a/other/bootstrap_daemon/src/log.h +++ b/other/bootstrap_daemon/src/log.h | |||
@@ -1,27 +1,27 @@ | |||
1 | /* log.h | 1 | /* |
2 | * | ||
3 | * Tox DHT bootstrap daemon. | 2 | * Tox DHT bootstrap daemon. |
4 | * Logging utility with support of multipel logging backends. | 3 | * Logging utility with support of multiple logging backends. |
5 | * | 4 | */ |
6 | * Copyright (C) 2015-2016 Tox project All Rights Reserved. | 5 | |
7 | * | 6 | /* |
8 | * This file is part of Tox. | 7 | * Copyright © 2016-2017 The TokTok team. |
8 | * Copyright © 2015-2016 Tox project. | ||
9 | * | 9 | * |
10 | * 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. |
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 LOG_H | 25 | #ifndef LOG_H |
26 | #define LOG_H | 26 | #define LOG_H |
27 | 27 | ||
diff --git a/other/bootstrap_daemon/src/tox-bootstrapd.c b/other/bootstrap_daemon/src/tox-bootstrapd.c index a0504eee..1c4b11b6 100644 --- a/other/bootstrap_daemon/src/tox-bootstrapd.c +++ b/other/bootstrap_daemon/src/tox-bootstrapd.c | |||
@@ -1,27 +1,27 @@ | |||
1 | /* tox-bootstrapd.c | 1 | /* |
2 | * | ||
3 | * Tox DHT bootstrap daemon. | 2 | * Tox DHT bootstrap daemon. |
4 | * Main file. | 3 | * Main file. |
4 | */ | ||
5 | |||
6 | /* | ||
7 | * Copyright © 2016-2017 The TokTok team. | ||
8 | * Copyright © 2014-2016 Tox project. | ||
5 | * | 9 | * |
6 | * Copyright (C) 2014-2016 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 | #define _XOPEN_SOURCE 600 | 25 | #define _XOPEN_SOURCE 600 |
26 | 26 | ||
27 | // system provided | 27 | // system provided |
diff --git a/other/bootstrap_node_packets.c b/other/bootstrap_node_packets.c index 8abbb7f2..09404d6e 100644 --- a/other/bootstrap_node_packets.c +++ b/other/bootstrap_node_packets.c | |||
@@ -1,28 +1,28 @@ | |||
1 | /* bootstrap_node_packets.c | 1 | /* |
2 | * | ||
3 | * Special bootstrap node only packets. | 2 | * Special bootstrap node only packets. |
4 | * | 3 | * |
5 | * Include it in your bootstrap node and use: bootstrap_set_callbacks() to enable. | 4 | * Include it in your bootstrap node and use: bootstrap_set_callbacks() to enable. |
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 | #include "bootstrap_node_packets.h" | 26 | #include "bootstrap_node_packets.h" |
27 | 27 | ||
28 | #define INFO_REQUEST_PACKET_LENGTH 78 | 28 | #define INFO_REQUEST_PACKET_LENGTH 78 |
diff --git a/other/bootstrap_node_packets.h b/other/bootstrap_node_packets.h index 43356e7b..c213253c 100644 --- a/other/bootstrap_node_packets.h +++ b/other/bootstrap_node_packets.h | |||
@@ -1,28 +1,28 @@ | |||
1 | /* bootstrap_node_packets.h | 1 | /* |
2 | * | ||
3 | * Special bootstrap node only packets. | 2 | * Special bootstrap node only packets. |
4 | * | 3 | * |
5 | * Include it in your bootstrap node and use: bootstrap_set_callbacks() to enable. | 4 | * Include it in your bootstrap node and use: bootstrap_set_callbacks() to enable. |
5 | */ | ||
6 | |||
7 | /* | ||
8 | * Copyright © 2016-2017 The TokTok team. | ||
9 | * Copyright © 2015 Tox project. | ||
6 | * | 10 | * |
7 | * Copyright (C) 2015 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 BOOTSTRAP_NODE_PACKETS_H | 26 | #ifndef BOOTSTRAP_NODE_PACKETS_H |
27 | #define BOOTSTRAP_NODE_PACKETS_H | 27 | #define BOOTSTRAP_NODE_PACKETS_H |
28 | 28 | ||
diff --git a/testing/DHT_test.c b/testing/DHT_test.c index 6d20d550..1fbe6def 100644 --- a/testing/DHT_test.c +++ b/testing/DHT_test.c | |||
@@ -7,26 +7,27 @@ | |||
7 | * EX: ./test 127.0.0.1 33445 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA | 7 | * EX: ./test 127.0.0.1 33445 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |
8 | * | 8 | * |
9 | * The test will then ask you for the id (in hex format) of the friend you wish to add | 9 | * The test will then ask you for the id (in hex format) of the friend you wish to add |
10 | */ | ||
11 | |||
12 | /* | ||
13 | * Copyright © 2016-2017 The TokTok team. | ||
14 | * Copyright © 2013 Tox project. | ||
10 | * | 15 | * |
11 | * Copyright (C) 2013 Tox project All Rights Reserved. | 16 | * This file is part of Tox, the free peer to peer instant messenger. |
12 | * | ||
13 | * This file is part of Tox. | ||
14 | * | ||
15 | * Tox is free software: you can redistribute it and/or modify | ||
16 | * it under the terms of the GNU General Public License as published by | ||
17 | * the Free Software Foundation, either version 3 of the License, or | ||
18 | * (at your option) any later version. | ||
19 | * | 17 | * |
20 | * Tox is distributed in the hope that it will be useful, | 18 | * Tox is free software: you can redistribute it and/or modify |
21 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 19 | * it under the terms of the GNU General Public License as published by |
22 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 20 | * the Free Software Foundation, either version 3 of the License, or |
23 | * GNU General Public License for more details. | 21 | * (at your option) any later version. |
24 | * | 22 | * |
25 | * You should have received a copy of the GNU General Public License | 23 | * Tox is distributed in the hope that it will be useful, |
26 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 24 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
25 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
26 | * GNU General Public License for more details. | ||
27 | * | 27 | * |
28 | * You should have received a copy of the GNU General Public License | ||
29 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
28 | */ | 30 | */ |
29 | |||
30 | #define _XOPEN_SOURCE 600 | 31 | #define _XOPEN_SOURCE 600 |
31 | 32 | ||
32 | #ifdef HAVE_CONFIG_H | 33 | #ifdef HAVE_CONFIG_H |
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c index 695c50ae..467d7988 100644 --- a/testing/Messenger_test.c +++ b/testing/Messenger_test.c | |||
@@ -17,26 +17,27 @@ | |||
17 | * Or the argument can be the path to the save file. | 17 | * Or the argument can be the path to the save file. |
18 | * | 18 | * |
19 | * EX: ./test Save.bak | 19 | * EX: ./test Save.bak |
20 | */ | ||
21 | |||
22 | /* | ||
23 | * Copyright © 2016-2017 The TokTok team. | ||
24 | * Copyright © 2013 Tox project. | ||
20 | * | 25 | * |
21 | * Copyright (C) 2013 Tox project All Rights Reserved. | 26 | * This file is part of Tox, the free peer to peer instant messenger. |
22 | * | ||
23 | * This file is part of Tox. | ||
24 | * | ||
25 | * Tox is free software: you can redistribute it and/or modify | ||
26 | * it under the terms of the GNU General Public License as published by | ||
27 | * the Free Software Foundation, either version 3 of the License, or | ||
28 | * (at your option) any later version. | ||
29 | * | 27 | * |
30 | * Tox is distributed in the hope that it will be useful, | 28 | * Tox is free software: you can redistribute it and/or modify |
31 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 29 | * it under the terms of the GNU General Public License as published by |
32 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 30 | * the Free Software Foundation, either version 3 of the License, or |
33 | * GNU General Public License for more details. | 31 | * (at your option) any later version. |
34 | * | 32 | * |
35 | * You should have received a copy of the GNU General Public License | 33 | * Tox is distributed in the hope that it will be useful, |
36 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 34 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
35 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
36 | * GNU General Public License for more details. | ||
37 | * | 37 | * |
38 | * You should have received a copy of the GNU General Public License | ||
39 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
38 | */ | 40 | */ |
39 | |||
40 | #define _XOPEN_SOURCE 600 | 41 | #define _XOPEN_SOURCE 600 |
41 | 42 | ||
42 | #ifdef HAVE_CONFIG_H | 43 | #ifdef HAVE_CONFIG_H |
diff --git a/testing/av_test.c b/testing/av_test.c index aeb661be..8aaebfe7 100644 --- a/testing/av_test.c +++ b/testing/av_test.c | |||
@@ -1,27 +1,28 @@ | |||
1 | /** av_test.c | 1 | /* |
2 | * | 2 | * Compile with (Linux only; in newly created directory toxcore/dir_name): |
3 | * Copyright (C) 2013-2015 Tox project All Rights Reserved. | 3 | * gcc -o av_test ../toxav/av_test.c ../build/.libs/libtox*.a -lopencv_core \ |
4 | * | 4 | * -lopencv_highgui -lopencv_imgproc -lsndfile -pthread -lvpx -lopus -lsodium -lportaudio |
5 | * This file is part of Tox. | 5 | */ |
6 | |||
7 | /* | ||
8 | * Copyright © 2016-2017 The TokTok team. | ||
9 | * Copyright © 2013-2015 Tox project. | ||
6 | * | 10 | * |
7 | * Tox is free software: you can redistribute it and/or modify | 11 | * 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 | * | 12 | * |
12 | * Tox is distributed in the hope that it will be useful, | 13 | * Tox is free software: you can redistribute it and/or modify |
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 | * it under the terms of the GNU General Public License as published by |
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 15 | * the Free Software Foundation, either version 3 of the License, or |
15 | * GNU General Public License for more details. | 16 | * (at your option) any later version. |
16 | * | 17 | * |
17 | * You should have received a copy of the GNU General Public License | 18 | * Tox is distributed in the hope that it will be useful, |
18 | * 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. | ||
19 | * | 22 | * |
20 | * Compile with (Linux only; in newly created directory toxcore/dir_name): | 23 | * You should have received a copy of the GNU General Public License |
21 | * gcc -o av_test ../toxav/av_test.c ../build/.libs/libtox*.a -lopencv_core \ | 24 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. |
22 | * -lopencv_highgui -lopencv_imgproc -lsndfile -pthread -lvpx -lopus -lsodium -lportaudio | ||
23 | */ | 25 | */ |
24 | |||
25 | #define _XOPEN_SOURCE 600 | 26 | #define _XOPEN_SOURCE 600 |
26 | 27 | ||
27 | #ifdef __cplusplus | 28 | #ifdef __cplusplus |
diff --git a/testing/dns3_test.c b/testing/dns3_test.c index 7356bc00..a2c0ea5b 100644 --- a/testing/dns3_test.c +++ b/testing/dns3_test.c | |||
@@ -1,5 +1,3 @@ | |||
1 | |||
2 | |||
3 | #include "../toxcore/network.h" | 1 | #include "../toxcore/network.h" |
4 | #include "../toxcore/tox.h" | 2 | #include "../toxcore/tox.h" |
5 | #include "../toxdns/toxdns.h" | 3 | #include "../toxdns/toxdns.h" |
diff --git a/testing/misc_tools.c b/testing/misc_tools.c index 8798c6dd..5a110b51 100644 --- a/testing/misc_tools.c +++ b/testing/misc_tools.c | |||
@@ -1,26 +1,26 @@ | |||
1 | /* misc_tools.c | 1 | /* |
2 | * | ||
3 | * Miscellaneous functions and data structures for doing random things. | 2 | * Miscellaneous functions and data structures for doing random things. |
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/testing/nTox.c b/testing/nTox.c index 88a80dac..160aef29 100644 --- a/testing/nTox.c +++ b/testing/nTox.c | |||
@@ -1,24 +1,25 @@ | |||
1 | /* nTox.c | 1 | /* |
2 | * | ||
3 | * Textual frontend for Tox. | 2 | * Textual frontend for Tox. |
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 | #ifdef HAVE_CONFIG_H | 24 | #ifdef HAVE_CONFIG_H |
24 | #include "config.h" | 25 | #include "config.h" |
diff --git a/testing/nTox.h b/testing/nTox.h index 61f86a9b..b1c93895 100644 --- a/testing/nTox.h +++ b/testing/nTox.h | |||
@@ -1,26 +1,26 @@ | |||
1 | /* nTox.h | 1 | /* |
2 | * | 2 | * Textual frontend for Tox. |
3 | *Textual frontend for Tox. | 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 | #ifndef NTOX_H | 24 | #ifndef NTOX_H |
25 | #define NTOX_H | 25 | #define NTOX_H |
26 | 26 | ||
diff --git a/testing/tox_shell.c b/testing/tox_shell.c index d5de3e67..f983f4e9 100644 --- a/testing/tox_shell.c +++ b/testing/tox_shell.c | |||
@@ -5,27 +5,27 @@ | |||
5 | * Command line arguments are the ip, port and public_key of a node (for bootstrapping). | 5 | * Command line arguments are the ip, port and public_key of a node (for bootstrapping). |
6 | * | 6 | * |
7 | * EX: ./test 127.0.0.1 33445 CDCFD319CE3460824B33BE58FD86B8941C9585181D8FBD7C79C5721D7C2E9F7C | 7 | * EX: ./test 127.0.0.1 33445 CDCFD319CE3460824B33BE58FD86B8941C9585181D8FBD7C79C5721D7C2E9F7C |
8 | */ | ||
9 | |||
10 | /* | ||
11 | * Copyright © 2016-2017 The TokTok team. | ||
12 | * Copyright © 2014 Tox project. | ||
8 | * | 13 | * |
14 | * This file is part of Tox, the free peer to peer instant messenger. | ||
9 | * | 15 | * |
10 | * Copyright (C) 2014 Tox project All Rights Reserved. | 16 | * Tox is free software: you can redistribute it and/or modify |
11 | * | 17 | * it under the terms of the GNU General Public License as published by |
12 | * This file is part of Tox. | 18 | * the Free Software Foundation, either version 3 of the License, or |
13 | * | 19 | * (at your option) any later version. |
14 | * Tox is free software: you can redistribute it and/or modify | ||
15 | * it under the terms of the GNU General Public License as published by | ||
16 | * the Free Software Foundation, either version 3 of the License, or | ||
17 | * (at your option) any later version. | ||
18 | * | ||
19 | * Tox is distributed in the hope that it will be useful, | ||
20 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
21 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
22 | * GNU General Public License for more details. | ||
23 | * | 20 | * |
24 | * You should have received a copy of the GNU General Public License | 21 | * Tox is distributed in the hope that it will be useful, |
25 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 22 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
23 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
24 | * GNU General Public License for more details. | ||
26 | * | 25 | * |
26 | * You should have received a copy of the GNU General Public License | ||
27 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
27 | */ | 28 | */ |
28 | |||
29 | #define _XOPEN_SOURCE 600 | 29 | #define _XOPEN_SOURCE 600 |
30 | 30 | ||
31 | #ifdef HAVE_CONFIG_H | 31 | #ifdef HAVE_CONFIG_H |
diff --git a/testing/tox_sync.c b/testing/tox_sync.c index 6ac3dcf0..c719b3ec 100644 --- a/testing/tox_sync.c +++ b/testing/tox_sync.c | |||
@@ -7,27 +7,27 @@ | |||
7 | * EX: ./test 127.0.0.1 33445 CDCFD319CE3460824B33BE58FD86B8941C9585181D8FBD7C79C5721D7C2E9F7C ./sync_folder/ | 7 | * EX: ./test 127.0.0.1 33445 CDCFD319CE3460824B33BE58FD86B8941C9585181D8FBD7C79C5721D7C2E9F7C ./sync_folder/ |
8 | * | 8 | * |
9 | * NOTE: for security purposes, both tox sync instances must manually add each other as friend for it to work. | 9 | * NOTE: for security purposes, both tox sync instances must manually add each other as friend for it to work. |
10 | */ | ||
11 | |||
12 | /* | ||
13 | * Copyright © 2016-2017 The TokTok team. | ||
14 | * Copyright © 2013 Tox project. | ||
10 | * | 15 | * |
16 | * This file is part of Tox, the free peer to peer instant messenger. | ||
11 | * | 17 | * |
12 | * Copyright (C) 2013 Tox project All Rights Reserved. | 18 | * Tox is free software: you can redistribute it and/or modify |
13 | * | 19 | * it under the terms of the GNU General Public License as published by |
14 | * This file is part of Tox. | 20 | * the Free Software Foundation, either version 3 of the License, or |
15 | * | 21 | * (at your option) any later version. |
16 | * Tox is free software: you can redistribute it and/or modify | ||
17 | * it under the terms of the GNU General Public License as published by | ||
18 | * the Free Software Foundation, either version 3 of the License, or | ||
19 | * (at your option) any later version. | ||
20 | * | ||
21 | * Tox is distributed in the hope that it will be useful, | ||
22 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
23 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
24 | * GNU General Public License for more details. | ||
25 | * | 22 | * |
26 | * You should have received a copy of the GNU General Public License | 23 | * Tox is distributed in the hope that it will be useful, |
27 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 24 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
25 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
26 | * GNU General Public License for more details. | ||
28 | * | 27 | * |
28 | * You should have received a copy of the GNU General Public License | ||
29 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
29 | */ | 30 | */ |
30 | |||
31 | #define _XOPEN_SOURCE 600 | 31 | #define _XOPEN_SOURCE 600 |
32 | 32 | ||
33 | #ifdef HAVE_CONFIG_H | 33 | #ifdef HAVE_CONFIG_H |
diff --git a/toxav/audio.c b/toxav/audio.c index f3351ac3..71dc53ea 100644 --- a/toxav/audio.c +++ b/toxav/audio.c | |||
@@ -1,24 +1,22 @@ | |||
1 | /** audio.c | 1 | /* |
2 | * Copyright © 2016-2017 The TokTok team. | ||
3 | * Copyright © 2013-2015 Tox project. | ||
2 | * | 4 | * |
3 | * Copyright (C) 2013-2015 Tox project All Rights Reserved. | 5 | * This file is part of Tox, the free peer to peer instant messenger. |
4 | * | 6 | * |
5 | * This file is part of Tox. | 7 | * Tox is free software: you can redistribute it and/or modify |
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. | ||
6 | * | 11 | * |
7 | * Tox is free software: you can redistribute it and/or modify | 12 | * Tox is distributed in the hope that it will be useful, |
8 | * it under the terms of the GNU General Public License as published by | 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
9 | * the Free Software Foundation, either version 3 of the License, or | 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
10 | * (at your option) any later version. | 15 | * GNU General Public License for more details. |
11 | * | ||
12 | * Tox is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
19 | * | 16 | * |
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
20 | */ | 19 | */ |
21 | |||
22 | #ifdef HAVE_CONFIG_H | 20 | #ifdef HAVE_CONFIG_H |
23 | #include "config.h" | 21 | #include "config.h" |
24 | #endif /* HAVE_CONFIG_H */ | 22 | #endif /* HAVE_CONFIG_H */ |
diff --git a/toxav/audio.h b/toxav/audio.h index 5f9d7f7d..8330a974 100644 --- a/toxav/audio.h +++ b/toxav/audio.h | |||
@@ -1,24 +1,22 @@ | |||
1 | /** audio.h | 1 | /* |
2 | * Copyright © 2016-2017 The TokTok team. | ||
3 | * Copyright © 2013-2015 Tox project. | ||
2 | * | 4 | * |
3 | * Copyright (C) 2013-2015 Tox project All Rights Reserved. | 5 | * This file is part of Tox, the free peer to peer instant messenger. |
4 | * | 6 | * |
5 | * This file is part of Tox. | 7 | * Tox is free software: you can redistribute it and/or modify |
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. | ||
6 | * | 11 | * |
7 | * Tox is free software: you can redistribute it and/or modify | 12 | * Tox is distributed in the hope that it will be useful, |
8 | * it under the terms of the GNU General Public License as published by | 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
9 | * the Free Software Foundation, either version 3 of the License, or | 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
10 | * (at your option) any later version. | 15 | * GNU General Public License for more details. |
11 | * | ||
12 | * Tox is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
19 | * | 16 | * |
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
20 | */ | 19 | */ |
21 | |||
22 | #ifndef AUDIO_H | 20 | #ifndef AUDIO_H |
23 | #define AUDIO_H | 21 | #define AUDIO_H |
24 | 22 | ||
diff --git a/toxav/bwcontroller.c b/toxav/bwcontroller.c index b7390e4a..19d9c719 100644 --- a/toxav/bwcontroller.c +++ b/toxav/bwcontroller.c | |||
@@ -1,24 +1,22 @@ | |||
1 | /** bwcontroller.c | 1 | /* |
2 | * Copyright © 2016-2017 The TokTok team. | ||
3 | * Copyright © 2013-2015 Tox project. | ||
2 | * | 4 | * |
3 | * Copyright (C) 2013-2015 Tox project All Rights Reserved. | 5 | * This file is part of Tox, the free peer to peer instant messenger. |
4 | * | 6 | * |
5 | * This file is part of Tox. | 7 | * Tox is free software: you can redistribute it and/or modify |
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. | ||
6 | * | 11 | * |
7 | * Tox is free software: you can redistribute it and/or modify | 12 | * Tox is distributed in the hope that it will be useful, |
8 | * it under the terms of the GNU General Public License as published by | 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
9 | * the Free Software Foundation, either version 3 of the License, or | 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
10 | * (at your option) any later version. | 15 | * GNU General Public License for more details. |
11 | * | ||
12 | * Tox is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
19 | * | 16 | * |
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
20 | */ | 19 | */ |
21 | |||
22 | #ifdef HAVE_CONFIG_H | 20 | #ifdef HAVE_CONFIG_H |
23 | #include "config.h" | 21 | #include "config.h" |
24 | #endif /* HAVE_CONFIG_H */ | 22 | #endif /* HAVE_CONFIG_H */ |
diff --git a/toxav/bwcontroller.h b/toxav/bwcontroller.h index 9542cde5..43475252 100644 --- a/toxav/bwcontroller.h +++ b/toxav/bwcontroller.h | |||
@@ -1,26 +1,24 @@ | |||
1 | /** bwcontroller.h | 1 | /* |
2 | * Copyright © 2016-2017 The TokTok team. | ||
3 | * Copyright © 2013-2015 Tox project. | ||
2 | * | 4 | * |
3 | * Copyright (C) 2013-2015 Tox project All Rights Reserved. | 5 | * This file is part of Tox, the free peer to peer instant messenger. |
4 | * | 6 | * |
5 | * This file is part of Tox. | 7 | * Tox is free software: you can redistribute it and/or modify |
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. | ||
6 | * | 11 | * |
7 | * Tox is free software: you can redistribute it and/or modify | 12 | * Tox is distributed in the hope that it will be useful, |
8 | * it under the terms of the GNU General Public License as published by | 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
9 | * the Free Software Foundation, either version 3 of the License, or | 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
10 | * (at your option) any later version. | 15 | * GNU General Public License for more details. |
11 | * | ||
12 | * Tox is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
19 | * | 16 | * |
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
20 | */ | 19 | */ |
21 | 20 | #ifndef BWCONROLLER_H | |
22 | #ifndef BWCONROLER_H | 21 | #define BWCONROLLER_H |
23 | #define BWCONROLER_H | ||
24 | 22 | ||
25 | #include "../toxcore/Messenger.h" | 23 | #include "../toxcore/Messenger.h" |
26 | 24 | ||
@@ -35,4 +33,4 @@ void bwc_feed_avg(BWController *bwc, uint32_t bytes); | |||
35 | void bwc_add_lost(BWController *bwc, uint32_t bytes); | 33 | void bwc_add_lost(BWController *bwc, uint32_t bytes); |
36 | void bwc_add_recv(BWController *bwc, uint32_t bytes); | 34 | void bwc_add_recv(BWController *bwc, uint32_t bytes); |
37 | 35 | ||
38 | #endif /* BWCONROLER_H */ | 36 | #endif /* BWCONROLLER_H */ |
diff --git a/toxav/groupav.c b/toxav/groupav.c index e5306f54..6d84b480 100644 --- a/toxav/groupav.c +++ b/toxav/groupav.c | |||
@@ -1,23 +1,22 @@ | |||
1 | /** groupav.h | 1 | /* |
2 | * Copyright © 2016-2017 The TokTok team. | ||
3 | * Copyright © 2014 Tox project. | ||
2 | * | 4 | * |
3 | * Copyright (C) 2014 Tox project All Rights Reserved. | 5 | * This file is part of Tox, the free peer to peer instant messenger. |
4 | * | 6 | * |
5 | * This file is part of Tox. | 7 | * Tox is free software: you can redistribute it and/or modify |
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. | ||
6 | * | 11 | * |
7 | * Tox is free software: you can redistribute it and/or modify | 12 | * Tox is distributed in the hope that it will be useful, |
8 | * it under the terms of the GNU General Public License as published by | 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
9 | * the Free Software Foundation, either version 3 of the License, or | 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
10 | * (at your option) any later version. | 15 | * GNU General Public License for more details. |
11 | * | 16 | * |
12 | * Tox is distributed in the hope that it will be useful, | 17 | * You should have received a copy of the GNU General Public License |
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. |
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
19 | */ | 19 | */ |
20 | |||
21 | #ifdef HAVE_CONFIG_H | 20 | #ifdef HAVE_CONFIG_H |
22 | #include "config.h" | 21 | #include "config.h" |
23 | #endif /* HAVE_CONFIG_H */ | 22 | #endif /* HAVE_CONFIG_H */ |
diff --git a/toxav/groupav.h b/toxav/groupav.h index 1929b17c..71b0f55a 100644 --- a/toxav/groupav.h +++ b/toxav/groupav.h | |||
@@ -1,23 +1,22 @@ | |||
1 | /** groupav.c | 1 | /* |
2 | * Copyright © 2016-2017 The TokTok team. | ||
3 | * Copyright © 2014 Tox project. | ||
2 | * | 4 | * |
3 | * Copyright (C) 2014 Tox project All Rights Reserved. | 5 | * This file is part of Tox, the free peer to peer instant messenger. |
4 | * | 6 | * |
5 | * This file is part of Tox. | 7 | * Tox is free software: you can redistribute it and/or modify |
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. | ||
6 | * | 11 | * |
7 | * Tox is free software: you can redistribute it and/or modify | 12 | * Tox is distributed in the hope that it will be useful, |
8 | * it under the terms of the GNU General Public License as published by | 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
9 | * the Free Software Foundation, either version 3 of the License, or | 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
10 | * (at your option) any later version. | 15 | * GNU General Public License for more details. |
11 | * | 16 | * |
12 | * Tox is distributed in the hope that it will be useful, | 17 | * You should have received a copy of the GNU General Public License |
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. |
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
19 | */ | 19 | */ |
20 | |||
21 | #include "../toxcore/group.h" | 20 | #include "../toxcore/group.h" |
22 | 21 | ||
23 | /* Audio encoding/decoding */ | 22 | /* Audio encoding/decoding */ |
diff --git a/toxav/msi.c b/toxav/msi.c index a6313ba2..197b0d5e 100644 --- a/toxav/msi.c +++ b/toxav/msi.c | |||
@@ -1,25 +1,22 @@ | |||
1 | /** msi.c | 1 | /* |
2 | * Copyright © 2016-2017 The TokTok team. | ||
3 | * Copyright © 2013-2015 Tox project. | ||
2 | * | 4 | * |
3 | * Copyright (C) 2013-2015 Tox project All Rights Reserved. | 5 | * This file is part of Tox, the free peer to peer instant messenger. |
4 | * | 6 | * |
5 | * This file is part of Tox. | 7 | * Tox is free software: you can redistribute it and/or modify |
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. | ||
6 | * | 11 | * |
7 | * Tox is free software: you can redistribute it and/or modify | 12 | * Tox is distributed in the hope that it will be useful, |
8 | * it under the terms of the GNU General Public License as published by | 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
9 | * the Free Software Foundation, either version 3 of the License, or | 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
10 | * (at your option) any later version. | 15 | * GNU General Public License for more details. |
11 | * | ||
12 | * Tox is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
19 | * | 16 | * |
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
20 | */ | 19 | */ |
21 | |||
22 | |||
23 | #ifdef HAVE_CONFIG_H | 20 | #ifdef HAVE_CONFIG_H |
24 | #include "config.h" | 21 | #include "config.h" |
25 | #endif /* HAVE_CONFIG_H */ | 22 | #endif /* HAVE_CONFIG_H */ |
diff --git a/toxav/msi.h b/toxav/msi.h index f5533be5..43ff46d5 100644 --- a/toxav/msi.h +++ b/toxav/msi.h | |||
@@ -1,24 +1,22 @@ | |||
1 | /** msi.h | 1 | /* |
2 | * Copyright © 2016-2017 The TokTok team. | ||
3 | * Copyright © 2013-2015 Tox project. | ||
2 | * | 4 | * |
3 | * Copyright (C) 2013-2015 Tox project All Rights Reserved. | 5 | * This file is part of Tox, the free peer to peer instant messenger. |
4 | * | 6 | * |
5 | * This file is part of Tox. | 7 | * Tox is free software: you can redistribute it and/or modify |
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. | ||
6 | * | 11 | * |
7 | * Tox is free software: you can redistribute it and/or modify | 12 | * Tox is distributed in the hope that it will be useful, |
8 | * it under the terms of the GNU General Public License as published by | 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
9 | * the Free Software Foundation, either version 3 of the License, or | 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
10 | * (at your option) any later version. | 15 | * GNU General Public License for more details. |
11 | * | ||
12 | * Tox is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
19 | * | 16 | * |
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
20 | */ | 19 | */ |
21 | |||
22 | #ifndef MSI_H | 20 | #ifndef MSI_H |
23 | #define MSI_H | 21 | #define MSI_H |
24 | 22 | ||
diff --git a/toxav/ring_buffer.c b/toxav/ring_buffer.c index 94091c54..99be0e8a 100644 --- a/toxav/ring_buffer.c +++ b/toxav/ring_buffer.c | |||
@@ -1,3 +1,24 @@ | |||
1 | /* | ||
2 | * Copyright © 2016-2017 The TokTok team. | ||
3 | * Copyright © 2013 Tox project. | ||
4 | * Copyright © 2013 plutooo | ||
5 | * | ||
6 | * This file is part of Tox, the free peer to peer instant messenger. | ||
7 | * This file is donated to the Tox Project. | ||
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 | */ | ||
1 | #include "ring_buffer.h" | 22 | #include "ring_buffer.h" |
2 | 23 | ||
3 | #include <stdlib.h> | 24 | #include <stdlib.h> |
diff --git a/toxav/ring_buffer.h b/toxav/ring_buffer.h index 42b4479d..036461c1 100644 --- a/toxav/ring_buffer.h +++ b/toxav/ring_buffer.h | |||
@@ -1,3 +1,24 @@ | |||
1 | /* | ||
2 | * Copyright © 2016-2017 The TokTok team. | ||
3 | * Copyright © 2013 Tox project. | ||
4 | * Copyright © 2013 plutooo | ||
5 | * | ||
6 | * This file is part of Tox, the free peer to peer instant messenger. | ||
7 | * This file is donated to the Tox Project. | ||
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 | */ | ||
1 | #ifndef RING_BUFFER_H | 22 | #ifndef RING_BUFFER_H |
2 | #define RING_BUFFER_H | 23 | #define RING_BUFFER_H |
3 | 24 | ||
diff --git a/toxav/rtp.c b/toxav/rtp.c index 1c6bed75..5aff6af2 100644 --- a/toxav/rtp.c +++ b/toxav/rtp.c | |||
@@ -1,24 +1,22 @@ | |||
1 | /** rtp.c | 1 | /* |
2 | * Copyright © 2016-2017 The TokTok team. | ||
3 | * Copyright © 2013-2015 Tox project. | ||
2 | * | 4 | * |
3 | * Copyright (C) 2013-2015 Tox project All Rights Reserved. | 5 | * This file is part of Tox, the free peer to peer instant messenger. |
4 | * | 6 | * |
5 | * This file is part of Tox. | 7 | * Tox is free software: you can redistribute it and/or modify |
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. | ||
6 | * | 11 | * |
7 | * Tox is free software: you can redistribute it and/or modify | 12 | * Tox is distributed in the hope that it will be useful, |
8 | * it under the terms of the GNU General Public License as published by | 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
9 | * the Free Software Foundation, either version 3 of the License, or | 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
10 | * (at your option) any later version. | 15 | * GNU General Public License for more details. |
11 | * | ||
12 | * Tox is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
19 | * | 16 | * |
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
20 | */ | 19 | */ |
21 | |||
22 | #ifdef HAVE_CONFIG_H | 20 | #ifdef HAVE_CONFIG_H |
23 | #include "config.h" | 21 | #include "config.h" |
24 | #endif /* HAVE_CONFIG_H */ | 22 | #endif /* HAVE_CONFIG_H */ |
diff --git a/toxav/rtp.h b/toxav/rtp.h index a6e09d00..26de5764 100644 --- a/toxav/rtp.h +++ b/toxav/rtp.h | |||
@@ -1,24 +1,22 @@ | |||
1 | /** rtp.h | 1 | /* |
2 | * Copyright © 2016-2017 The TokTok team. | ||
3 | * Copyright © 2013-2015 Tox project. | ||
2 | * | 4 | * |
3 | * Copyright (C) 2013-2015 Tox project All Rights Reserved. | 5 | * This file is part of Tox, the free peer to peer instant messenger. |
4 | * | 6 | * |
5 | * This file is part of Tox. | 7 | * Tox is free software: you can redistribute it and/or modify |
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. | ||
6 | * | 11 | * |
7 | * Tox is free software: you can redistribute it and/or modify | 12 | * Tox is distributed in the hope that it will be useful, |
8 | * it under the terms of the GNU General Public License as published by | 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
9 | * the Free Software Foundation, either version 3 of the License, or | 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
10 | * (at your option) any later version. | 15 | * GNU General Public License for more details. |
11 | * | ||
12 | * Tox is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
19 | * | 16 | * |
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
20 | */ | 19 | */ |
21 | |||
22 | #ifndef RTP_H | 20 | #ifndef RTP_H |
23 | #define RTP_H | 21 | #define RTP_H |
24 | 22 | ||
diff --git a/toxav/toxav.api.h b/toxav/toxav.api.h index 6e3e9c17..d6f30c67 100644 --- a/toxav/toxav.api.h +++ b/toxav/toxav.api.h | |||
@@ -1,9 +1,9 @@ | |||
1 | %{ | 1 | %{ |
2 | /* toxav.h | 2 | /* |
3 | * Copyright © 2016-2017 The TokTok team. | ||
4 | * Copyright © 2013-2015 Tox project. | ||
3 | * | 5 | * |
4 | * Copyright (C) 2013-2015 Tox project All Rights Reserved. | 6 | * This file is part of Tox, the free peer to peer instant messenger. |
5 | * | ||
6 | * This file is part of Tox. | ||
7 | * | 7 | * |
8 | * Tox is free software: you can redistribute it and/or modify | 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 | 9 | * it under the terms of the GNU General Public License as published by |
@@ -16,10 +16,8 @@ | |||
16 | * GNU General Public License for more details. | 16 | * GNU General Public License for more details. |
17 | * | 17 | * |
18 | * You should have received a copy of the GNU General Public License | 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/>. | 19 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. |
20 | * | ||
21 | */ | 20 | */ |
22 | |||
23 | #ifndef TOXAV_H | 21 | #ifndef TOXAV_H |
24 | #define TOXAV_H | 22 | #define TOXAV_H |
25 | 23 | ||
diff --git a/toxav/toxav.c b/toxav/toxav.c index 59c0c1e4..0b953650 100644 --- a/toxav/toxav.c +++ b/toxav/toxav.c | |||
@@ -1,24 +1,22 @@ | |||
1 | /** toxav.c | 1 | /* |
2 | * Copyright © 2016-2017 The TokTok team. | ||
3 | * Copyright © 2013-2015 Tox project. | ||
2 | * | 4 | * |
3 | * Copyright (C) 2013-2015 Tox project All Rights Reserved. | 5 | * This file is part of Tox, the free peer to peer instant messenger. |
4 | * | 6 | * |
5 | * This file is part of Tox. | 7 | * Tox is free software: you can redistribute it and/or modify |
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. | ||
6 | * | 11 | * |
7 | * Tox is free software: you can redistribute it and/or modify | 12 | * Tox is distributed in the hope that it will be useful, |
8 | * it under the terms of the GNU General Public License as published by | 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
9 | * the Free Software Foundation, either version 3 of the License, or | 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
10 | * (at your option) any later version. | 15 | * GNU General Public License for more details. |
11 | * | ||
12 | * Tox is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
19 | * | 16 | * |
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
20 | */ | 19 | */ |
21 | |||
22 | #ifdef HAVE_CONFIG_H | 20 | #ifdef HAVE_CONFIG_H |
23 | #include "config.h" | 21 | #include "config.h" |
24 | #endif /* HAVE_CONFIG_H */ | 22 | #endif /* HAVE_CONFIG_H */ |
diff --git a/toxav/toxav.h b/toxav/toxav.h index c019bfb4..2e48d599 100644 --- a/toxav/toxav.h +++ b/toxav/toxav.h | |||
@@ -1,8 +1,8 @@ | |||
1 | /* toxav.h | 1 | /* |
2 | * Copyright © 2016-2017 The TokTok team. | ||
3 | * Copyright © 2013-2015 Tox project. | ||
2 | * | 4 | * |
3 | * Copyright (C) 2013-2015 Tox project All Rights Reserved. | 5 | * This file is part of Tox, the free peer to peer instant messenger. |
4 | * | ||
5 | * This file is part of Tox. | ||
6 | * | 6 | * |
7 | * Tox is free software: you can redistribute it and/or modify | 7 | * Tox is free software: you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License as published by | 8 | * it under the terms of the GNU General Public License as published by |
@@ -15,10 +15,8 @@ | |||
15 | * GNU General Public License for more details. | 15 | * GNU General Public License for more details. |
16 | * | 16 | * |
17 | * You should have received a copy of the GNU General Public License | 17 | * You should have received a copy of the GNU General Public License |
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. |
19 | * | ||
20 | */ | 19 | */ |
21 | |||
22 | #ifndef TOXAV_H | 20 | #ifndef TOXAV_H |
23 | #define TOXAV_H | 21 | #define TOXAV_H |
24 | 22 | ||
diff --git a/toxav/toxav_old.c b/toxav/toxav_old.c index d3e2f30d..21f1ec1c 100644 --- a/toxav/toxav_old.c +++ b/toxav/toxav_old.c | |||
@@ -1,8 +1,8 @@ | |||
1 | /* toxav_old.h | 1 | /* |
2 | * Copyright © 2016-2017 The TokTok team. | ||
3 | * Copyright © 2013-2015 Tox project. | ||
2 | * | 4 | * |
3 | * Copyright (C) 2013-2015 Tox project All Rights Reserved. | 5 | * This file is part of Tox, the free peer to peer instant messenger. |
4 | * | ||
5 | * This file is part of Tox. | ||
6 | * | 6 | * |
7 | * Tox is free software: you can redistribute it and/or modify | 7 | * Tox is free software: you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License as published by | 8 | * it under the terms of the GNU General Public License as published by |
@@ -15,8 +15,7 @@ | |||
15 | * GNU General Public License for more details. | 15 | * GNU General Public License for more details. |
16 | * | 16 | * |
17 | * You should have received a copy of the GNU General Public License | 17 | * You should have received a copy of the GNU General Public License |
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | 18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. |
19 | * | ||
20 | */ | 19 | */ |
21 | /** | 20 | /** |
22 | * This file contains the group chats code for the backwards compatibility. | 21 | * This file contains the group chats code for the backwards compatibility. |
diff --git a/toxav/video.c b/toxav/video.c index 93ebbb16..c84e89f7 100644 --- a/toxav/video.c +++ b/toxav/video.c | |||
@@ -1,24 +1,22 @@ | |||
1 | /** video.c | 1 | /* |
2 | * Copyright © 2016-2017 The TokTok team. | ||
3 | * Copyright © 2013-2015 Tox project. | ||
2 | * | 4 | * |
3 | * Copyright (C) 2013-2015 Tox project All Rights Reserved. | 5 | * This file is part of Tox, the free peer to peer instant messenger. |
4 | * | 6 | * |
5 | * This file is part of Tox. | 7 | * Tox is free software: you can redistribute it and/or modify |
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. | ||
6 | * | 11 | * |
7 | * Tox is free software: you can redistribute it and/or modify | 12 | * Tox is distributed in the hope that it will be useful, |
8 | * it under the terms of the GNU General Public License as published by | 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
9 | * the Free Software Foundation, either version 3 of the License, or | 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
10 | * (at your option) any later version. | 15 | * GNU General Public License for more details. |
11 | * | ||
12 | * Tox is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
19 | * | 16 | * |
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
20 | */ | 19 | */ |
21 | |||
22 | #ifdef HAVE_CONFIG_H | 20 | #ifdef HAVE_CONFIG_H |
23 | #include "config.h" | 21 | #include "config.h" |
24 | #endif /* HAVE_CONFIG_H */ | 22 | #endif /* HAVE_CONFIG_H */ |
diff --git a/toxav/video.h b/toxav/video.h index b82197c6..02670e0a 100644 --- a/toxav/video.h +++ b/toxav/video.h | |||
@@ -1,24 +1,22 @@ | |||
1 | /** video.h | 1 | /* |
2 | * Copyright © 2016-2017 The TokTok team. | ||
3 | * Copyright © 2013-2015 Tox project. | ||
2 | * | 4 | * |
3 | * Copyright (C) 2013-2015 Tox project All Rights Reserved. | 5 | * This file is part of Tox, the free peer to peer instant messenger. |
4 | * | 6 | * |
5 | * This file is part of Tox. | 7 | * Tox is free software: you can redistribute it and/or modify |
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. | ||
6 | * | 11 | * |
7 | * Tox is free software: you can redistribute it and/or modify | 12 | * Tox is distributed in the hope that it will be useful, |
8 | * it under the terms of the GNU General Public License as published by | 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
9 | * the Free Software Foundation, either version 3 of the License, or | 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
10 | * (at your option) any later version. | 15 | * GNU General Public License for more details. |
11 | * | ||
12 | * Tox is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
19 | * | 16 | * |
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
20 | */ | 19 | */ |
21 | |||
22 | #ifndef VIDEO_H | 20 | #ifndef VIDEO_H |
23 | #define VIDEO_H | 21 | #define VIDEO_H |
24 | 22 | ||
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 | ||
diff --git a/toxdns/toxdns.c b/toxdns/toxdns.c index 3f010118..3fb43452 100644 --- a/toxdns/toxdns.c +++ b/toxdns/toxdns.c | |||
@@ -1,26 +1,26 @@ | |||
1 | /* toxdns.c | 1 | /* |
2 | * | ||
3 | * Tox secure username DNS toxid resolving functions. | 2 | * Tox secure username DNS toxid resolving functions. |
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/toxdns/toxdns.h b/toxdns/toxdns.h index 06071b82..b280925e 100644 --- a/toxdns/toxdns.h +++ b/toxdns/toxdns.h | |||
@@ -1,26 +1,26 @@ | |||
1 | /* toxdns.h | 1 | /* |
2 | * | ||
3 | * Tox secure username DNS toxid resolving functions. | 2 | * Tox secure username DNS toxid resolving functions. |
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 | #ifndef TOXDNS_H | 24 | #ifndef TOXDNS_H |
25 | #define TOXDNS_H | 25 | #define TOXDNS_H |
26 | 26 | ||
diff --git a/toxencryptsave/toxencryptsave.api.h b/toxencryptsave/toxencryptsave.api.h index 0356d756..1844edf8 100644 --- a/toxencryptsave/toxencryptsave.api.h +++ b/toxencryptsave/toxencryptsave.api.h | |||
@@ -1,27 +1,27 @@ | |||
1 | %{ | 1 | %{ |
2 | /* toxencryptsave.h | 2 | /* |
3 | * | ||
4 | * Batch encryption functions. | 3 | * Batch encryption functions. |
4 | */ | ||
5 | |||
6 | /* | ||
7 | * Copyright © 2016-2017 The TokTok team. | ||
8 | * Copyright © 2013-2016 Tox Developers. | ||
5 | * | 9 | * |
6 | * Copyright (C) 2013-2016 Tox Developers. 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 TOXENCRYPTSAVE_H | 25 | #ifndef TOXENCRYPTSAVE_H |
26 | #define TOXENCRYPTSAVE_H | 26 | #define TOXENCRYPTSAVE_H |
27 | 27 | ||
diff --git a/toxencryptsave/toxencryptsave.c b/toxencryptsave/toxencryptsave.c index 0c799bfb..27753e11 100644 --- a/toxencryptsave/toxencryptsave.c +++ b/toxencryptsave/toxencryptsave.c | |||
@@ -1,26 +1,26 @@ | |||
1 | /* toxencryptsave.c | 1 | /* |
2 | * | 2 | * Batch encryption functions. |
3 | * The Tox encrypted save functions. | 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/toxencryptsave/toxencryptsave.h b/toxencryptsave/toxencryptsave.h index 13641273..d13ebbc6 100644 --- a/toxencryptsave/toxencryptsave.h +++ b/toxencryptsave/toxencryptsave.h | |||
@@ -1,26 +1,26 @@ | |||
1 | /* toxencryptsave.h | 1 | /* |
2 | * | ||
3 | * Batch encryption functions. | 2 | * Batch encryption functions. |
3 | */ | ||
4 | |||
5 | /* | ||
6 | * Copyright © 2016-2017 The TokTok team. | ||
7 | * Copyright © 2013-2016 Tox Developers. | ||
4 | * | 8 | * |
5 | * Copyright (C) 2013-2016 Tox Developers. 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 TOXENCRYPTSAVE_H | 24 | #ifndef TOXENCRYPTSAVE_H |
25 | #define TOXENCRYPTSAVE_H | 25 | #define TOXENCRYPTSAVE_H |
26 | 26 | ||