Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ticket31626 #1319

Merged
merged 5 commits into from Sep 12, 2019
+28 −22
Merged

Ticket31626 #1319

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf8c316
Add new entries to lib/confmgt ".may_include" file
nmathewson Sep 11, 2019
87ca9e4
Move confparse.[ch] into src/lib/confmgt/
nmathewson Sep 11, 2019
a90d191
Update #includes to point to confparse.h in its new location.
nmathewson Sep 11, 2019
ae6e602
Update include.am files to refer to new location of confparse.[ch]
nmathewson Sep 11, 2019
c7cbe64
Changes file for ticket31626 (confparse.[ch] move)
nmathewson Sep 11, 2019
File filter
Filter by extension
Clear filters
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Next
Update #includes to point to confparse.h in its new location. 
This commit was automatically generated by running
scripts/maint/rectify_include_paths.py .
  • Loading branch information
@nmathewson
nmathewson committed Sep 11, 2019
commit a90d1918af5d2b6c6e6dd2c0797f8a63d4042bfa
2 src/app/config/config.c
View file
Open in desktop
@@ -61,7 +61,7 @@
#define CONFIG_PRIVATE
#include "core/or/or.h"
#include "app/config/config.h"
#include "app/config/confparse.h"
#include "lib/confmgt/confparse.h"
#include "app/config/statefile.h"
#include "app/main/main.h"
#include "app/main/subsysmgr.h"
2 src/app/config/statefile.c
View file
Open in desktop
@@ -32,7 +32,7 @@
#include "core/or/or.h"
#include "core/or/circuitstats.h"
#include "app/config/config.h"
#include "app/config/confparse.h"
#include "lib/confmgt/confparse.h"
#include "core/mainloop/mainloop.h"
#include "core/mainloop/netstatus.h"
#include "core/mainloop/connection.h"
2 src/core/or/circuitbuild.c
View file
Open in desktop
@@ -30,7 +30,7 @@

#include "core/or/or.h"
#include "app/config/config.h"
#include "app/config/confparse.h"
#include "lib/confmgt/confparse.h"
#include "core/crypto/hs_ntor.h"
#include "core/crypto/onion_crypto.h"
#include "core/crypto/onion_fast.h"
2 src/core/or/circuitstats.c
View file
Open in desktop
@@ -29,7 +29,7 @@
#include "core/or/circuitbuild.h"
#include "core/or/circuitstats.h"
#include "app/config/config.h"
#include "app/config/confparse.h"
#include "lib/confmgt/confparse.h"
#include "feature/control/control_events.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "core/mainloop/mainloop.h"
2 src/feature/client/entrynodes.c
View file
Open in desktop
@@ -114,7 +114,7 @@

#include "core/or/or.h"
#include "app/config/config.h"
#include "app/config/confparse.h"
#include "lib/confmgt/confparse.h"
#include "app/config/statefile.h"
#include "core/mainloop/connection.h"
#include "core/mainloop/mainloop.h"
2 src/feature/control/control_cmd.c
View file
Open in desktop
@@ -13,7 +13,7 @@

#include "core/or/or.h"
#include "app/config/config.h"
#include "app/config/confparse.h"
#include "lib/confmgt/confparse.h"
#include "app/main/main.h"
#include "core/mainloop/connection.h"
#include "core/or/circuitbuild.h"
2 src/feature/dirauth/shared_random.c
View file
Open in desktop
@@ -90,7 +90,7 @@
#include "core/or/or.h"
#include "feature/dirauth/shared_random.h"
#include "app/config/config.h"
#include "app/config/confparse.h"
#include "lib/confmgt/confparse.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h"
#include "feature/nodelist/networkstatus.h"
2 src/feature/dirauth/shared_random_state.c
View file
Open in desktop
@@ -12,7 +12,7 @@

#include "core/or/or.h"
#include "app/config/config.h"
#include "app/config/confparse.h"
#include "lib/confmgt/confparse.h"
#include "lib/crypt_ops/crypto_util.h"
#include "feature/dirauth/dirvote.h"
#include "feature/nodelist/networkstatus.h"
2 src/feature/hs/hs_dos.c
View file
Open in desktop
@@ -29,7 +29,7 @@

#include "lib/evloop/token_bucket.h"

#include "hs_dos.h"
#include "feature/hs/hs_dos.h"

This comment has been minimized.

Sign in to view
@teor2345

