diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-10-31 09:04:12 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-10-31 09:04:12 -0400 |
| commit | 988d4903a3fc23153896e0daf7738f87ade9bc4b (patch) | |
| tree | 79f9eb5ca1154c058d5243b0cd43a6ac1905757f /src/feature/nodelist/networkstatus.h | |
| parent | a182301152afe9cd066516ae02f588840b2efc43 (diff) | |
| parent | 594140574e7366efac693d440a636a1e1cce82ff (diff) | |
| download | tor-988d4903a3fc23153896e0daf7738f87ade9bc4b.tar.gz tor-988d4903a3fc23153896e0daf7738f87ade9bc4b.zip | |
Merge branch 'networkstatus_mmap' into networkstatus_mmap_merge
Diffstat (limited to 'src/feature/nodelist/networkstatus.h')
| -rw-r--r-- | src/feature/nodelist/networkstatus.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/feature/nodelist/networkstatus.h b/src/feature/nodelist/networkstatus.h index 6f8b2dc964..8802de2d65 100644 --- a/src/feature/nodelist/networkstatus.h +++ b/src/feature/nodelist/networkstatus.h @@ -16,7 +16,7 @@ void networkstatus_reset_warnings(void); void networkstatus_reset_download_failures(void); -char *networkstatus_read_cached_consensus(const char *flavorname); +tor_mmap_t *networkstatus_map_cached_consensus(const char *flavorname); int router_reload_consensus_networkstatus(void); void routerstatus_free_(routerstatus_t *rs); #define routerstatus_free(rs) \ @@ -105,6 +105,7 @@ int networkstatus_consensus_has_ipv6(const or_options_t* options); #define NSSET_ACCEPT_OBSOLETE 8 #define NSSET_REQUIRE_FLAVOR 16 int networkstatus_set_current_consensus(const char *consensus, + size_t consensus_len, const char *flavor, unsigned flags, const char *source_dir); @@ -156,4 +157,3 @@ extern networkstatus_t *current_md_consensus; #endif /* defined(NETWORKSTATUS_PRIVATE) */ #endif /* !defined(TOR_NETWORKSTATUS_H) */ - |