]>
git.ipfire.org Git - thirdparty/tor.git/log
Nick Mathewson [Fri, 6 Jul 2018 17:59:40 +0000 (13:59 -0400)]
Move ntmain.c into libtor-app again
It's needed by main.c
Fixes bug 26662; bug not in any released Tor.
Nick Mathewson [Thu, 5 Jul 2018 22:13:06 +0000 (18:13 -0400)]
Merge branch 'split_or_directory'
Nick Mathewson [Thu, 5 Jul 2018 21:10:22 +0000 (17:10 -0400)]
Actually sort the lines in src/core/include.am
Nick Mathewson [Thu, 5 Jul 2018 21:08:26 +0000 (17:08 -0400)]
Whoops. Protover.[ch] belong in src/core/or
Nick Mathewson [Thu, 5 Jul 2018 21:05:54 +0000 (17:05 -0400)]
Fix everything that previously referred to src/or
Nick Mathewson [Thu, 5 Jul 2018 20:52:12 +0000 (16:52 -0400)]
Fix our build system to know the new locations of the src/or stuff
Nick Mathewson [Thu, 5 Jul 2018 20:34:59 +0000 (16:34 -0400)]
Fix every include path changed in the previous commit (automated)
I am very glad to have written this script.
Nick Mathewson [Thu, 5 Jul 2018 20:31:38 +0000 (16:31 -0400)]
Move literally everything out of src/or
This commit won't build yet -- it just puts everything in a slightly
more logical place.
The reasoning here is that "src/core" will hold the stuff that every (or
nearly every) tor instance will need in order to do onion routing.
Other features (including some necessary ones) will live in
"src/feature". The "src/app" directory will hold the stuff needed
to have Tor be an application you can actually run.
This commit DOES NOT refactor the former contents of src/or into a
logical set of acyclic libraries, or change any code at all. That
will have to come in the future.
We will continue to move things around and split them in the future,
but I hope this lays a reasonable groundwork for doing so.
Nick Mathewson [Thu, 5 Jul 2018 20:05:53 +0000 (16:05 -0400)]
Remove ancient unused script that used the old src/or location
Nick Mathewson [Thu, 5 Jul 2018 20:04:32 +0000 (16:04 -0400)]
Start splitting src/or
This is a very gentle commit that just lays the groundwork in the
build system: it puts the include files to build libtor-app.a into
src/core, and to build the tor executable into src/app. The
executable is now "src/app/tor".
Nick Mathewson [Thu, 5 Jul 2018 21:15:24 +0000 (17:15 -0400)]
And tell build.rs to stop looking in src/common
Nick Mathewson [Thu, 5 Jul 2018 21:14:55 +0000 (17:14 -0400)]
Fix build.rs to handle removed common.
Nick Mathewson [Thu, 5 Jul 2018 19:50:20 +0000 (15:50 -0400)]
Fix up .may_includes for evloop.
Nick Mathewson [Thu, 5 Jul 2018 19:44:33 +0000 (15:44 -0400)]
Add a missing include.
Nick Mathewson [Thu, 5 Jul 2018 19:42:55 +0000 (15:42 -0400)]
Merge branch 'destroy_common'
Nick Mathewson [Thu, 5 Jul 2018 19:21:30 +0000 (15:21 -0400)]
Fix fuzzing_include_am.py
Nick Mathewson [Thu, 5 Jul 2018 19:14:04 +0000 (15:14 -0400)]
Clean up include paths for libtor-evloop (automated)
Nick Mathewson [Thu, 5 Jul 2018 19:13:44 +0000 (15:13 -0400)]
All remaining files in src/common belong to the event loop.
Nick Mathewson [Thu, 5 Jul 2018 19:07:08 +0000 (15:07 -0400)]
Move openbsd-malloc responsibility to lib/malloc
(Note that this is not believed to work, but we may as well have it
in the right place till we remove it)
Nick Mathewson [Thu, 5 Jul 2018 19:04:18 +0000 (15:04 -0400)]
Remove util.h
Inline its contents (which were all includes) into or.h, and some of
its contents into other places that didn't include or.h at all.
Nick Mathewson [Thu, 5 Jul 2018 18:51:07 +0000 (14:51 -0400)]
Move address_set to src/or
This is temporary, until src/or is split.
Putting this in containers would be another logical alternative,
except that addresses depend on containers, and we don't like
cycles.
Nick Mathewson [Thu, 5 Jul 2018 18:48:29 +0000 (14:48 -0400)]
Move socks5_status.h to src/lib/net
There might be a better place for it in the long run, but this is
the best I can think of for now.
Nick Mathewson [Thu, 5 Jul 2018 18:45:34 +0000 (14:45 -0400)]
Move handles.h to src/lib/container
There might be a better place for it in the long run, but this is
the best we can think of for now.
Nick Mathewson [Thu, 5 Jul 2018 17:53:17 +0000 (13:53 -0400)]
Include compat_string.h in smartlist.c
We need this for strcasecmp on (some) Windows build environments.
Fix from Gisle Vanem.
Nick Mathewson [Thu, 5 Jul 2018 17:51:48 +0000 (13:51 -0400)]
Try to use stricmp variants that MSDN actually recommends
Per recommendation by Gisle Vanem
Nick Mathewson [Tue, 3 Jul 2018 17:31:26 +0000 (13:31 -0400)]
Merge branch 'maint-0.3.4'
Nick Mathewson [Tue, 3 Jul 2018 17:16:37 +0000 (13:16 -0400)]
Merge remote-tracking branch 'github/bug26568_034' into maint-0.3.4
Nick Mathewson [Tue, 3 Jul 2018 16:52:43 +0000 (12:52 -0400)]
Merge remote-tracking branch 'github/ticket26626'
Nick Mathewson [Tue, 3 Jul 2018 15:34:36 +0000 (11:34 -0400)]
Merge branch 'bug26522'
rl1987 [Tue, 3 Jul 2018 10:36:15 +0000 (13:36 +0300)]
Refrain from potentially insecure usage of strncat()
Nick Mathewson [Tue, 3 Jul 2018 15:09:54 +0000 (11:09 -0400)]
Merge remote-tracking branch 'github/shrink_or_h_more'
Nick Mathewson [Tue, 3 Jul 2018 15:00:18 +0000 (11:00 -0400)]
Fix up some windows compilation issues.
These were mostly cases where our previous macros had been casting,
and the values that we were trying to printf were not in fact
uint64_t.
Nick Mathewson [Tue, 3 Jul 2018 14:43:43 +0000 (10:43 -0400)]
Retire U64_TO_DBL and DBL_TO_U64
These were necessary long ago to work around a bug in VC6.
Nick Mathewson [Tue, 3 Jul 2018 14:40:59 +0000 (10:40 -0400)]
Return U64_PRINTF_ARG and U64_FORMAT
The standard is printf("%"PRIu64, x);
Nick Mathewson [Tue, 3 Jul 2018 14:33:50 +0000 (10:33 -0400)]
Replace U64_LITERAL with the standard UINT64_C
Nick Mathewson [Tue, 3 Jul 2018 14:31:19 +0000 (10:31 -0400)]
Retire some unused (or nearly unused) macros.
Nick Mathewson [Tue, 3 Jul 2018 14:28:10 +0000 (10:28 -0400)]
Use the standard SHRT_MAX name.
Nick Mathewson [Tue, 3 Jul 2018 14:26:06 +0000 (10:26 -0400)]
Clean up various things that broke with our stdint.h changes
Casting before printf was necessary; now it's not so smart.
We don't have SIZEOF_UINT8_T any more.
Nick Mathewson [Tue, 3 Jul 2018 14:25:31 +0000 (10:25 -0400)]
Require stdint.h and inttypes.h
We've been silently requiring stdint.h for a while now, and nobody
has complained. Closes ticket 26626.
Nick Mathewson [Tue, 3 Jul 2018 13:53:46 +0000 (09:53 -0400)]
Merge remote-tracking branch 'rl1987/ticket26527'
Nick Mathewson [Tue, 3 Jul 2018 13:48:03 +0000 (09:48 -0400)]
Merge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Tue, 3 Jul 2018 13:48:03 +0000 (09:48 -0400)]
Merge branch 'maint-0.3.4'
Nick Mathewson [Tue, 3 Jul 2018 13:48:03 +0000 (09:48 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Tue, 3 Jul 2018 13:48:03 +0000 (09:48 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Tue, 3 Jul 2018 13:48:00 +0000 (09:48 -0400)]
Merge branch 'bug26535_032' into maint-0.3.2
Nick Mathewson [Tue, 3 Jul 2018 13:47:41 +0000 (09:47 -0400)]
Merge branch 'bug26535_029' into maint-0.2.9
rl1987 [Tue, 3 Jul 2018 09:33:09 +0000 (12:33 +0300)]
Remove ATTR_NONNULL macro
Nick Mathewson [Mon, 2 Jul 2018 20:11:02 +0000 (16:11 -0400)]
Partially revert "Use tor_addr_from_getsockname() in several places"
This reverts part of commit
6ed384b827dce21ea3a44b587 , in order to
fix bug 26568. Bugfix on 0.3.4.1-alpha.
Nick Mathewson [Mon, 2 Jul 2018 18:04:46 +0000 (14:04 -0400)]
hs_ntor_ref.py: pass only strings to subprocess.Popen
Recent Python3 versions seem to require this on Windows.
Fixes bug 26535; bug copied from ntor_ref.py on 0.3.1.1-alpha.
Nick Mathewson [Mon, 2 Jul 2018 18:04:46 +0000 (14:04 -0400)]
ntor_ref.py: pass only strings to subprocess.Popen
Recent Python3 versions seem to require this on Windows.
Fixes bug 26535; bug introduced in
f4be34f70d6f277a0f3f73e , which
was apparently intended itself as a Python3 workaround.
Nick Mathewson [Mon, 2 Jul 2018 17:38:47 +0000 (13:38 -0400)]
Merge branch 'maint-0.3.4'
Nick Mathewson [Mon, 2 Jul 2018 17:38:40 +0000 (13:38 -0400)]
Merge remote-tracking branch 'catalyst-github/bug26449_034' into maint-0.3.4
Nick Mathewson [Mon, 2 Jul 2018 17:22:14 +0000 (13:22 -0400)]
Merge branch 'maint-0.3.4'
Nick Mathewson [Mon, 2 Jul 2018 17:22:07 +0000 (13:22 -0400)]
Merge branch 'mikeperry_bug26214-rebased_squashed' into maint-0.3.4
Nick Mathewson [Mon, 2 Jul 2018 16:22:37 +0000 (12:22 -0400)]
Merge remote-tracking branch 'catalyst-github/moar-libs'
Nick Mathewson [Mon, 2 Jul 2018 16:11:16 +0000 (12:11 -0400)]
Merge branch 'bug26594'
Nick Mathewson [Mon, 2 Jul 2018 15:50:17 +0000 (11:50 -0400)]
Don't redefine str(n)casecmp on windows unless they're missing
When we do redefine them, use inline functions instead of #define.
This fixes a latent code problem in our redefinition of these
functions, which was exposed by our refactoring: Previously, we
would #define strcasecmp after string.h was included, so nothing bad
would happen. But when we refactored, we would sometimes #define it
first, which was a problem on mingw, whose headers contain
(approximately):
inline int strcasecmp (const char *a, const char *b)
{ return _stricmp(a,b); }
Our define turned this into:
inline int _stricmp(const char *a, const char *b)
{ return _stricmp(a,b); }
And GCC would correctly infer that this function would loop forever,
rather than actually comparing anything. This caused bug 26594.
Fixes bug 26594; bug not in any released version of Tor.
Nick Mathewson [Mon, 2 Jul 2018 00:22:55 +0000 (20:22 -0400)]
File-level documentation for some of src/lib.
Nick Mathewson [Sun, 1 Jul 2018 22:14:28 +0000 (18:14 -0400)]
Prune the .may_include files a bit; detect unused lines in them
Nick Mathewson [Sun, 1 Jul 2018 20:02:33 +0000 (16:02 -0400)]
fixup! Extract or_options_t from or.h
Nick Mathewson [Sun, 1 Jul 2018 19:31:18 +0000 (15:31 -0400)]
fixup! Remove system headers from or.h
Nick Mathewson [Sun, 1 Jul 2018 19:02:01 +0000 (15:02 -0400)]
Remove system headers from or.h
Nick Mathewson [Sun, 1 Jul 2018 18:58:29 +0000 (14:58 -0400)]
Extract or_options_t from or.h
I decided to have this file included from config.h, though, since it
is used nearly everywhere.
Nick Mathewson [Sun, 1 Jul 2018 18:51:53 +0000 (14:51 -0400)]
Extract or_state_t to its own header.
Fewer modules needed this than I had expected.
Nick Mathewson [Sun, 1 Jul 2018 18:44:04 +0000 (14:44 -0400)]
Pull a couple more enums from or.h
Nick Mathewson [Sun, 1 Jul 2018 18:34:52 +0000 (14:34 -0400)]
Move ext_or_cmd_t to proto_ext_or
Nick Mathewson [Sun, 1 Jul 2018 18:16:25 +0000 (14:16 -0400)]
Extract more constants from or.h
Nick Mathewson [Sun, 1 Jul 2018 18:00:37 +0000 (14:00 -0400)]
Extract addr_policy_t into a new header.
Nick Mathewson [Sun, 1 Jul 2018 17:43:11 +0000 (13:43 -0400)]
Extract various enums and tiny structs from or.h
These all have a logical header to go in.
Nick Mathewson [Sun, 1 Jul 2018 17:04:21 +0000 (13:04 -0400)]
Minimize headers that include crypto_formats and x25519 stuff
Nick Mathewson [Sun, 1 Jul 2018 16:06:52 +0000 (12:06 -0400)]
Remove other needless includes include from or/*.h
Nick Mathewson [Sun, 1 Jul 2018 15:32:11 +0000 (11:32 -0400)]
Remove needless includes from or.h
or.h should really include only the minimum of stuff from or/*,
common/*, and lib/*.
Nick Mathewson [Sun, 1 Jul 2018 15:25:29 +0000 (11:25 -0400)]
Combine DH_BYTES and DH_KEY_LEN; put them in a lib/defs header.
Nick Mathewson [Sun, 1 Jul 2018 14:22:21 +0000 (10:22 -0400)]
Merge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Sun, 1 Jul 2018 14:22:21 +0000 (10:22 -0400)]
Merge branch 'maint-0.3.4'
Nick Mathewson [Sun, 1 Jul 2018 14:22:18 +0000 (10:22 -0400)]
Merge remote-tracking branch 'dgoulet/bug26523_033_01' into maint-0.3.3
Nick Mathewson [Sun, 1 Jul 2018 14:18:48 +0000 (10:18 -0400)]
Update the coverage script to look at new file locations
Nick Mathewson [Sun, 1 Jul 2018 14:08:54 +0000 (10:08 -0400)]
Add make targets to show static libraries.
These might make it easier for people to link our stuff, and keep
their scripts more robust.
Nick Mathewson [Sun, 1 Jul 2018 13:37:28 +0000 (09:37 -0400)]
Tabify all of the .am files.
Nick Mathewson [Sat, 30 Jun 2018 13:15:39 +0000 (09:15 -0400)]
Merge branch 'maint-0.3.4'
Nick Mathewson [Sat, 30 Jun 2018 13:15:34 +0000 (09:15 -0400)]
Merge remote-tracking branch 'catalyst-github/bug25895_034-squashed' into maint-0.3.4
Nick Mathewson [Sat, 30 Jun 2018 03:12:03 +0000 (23:12 -0400)]
Merge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Sat, 30 Jun 2018 03:12:03 +0000 (23:12 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Sat, 30 Jun 2018 03:12:03 +0000 (23:12 -0400)]
Merge branch 'maint-0.3.4'
Nick Mathewson [Sat, 30 Jun 2018 03:12:03 +0000 (23:12 -0400)]
Merge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Sat, 30 Jun 2018 03:11:47 +0000 (23:11 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Mon, 18 Jun 2018 20:10:47 +0000 (16:10 -0400)]
Finally remove our EOL@EOF check.
This check was added by mistake long ago. It will be nice to see
these EOLs disappear from our code over time.
(backport from master)
Nick Mathewson [Sat, 30 Jun 2018 03:08:45 +0000 (23:08 -0400)]
Restor EOL@EOF in routerlist.c
Nick Mathewson [Fri, 29 Jun 2018 23:17:24 +0000 (19:17 -0400)]
Add another winsock2 include, for timeval in procmon.
Nick Mathewson [Fri, 29 Jun 2018 18:03:13 +0000 (14:03 -0400)]
add an include to fix macos, and probably bsd too
Nick Mathewson [Fri, 29 Jun 2018 17:49:43 +0000 (13:49 -0400)]
Merge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Fri, 29 Jun 2018 17:49:43 +0000 (13:49 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 29 Jun 2018 17:49:43 +0000 (13:49 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Fri, 29 Jun 2018 17:49:43 +0000 (13:49 -0400)]
Merge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 29 Jun 2018 17:49:43 +0000 (13:49 -0400)]
Merge branch 'maint-0.3.4'
Nick Mathewson [Fri, 29 Jun 2018 17:49:02 +0000 (13:49 -0400)]
Fix a memory error in test_shared_random
Bug not in any released Tor.
Nick Mathewson [Fri, 29 Jun 2018 17:48:36 +0000 (13:48 -0400)]
Fix some memory errors in the recent coverity fixes.
Found by asan on travis :/
Nick Mathewson [Fri, 29 Jun 2018 17:07:13 +0000 (13:07 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 29 Jun 2018 17:07:13 +0000 (13:07 -0400)]
Merge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 29 Jun 2018 17:07:13 +0000 (13:07 -0400)]
Merge branch 'maint-0.3.4'