teor2345 Sep 12, 2019
Contributor

This change is unrelated.
I'm ok with having it in the same commit, or putting it in a separate commit.

/* Default value of the allowed INTRODUCE2 cell rate per second. Above that
* value per second, the introduction is denied. */
2 src/lib/confmgt/confparse.c
View file
Open in desktop
@@ -23,7 +23,7 @@

#define CONFPARSE_PRIVATE
#include "orconfig.h"
#include "app/config/confparse.h"
#include "lib/confmgt/confparse.h"

#include "lib/confmgt/structvar.h"
#include "lib/confmgt/unitparse.h"
2 src/test/test_btrack.c
View file
Open in desktop
@@ -4,7 +4,7 @@
#include "core/or/or.h"

#include "test/test.h"
#include "test_helpers.h"
#include "test/test_helpers.h"

This comment has been minimized.

Sign in to view
@teor2345

teor2345 Sep 12, 2019
Contributor

This change is also unrelated.
I don't mind either way.
#include "test/log_test_helpers.h"

#define OCIRC_EVENT_PRIVATE
2 src/test/test_config.c
View file
Open in desktop
@@ -16,7 +16,7 @@
#include "core/or/circuitmux_ewma.h"
#include "core/or/circuitbuild.h"
#include "app/config/config.h"
#include "app/config/confparse.h"
#include "lib/confmgt/confparse.h"
#include "core/mainloop/connection.h"
#include "core/or/connection_edge.h"
#include "test/test.h"
2 src/test/test_confmgr.c
View file
Open in desktop
@@ -13,7 +13,7 @@

#include "core/or/or.h"
#include "lib/encoding/confline.h"
#include "app/config/confparse.h"
#include "lib/confmgt/confparse.h"
#include "test/test.h"
#include "test/log_test_helpers.h"

2 src/test/test_confparse.c
View file
Open in desktop
@@ -14,7 +14,7 @@
#include "core/or/or.h"
#include "lib/encoding/confline.h"
#include "feature/nodelist/routerset.h"
#include "app/config/confparse.h"
#include "lib/confmgt/confparse.h"
#include "test/test.h"
#include "test/log_test_helpers.h"

2 src/test/test_dir.c
View file
Open in desktop
@@ -26,7 +26,7 @@

#include "core/or/or.h"
#include "app/config/config.h"
#include "app/config/confparse.h"
#include "lib/confmgt/confparse.h"
#include "core/mainloop/connection.h"
#include "core/or/relay.h"
#include "core/or/versions.h"
2 src/test/test_entryconn.c
View file
Open in desktop
@@ -11,7 +11,7 @@

#include "feature/client/addressmap.h"
#include "app/config/config.h"
#include "app/config/confparse.h"
#include "lib/confmgt/confparse.h"
#include "core/mainloop/connection.h"
#include "core/or/connection_edge.h"
#include "feature/nodelist/nodelist.h"
2 src/test/test_entrynodes.c
View file
Open in desktop
@@ -18,7 +18,7 @@
#include "core/or/circuitlist.h"
#include "core/or/circuitbuild.h"
#include "app/config/config.h"
#include "app/config/confparse.h"
#include "lib/confmgt/confparse.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "feature/dircommon/directory.h"
#include "feature/dirclient/dirclient.h"
2 src/test/test_helpers.c
View file
Open in desktop
@@ -16,7 +16,7 @@

#include "lib/buf/buffers.h"
#include "app/config/config.h"
#include "app/config/confparse.h"
#include "lib/confmgt/confparse.h"
#include "app/main/subsysmgr.h"
#include "core/mainloop/connection.h"
#include "lib/crypt_ops/crypto_rand.h"
2 src/test/test_options.c
View file
Open in desktop
@@ -5,7 +5,7 @@

#define CONFIG_PRIVATE
#include "core/or/or.h"
#include "app/config/confparse.h"
#include "lib/confmgt/confparse.h"
#include "app/config/config.h"
#include "test/test.h"
#include "lib/geoip/geoip.h"
2 src/test/test_pt.c
View file
Open in desktop
@@ -11,7 +11,7 @@
#define PROCESS_PRIVATE
#include "core/or/or.h"
#include "app/config/config.h"
#include "app/config/confparse.h"
#include "lib/confmgt/confparse.h"
#include "feature/control/control.h"
#include "feature/control/control_events.h"
#include "feature/client/transports.h"