Peter Palfrader
bc4095c70c
different exit codes for options_init_from_string()
...
Change options_init_from_string() so that it returns different exit codes in the
error case, depending on what went wrong. Also push the responsibility to log
the error to the caller.
svn:r13947
2008-03-10 12:41:49 +00:00
Peter Palfrader
8c71d7ea16
options_init_from_torrc(): split off options_init_from_string()
...
svn:r13946
2008-03-10 12:41:44 +00:00
Peter Palfrader
947fd064a3
Store options we got from commandline seperately from bare argv/argc
...
svn:r13945
2008-03-10 12:41:40 +00:00
Peter Palfrader
00d64fd213
options_init_from_torrc(): move code that loads torrc into its own function
...
move code that loads torrc from disk and sets torrc_fname into its own function
svn:r13944
2008-03-10 12:41:36 +00:00
Peter Palfrader
ded55fa296
options_init_from_torrc(): tread non-existing torrc like empty torrc.
...
Tread the case of a non-existing conffile, when allowed, exactly like the one
with an empty torrc.
svn:r13943
2008-03-10 12:41:33 +00:00
Peter Palfrader
e8f4d79ec1
options_init_from_torrc(): move code that looks for torrc into its own function
...
Part of options_init_from_torrc()'s job was looking for -f flags (to specify
an alternate config file) on the command line, complaining if more than one
is given or the given does not exist. If none is given then use the compiled-in
default location, accepting if it does not exist. This logic has been moved
into its own function in an attemped to make options_init_from_torrc() easier
to deal with.
svn:r13942
2008-03-10 12:41:29 +00:00
Peter Palfrader
4118e319c7
options_init_from_torrc(): Split argv processing into two parts
...
Split the argv processing loop into two poarts, one that deals with
figuring out which conffile to use, and the other that figures out
which "command" (hash fingerprint, verify config, list fpr, run tor)
the user asked for.
There is a third part further down that imports command line args
into the config but that is not touched.
svn:r13941
2008-03-10 12:41:26 +00:00
Peter Palfrader
8987bd2fd9
If we decrement incoming_cmd's length when receiving the ending CRLF "." CRLF for a multi-line control command, also truncate the string by nul-terminating it in the correct place.
...
svn:r13939
2008-03-10 12:13:43 +00:00
Roger Dingledine
0df1564298
forward-port recent changes
...
svn:r13935
2008-03-10 07:50:09 +00:00
Nick Mathewson
7587e16796
r18639@catbus: nickm | 2008-03-07 20:11:48 -0500
...
Change semantics of add-a-log functions to copy severity setup: that is way less error-prone. Fix up config.c to act accordingly.
svn:r13888
2008-03-08 01:11:54 +00:00
Nick Mathewson
2675276618
r18638@catbus: nickm | 2008-03-07 20:11:15 -0500
...
Fix typo in tortls.c comment.
svn:r13887
2008-03-08 01:11:52 +00:00
Nick Mathewson
670f4c19af
r18632@catbus: nickm | 2008-03-05 17:38:52 -0500
...
Patch from karsten: proper error message from tor-gencert when no argument is given to --passphrase-fd
svn:r13876
2008-03-05 22:39:49 +00:00
Nick Mathewson
f56ba5f3d6
r18630@catbus: nickm | 2008-03-05 17:31:33 -0500
...
Implement domain-selection for logging. Source is documented; needs documentation in manpage (maybe). For now, see doxygen comment on parse_log_severity_config in log.c
svn:r13875
2008-03-05 22:31:39 +00:00
Peter Palfrader
9e7b4400dc
minor cleanup
...
in options_act() we set running_tor to options->command == CMD_RUN_TOR
once and used that in all but one place. Now we use running_tor in that
place also.
svn:r13819
2008-03-03 12:48:13 +00:00
Roger Dingledine
5bf0a01011
forward-port r13799 and the 0.2.0.21-rc changelog
...
svn:r13808
2008-03-02 22:29:04 +00:00
Roger Dingledine
cf3e1b1309
we should consider dumping the v1 directory stuff from 0.2.1.x.
...
perhaps we would even replace the v1 directory with a static
page saying 'this is a tor server, let me tell you what that is'.
svn:r13797
2008-03-01 17:47:41 +00:00
Nick Mathewson
77d1654c50
r18535@catbus: nickm | 2008-03-01 09:58:33 -0500
...
Whoo. People diagnosed and fixed bug 616. See changelog for details. Bugfix on 0.2.0.20-rc.
svn:r13793
2008-03-01 14:59:03 +00:00
Roger Dingledine
c5a7ff8e43
forward-port r13777
...
svn:r13778
2008-02-29 01:45:06 +00:00
Roger Dingledine
04efc74e18
be a little bit more helpful than "Error reading directory."
...
make a note to try to be more helpful still.
svn:r13776
2008-02-28 21:37:39 +00:00
Nick Mathewson
eefe2a3562
r18462@catbus: nickm | 2008-02-27 14:15:57 -0500
...
Add better warnings for the error that produced bug 614, and downgrade from a tor_assert() to a tor_fragile_assert().
svn:r13752
2008-02-27 19:19:34 +00:00
Nick Mathewson
d14f8f2547
r14516@tombo: nickm | 2008-02-27 03:10:26 -0500
...
Write some unit tests for a few functions and cases that needed them.
svn:r13751
2008-02-27 08:10:28 +00:00
Nick Mathewson
4ea982c4c0
r14481@tombo: nickm | 2008-02-26 14:49:04 -0500
...
Bump trunk version to 0.2.1.0-alpha-dev
svn:r13745
2008-02-26 19:49:28 +00:00
Roger Dingledine
52a1c244ca
bump to 0.2.0.20-rc-dev
...
svn:r13725
2008-02-25 06:51:18 +00:00
Roger Dingledine
3dd9a3a23a
bump to 0.2.0.20-rc
...
svn:r13715
2008-02-25 00:39:58 +00:00
Roger Dingledine
e7f3d6f76c
fix most of pnx's warnings on irix64
...
svn:r13706
2008-02-24 23:39:53 +00:00
Nick Mathewson
3452486ac6
r14422@tombo: nickm | 2008-02-24 17:09:56 -0500
...
Whitespace fixes
svn:r13700
2008-02-24 22:11:18 +00:00
Nick Mathewson
ee8dce3084
r14421@tombo: nickm | 2008-02-24 17:05:18 -0500
...
Patch from mwenge: always willingly serve our own extrainfo from the controlport
svn:r13699
2008-02-24 22:11:12 +00:00
Nick Mathewson
dde81de3dd
r14419@tombo: nickm | 2008-02-24 16:55:11 -0500
...
Patch from tup: use sizeof sockaddr_un as the size of a unix sockaddr. Fixes unix controlsocket binding on openbsd.
svn:r13697
2008-02-24 22:11:00 +00:00
Nick Mathewson
e0de72dd87
r14410@tombo: nickm | 2008-02-23 16:51:46 -0500
...
Fix the last of the -Wshorten-64-to-32 warnings.
svn:r13696
2008-02-24 22:10:08 +00:00
Roger Dingledine
a0bc80bbf8
<weasel> tortls.c: In function `tor_tls_client_is_using_v2_ciphers':
...
<weasel> tortls.c:634: warning: passing arg 1 of `SSL_get_session' discards
qualifiers from pointer target type
Nick, see if you like this patch.
svn:r13690
2008-02-24 00:35:20 +00:00
Roger Dingledine
31f72a3d80
Servers that don't know their own IP address should go to the
...
authorities for their first directory fetch, even if their DirPort
is off or if they don't know they're reachable yet. This will help
them bootstrap better. Bugfix on 0.2.0.18-alpha; fixes bug 609.
svn:r13688
2008-02-23 23:39:16 +00:00
Roger Dingledine
cd4b95e402
Make "HashedControlPassword" an alias for "__HashedControlSessionPassword"
...
if it appears on the commandline. should help with bug 586.
svn:r13683
2008-02-22 23:20:28 +00:00
Nick Mathewson
7589765ae9
r14401@tombo: nickm | 2008-02-22 15:33:42 -0500
...
Fix a really stupid parthensis error noticed by mwenge.
svn:r13681
2008-02-22 20:33:47 +00:00
Nick Mathewson
e7db789e82
r14399@tombo: nickm | 2008-02-22 14:09:38 -0500
...
More 64-to-32 fixes. Partial backport candidate. still not done.
svn:r13680
2008-02-22 19:09:45 +00:00
Nick Mathewson
a20eda5669
r14396@tombo: nickm | 2008-02-22 14:07:37 -0500
...
Add --passphrase-fd to tor-gencert.
svn:r13679
2008-02-22 19:07:52 +00:00
Roger Dingledine
5ec5a747d7
Quiet the "Exitrouter '%s' seems to be more restrictive than its exit
...
policy. Not using this router as exit for now." message, since it
legitimately appears every so often and there's no need to alarm users.
svn:r13677
2008-02-22 14:31:40 +00:00
Nick Mathewson
e68760ac0f
r14388@tombo: nickm | 2008-02-21 22:44:28 -0500
...
More 64-to-32 fixes.
svn:r13672
2008-02-22 03:44:36 +00:00
Nick Mathewson
031c212776
r18360@catbus: nickm | 2008-02-21 22:26:32 -0500
...
Make torint.h define ssize_t more robustly; add spaces to last patch
svn:r13670
2008-02-22 03:26:35 +00:00
Nick Mathewson
688b7ddf83
r18358@catbus: nickm | 2008-02-21 22:21:57 -0500
...
Remove extraneous commas in compat.c
svn:r13669
2008-02-22 03:23:20 +00:00
Nick Mathewson
6a1e0c2373
r18356@catbus: nickm | 2008-02-21 21:54:55 -0500
...
Remove redundant check from container.c that gcc 4.2 didnt like
svn:r13668
2008-02-22 02:55:02 +00:00
Nick Mathewson
b21a122ef6
r14379@tombo: nickm | 2008-02-21 17:14:24 -0500
...
Enable v2 handshakes.
svn:r13666
2008-02-21 22:14:32 +00:00
Nick Mathewson
69300eb606
r14374@tombo: nickm | 2008-02-21 16:57:39 -0500
...
Fix all remaining shorten-64-to-32 errors in src/common. Some were genuine problems. Many were compatibility errors with libraries (openssl, zlib) that like predate size_t. Partial backport candidate.
svn:r13665
2008-02-21 21:57:47 +00:00
Nick Mathewson
b375472d14
r14373@tombo: nickm | 2008-02-21 16:29:18 -0500
...
Apply warnings about implicit 64-to-32 conversions; some from Sebastian Hahn; some not.
svn:r13664
2008-02-21 21:57:42 +00:00
Roger Dingledine
1cd90948ab
maybe appease the overflow detectors more
...
svn:r13663
2008-02-21 21:56:04 +00:00
Nick Mathewson
daefbfe691
r14371@tombo: nickm | 2008-02-21 16:13:18 -0500
...
Fix all -Wshorten-64-to-32 warnings that appear on my macbook.
svn:r13662
2008-02-21 21:15:31 +00:00
Nick Mathewson
5c03f82a65
r18345@catbus: nickm | 2008-02-21 13:45:04 -0500
...
Do the last part of arma's fix for bug 437: Track the origin of every addrmap, and use this info so we can remove all the trackhostexits-originated mappings for a given exit.
svn:r13660
2008-02-21 18:45:11 +00:00
Nick Mathewson
0ba2bfeef6
r14363@31-33-219: nickm | 2008-02-21 11:11:33 -0500
...
Answer the next-to-last XXX020rc item.
svn:r13658
2008-02-21 16:12:01 +00:00
Nick Mathewson
e2f25558b9
r14362@31-33-219: nickm | 2008-02-21 11:01:10 -0500
...
Change some of our log messages related to closed TLS connections in order to better reflect reality.
svn:r13657
2008-02-21 16:11:58 +00:00
Nick Mathewson
e18ee2a2ab
r14357@31-33-219: nickm | 2008-02-21 10:39:11 -0500
...
Fix bug-handling code for unhandled write errors, so that it does not try to flush any data on the failed connection. Bugfix on 0.1.2.x.
svn:r13655
2008-02-21 15:39:26 +00:00
Nick Mathewson
41eca067a1
r14356@31-33-219: nickm | 2008-02-21 10:38:26 -0500
...
Defer a couple of XXX020rc items, based on recommendation from arma.
svn:r13654
2008-02-21 15:39:24 +00:00