e07b19d305
Rationalize handling of quiet_level in config.c
...
Formerly, we would use quiet_level as an excuse to rewrite the log
configuration, adding a default log line if none existed, and if
RunAsDaemon was not set, and if we were not being invoked via
setconf (!).
This is against our best practices for several reasons:
* We should not be changing configured options except when the
user tells us to do so.
* We should especially not be changing options in the options_validate
function.
* Distinguishing whether we are being called from setconf adds a
risky special-case.
Instead, this patch take a simpler approach: it changes the
interpretation of having no logging lines set to mean: If there is a
stdout, add a default log based on quiet_level.
Solves ticket 31999.
2019-10-22 07:50:13 -04:00
db18ff9120
Move code to add default log into quiet_level.c
...
I'm about to unify the code for handling this between main.c and
config.c.
2019-10-17 12:48:39 -04:00
3a73f6612a
Replace add_temp_log() with add_default_log().
...
We used to have this function so that we could mark our initial
log-to-stdout as specifically temporary so that we would delete it
once regular logs were configured. But it's no longer necessary to
mark these logs as temporary, since we now use a mark-and-sweep
process to ensure that _all_ not-configured logs are closed when we
change our configuration.
Instead, this function will be the basis of a refactoring in how we
handle default logs.
2019-10-17 12:30:52 -04:00
800b823c29
Merge branch 'cmdline_refactor'
2019-10-17 12:01:45 -04:00
d97d7f0e48
Use an enum for quiet_level.
2019-10-17 12:01:40 -04:00
b9f002dec6
Rename CMD_OTHER to CMD_IMMEDIATE
2019-10-17 12:01:40 -04:00
d15223a385
fixup! Print the error message for --dump-config even if no arguments are given.
...
Fix a spelling error.
2019-10-17 12:01:40 -04:00
763d955a17
Add a test for a command-line option without a value.
2019-10-17 12:01:40 -04:00
35c18870b4
add a changes file for 32003 (command-line option parsing).
2019-10-17 12:01:40 -04:00
bfdfaae040
Move responsibility for setting the "quiet level" into a table.
...
Previously this was done with a big list of options in main.c which
implied "hush" or "quiet". One of these options ("--digests") no
longer existed, but we still checked for it.
Now we use the table of command-line-only arguments to set this
value.
2019-10-17 12:01:40 -04:00
c529b3f8f1
Make the command-line parser understand "commands".
...
Previously these were implemented with a search in
options_init_from_torrc(), but that led to each option being
declared more than needed: once to say that it was a valid option,
and once to say what it meant.
2019-10-17 12:01:40 -04:00
9826fb1981
Add a return type for the parsed commandline.
...
Previously it was stored in two outvars, but this is more
elegant. I'm going to be expanding this struct in later commits.
2019-10-17 12:01:40 -04:00
0081d6c112
Merge branch 'ticket31373_042_01_squashed'
2019-10-17 10:09:16 -04:00
7fcf999c63
Print summary at the end of the configure script
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-10-17 10:08:34 -04:00
5c09230b45
hs_cache.c: fix HTML tags in doxygen comments.
2019-10-17 08:27:17 -04:00
39cf575ed4
Merge remote-tracking branch 'tor-github/pr/1416'
2019-10-17 08:25:11 -04:00
5f3233ce1a
Merge branch 'maint-0.4.2'
2019-10-17 14:52:19 +10:00
8ac9af2330
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-17 14:52:15 +10:00
400e31ad19
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-17 14:52:06 +10:00
e483257e1b
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-17 14:51:58 +10:00
4b8e5ea0dc
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-10-17 14:51:50 +10:00
92c4dc9b14
Merge remote-tracking branch 'tor-github/pr/1373' into maint-0.4.2
2019-10-17 14:51:30 +10:00
13daf339a9
Merge remote-tracking branch 'tor-github/pr/1372' into maint-0.4.1
2019-10-17 14:51:02 +10:00
702aa8f775
Merge remote-tracking branch 'tor-github/pr/1370' into maint-0.3.5
2019-10-17 14:50:28 +10:00
c660f47960
Merge remote-tracking branch 'tor-github/pr/1369' into maint-0.2.9
2019-10-17 14:49:52 +10:00
e6bb23434e
Merge remote-tracking branch 'tor-github/pr/1419'
...
Obviously correct fixes to code that's already been reviewed.
2019-10-17 13:47:42 +10:00
2c97cf3add
Merge remote-tracking branch 'tor-github/pr/1329'
2019-10-16 12:31:47 -04:00
3430b487d6
hs_cell.[ch]: repair doxygen.
2019-10-16 12:08:38 -04:00
6a2057a9f2
or_options_st.h: repair some doxygen comments.
2019-10-16 12:05:17 -04:00
18ea8855f2
shared_random.[ch]: repair doxygen comments
2019-10-16 12:04:53 -04:00
17b88241db
hs_cache.[ch]: repair doxygen comments.
2019-10-16 11:57:44 -04:00
1b66668e26
hs_client.[ch]: fix doxygen comments by using /**.
2019-10-16 11:51:47 -04:00
06367299c2
shared_random_state.[ch]: Repair a bunch of doxygen comments
...
These need to start with /**, not /*.
2019-10-16 11:44:30 -04:00
123fe6bdc5
hs_common.[ch]: repair doxygen comments by replacing /* with /**
2019-10-16 11:39:10 -04:00
2127d797e9
hs_descriptor.[ch]: repair doxygen comments.
...
These are yet more that were not made with "/**"
2019-10-16 11:33:03 -04:00
ca26ea03fc
hs_service.c: repair doxygen comments
2019-10-16 11:26:20 -04:00
0e9e5c37b7
hs_service.h: repair doxygen comments.
2019-10-16 11:18:43 -04:00
ba44423cfc
address_set.c: doxygen comment repair.
2019-10-16 11:15:25 -04:00
a54c98007a
channel.h: fix various doxygen warnings
...
There were a bunch of items where the doxygen comments were
formatted incorrectly (with /* instead of /**)
2019-10-16 11:11:43 -04:00
ce0739314b
voting_schedule: fix doxygen comments to use /**
...
Previously some of the comments here used /*.
2019-10-16 11:08:34 -04:00
85accdf00a
Tell doxygen not to pay attention to __attribute__.
2019-10-16 11:02:49 -04:00
2329f8a28c
Teach Doxygen to handle MOCK_{DECL,IMPL}
2019-10-16 10:59:29 -04:00
87afe5c260
Rename authcert_members.i to .h, and have it define a macro.
...
Including a file in the middle of a declaration seems to confuse
Doxygen, and Coccinelle doesn't much like it either.l
2019-10-16 10:53:01 -04:00
911adb4d2b
Make doc/doxygen before running doxygen.
...
This makes out-of-tree doxygen builds work.
Closes ticket 32113.
2019-10-16 10:31:44 -04:00
8413eec2c7
Merge branch 'ticket32099'
2019-10-16 10:28:03 -04:00
bcbf3b7479
Merge branch 'ticket32110'
2019-10-16 10:14:51 -04:00
593acfabb3
Doxygen: stop producing LaTeX.
...
Running doxygen with latex gave us all manner of unicode issues,
slowed down the "make doxygen" target by a lot, and added several
latex dependencies... all to produce a 4000-page reference manual
which is probably not what anybody wanted.
Closes ticket 32099.
2019-10-16 09:56:31 -04:00
08fd551e9f
Regenerate practracker exceptions file for 0.4.3 progress.
2019-10-16 09:15:00 -04:00
8ce17e0b35
practracker: add a missing #.
2019-10-16 09:15:00 -04:00
033d76b0e0
Doxygen: update doxyfile to a more recent version.
...
I have left the settings at their old values, except when they
referred to nonexistent files.
Closes ticket 32110
2019-10-16 09:07:21 -04:00
Nick Mathewson
David Goulet
teor