Nick Mathewson
45b911b79b
Add pkg.m4 to use pkgconfig macros
2014-12-23 11:39:48 -05:00
Nick Mathewson
6285d9bdcf
Fix compilation on platforms without IP6T_SO_ORIGINAL_DST
2014-12-23 11:36:27 -05:00
Nick Mathewson
9545569d73
Merge branch 'ticket11016'
2014-12-23 11:32:22 -05:00
Nick Mathewson
7e1289b3ec
changes file for ticket11016
2014-12-23 11:32:10 -05:00
Nick Mathewson
2f46e5e755
Adjust systemd watchdog support
...
Document why we divide it by two.
Check for > 0 instead of nonzero for success, since that's what the
manpage says.
Allow watchdog timers greater than 1 second.
2014-12-23 11:27:18 -05:00
Michael Scherer
29ac883606
Add support for systemd watchdog protocol
...
It work by notifying systemd on a regular basis. If
there is no notification, the daemon is restarted.
This requires a version newer than the 209 version
of systemd, as it is not supported before.
2014-12-23 11:22:42 -05:00
Michael Scherer
aabaed6f49
add support for systemd notification protocol
...
This permit for now to signal readiness in a cleaner way
to systemd.
2014-12-23 11:06:01 -05:00
Nick Mathewson
c6ac752353
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-12-23 11:00:02 -05:00
Nick Mathewson
dfebefe68f
changs file for 13808
2014-12-23 10:59:48 -05:00
Nick Mathewson
184a2dbbdd
whoops; missing changes file for 14013
2014-12-23 10:55:25 -05:00
Nick Mathewson
d151a069e9
tweak whitespace; log bad socket family if bug occurs
2014-12-23 10:53:40 -05:00
Francisco Blas Izquierdo Riera (klondike)
cca6ed80bf
Add the transparent proxy getsockopt to the sandbox
...
When receiving a trasnsparently proxied request with tor using iptables tor
dies because the appropriate getsockopt calls aren't enabled on the sandbox.
This patch fixes this by adding the two getsockopt calls used when doing
transparent proxying with tor to the sandbox for the getsockopt policy.
This patch is released under the same license as the original file as
long as the author is credited.
Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org>
2014-12-23 10:51:36 -05:00
Francisco Blas Izquierdo Riera (klondike)
39e71d8fa5
Use the appropriate call to getsockopt for IPv6 sockets
...
The original call to getsockopt to know the original address on transparently
proxyed sockets using REDIRECT in iptables failed with IPv6 addresses because
it assumed all sockets used IPv4.
This patch fixes this by using the appropriate options and adding the headers
containing the needed definitions for these.
This patch is released under the same license as the original file as
long as the author iscredited.
Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org>
2014-12-23 10:51:33 -05:00
Nick Mathewson
808e2b856b
Tweak channel unit tests so we don't see coverity complaints
...
channel_write_*_cell() can delete its argument, so coverity doesn't
like us doing pointer comparison against that argument later.
Silly.
2014-12-22 16:06:05 -05:00
Nick Mathewson
0965bbd5ac
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-12-22 16:02:47 -05:00
Nick Mathewson
6d728ba880
Merge remote-tracking branch 'public/bug14013_024' into maint-0.2.5
2014-12-22 15:58:49 -05:00
Nick Mathewson
47760c7ba5
When decoding a base-{16,32,64} value, clear the target buffer first
...
This is a good idea in case the caller stupidly doesn't check the
return value from baseX_decode(), and as a workaround for the
current inconsistent API of base16_decode.
Prevents any fallout from bug 14013.
2014-12-22 12:56:35 -05:00
Nick Mathewson
03d2df62f6
Fix a bunch of memory leaks in the unit tests. Found with valgrind
2014-12-22 12:27:26 -05:00
Nick Mathewson
b94cb401d2
Coverity complained that we were not checking this return value
2014-12-22 11:13:11 -05:00
Nick Mathewson
13f26f41e4
Fix some coverity issues in the unit tests
2014-12-22 11:13:01 -05:00
Nick Mathewson
ec07c3c5c5
Reflow the changelog again
2014-12-22 10:54:09 -05:00
Nick Mathewson
fe0ecdcfed
Rewrite some changelog entries
2014-12-22 10:53:52 -05:00
Nick Mathewson
8f242a72e7
Relabel some changelog items; re-sort them into place
2014-12-22 10:12:43 -05:00
Nick Mathewson
c12b2e1cce
minor teaks fo the changelog
2014-12-22 10:06:56 -05:00
Nick Mathewson
0f5303f08a
Auto-reformat the changelog for 0.2.6.2-alpha
2014-12-22 10:03:19 -05:00
Nick Mathewson
f645564778
Start on a changelog for 0.2.6.2-alpha
2014-12-22 10:02:18 -05:00
Nick Mathewson
845d92295f
have lintchanges check header format.
2014-12-22 10:00:34 -05:00
Nick Mathewson
441a481bb8
Resolve issues in changes files
2014-12-22 09:49:33 -05:00
Nick Mathewson
8b532a8c81
Short python script to lint the changes files
2014-12-22 09:34:55 -05:00
Nick Mathewson
1c05dfd0b6
Merge branch 'ticket7356_squashed'
2014-12-21 14:48:53 -05:00
rl1987
af1469b9a3
Fixing mistake in comment.
2014-12-21 14:48:39 -05:00
rl1987
ed0b46e711
Changes file for 7356
2014-12-21 14:48:39 -05:00
rl1987
f6cc4d35b0
Using channel state lookup macros in connection_or.c.
2014-12-21 14:48:39 -05:00
rl1987
fc7d5e598b
Using CHANNEL_FINISHED macro in connection.c
2014-12-21 14:48:38 -05:00
rl1987
551221bad6
Using channel state lookup macros in circuitlist.c.
2014-12-21 14:48:38 -05:00
rl1987
7473160765
Using CHANNEL_IS_OPEN macro in circuitbuild.c
2014-12-21 14:48:38 -05:00
rl1987
5a7dd44d6e
Using channel state lookup macros in circuitbias.c.
2014-12-21 14:48:38 -05:00
rl1987
668edc5132
Using channel state lookup macros in channeltls.c
2014-12-21 14:48:38 -05:00
rl1987
032d44226e
Use channel state lookup macros in channel.c
2014-12-21 14:48:38 -05:00
rl1987
b884ae6d98
Using macros and inline function for quick lookup of channel state.
2014-12-21 14:48:38 -05:00
Nick Mathewson
647a90b9b3
Merge remote-tracking branch 'teor/bug14002-osx-transproxy-ipfw-pf'
2014-12-21 13:37:40 -05:00
teor
e40591827e
Make log bufer 10k, not 9.78k.
2014-12-21 13:36:06 -05:00
teor
769fc5af09
Fix a comment in tor_addr_parse
2014-12-21 13:35:42 -05:00
teor
6fad395300
Fix clang warning, IPv6 address comment, buffer size typo
...
The address of an array in the middle of a structure will
always be non-NULL. clang recognises this and complains.
Disable the tautologous and redundant check to silence
this warning.
Fixes bug 14001.
2014-12-21 13:35:03 -05:00
rl1987
f785723e0b
Document the case of HiddenServiceDir being defined as relative path.
2014-12-21 19:05:10 +02:00
teor
d93516c445
Fix transparent proxy checks to allow OS X to use ipfw or pf
...
OS X uses ipfw (FreeBSD) or pf (OpenBSD). Update the transparent
proxy option checks to allow for both ipfw and pf on OS X.
Fixes bug 14002.
2014-12-20 22:28:58 +11:00
Nick Mathewson
3d85df9569
LLONG_MIN => INT64_MIN.
2014-12-19 14:12:35 -05:00
Nick Mathewson
357191a095
Define an int64_min when it is missing
2014-12-19 14:12:22 -05:00
Karsten Loesing
816e6f2eac
Fix unit test.
...
Looks like we forgot to update unit tests when we switched from 32-bit to
64-bit ints while tweaking 7cd53b7
2014-12-19 18:37:43 +01:00
Nick Mathewson
64787e99fa
Merge branch 'asn-karsten-task-13192-5-squashed'
2014-12-19 10:35:47 -05:00
