| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289129012911292129312941295129612971298129913001301130213031304130513061307130813091310131113121313131413151316131713181319132013211322132313241325132613271328132913301331133213331334133513361337133813391340134113421343134413451346134713481349135013511352135313541355135613571358135913601361136213631364136513661367136813691370137113721373137413751376137713781379138013811382138313841385138613871388138913901391139213931394139513961397139813991400140114021403140414051406140714081409141014111412141314141415141614171418141914201421142214231424142514261427142814291430143114321433143414351436143714381439144014411442144314441445144614471448144914501451145214531454145514561457145814591460146114621463146414651466146714681469147014711472147314741475147614771478147914801481148214831484148514861487148814891490149114921493149414951496149714981499150015011502150315041505150615071508150915101511151215131514151515161517151815191520152115221523152415251526152715281529153015311532153315341535153615371538153915401541154215431544154515461547154815491550155115521553155415551556155715581559156015611562156315641565156615671568156915701571157215731574157515761577157815791580158115821583158415851586158715881589159015911592159315941595159615971598159916001601160216031604160516061607160816091610161116121613161416151616161716181619162016211622162316241625162616271628162916301631163216331634163516361637163816391640164116421643164416451646164716481649165016511652165316541655165616571658165916601661166216631664166516661667166816691670167116721673167416751676167716781679168016811682168316841685168616871688168916901691169216931694169516961697169816991700170117021703170417051706170717081709171017111712171317141715171617171718171917201721172217231724172517261727172817291730173117321733173417351736173717381739174017411742174317441745174617471748174917501751175217531754175517561757175817591760176117621763176417651766176717681769177017711772177317741775177617771778177917801781178217831784178517861787178817891790179117921793179417951796179717981799180018011802180318041805180618071808180918101811181218131814181518161817181818191820182118221823182418251826182718281829183018311832183318341835183618371838183918401841184218431844184518461847184818491850185118521853185418551856185718581859186018611862186318641865186618671868186918701871187218731874187518761877187818791880188118821883188418851886188718881889189018911892189318941895189618971898189919001901190219031904190519061907190819091910191119121913191419151916191719181919192019211922192319241925192619271928192919301931193219331934193519361937193819391940194119421943194419451946194719481949195019511952195319541955195619571958195919601961196219631964196519661967196819691970197119721973197419751976197719781979198019811982198319841985198619871988198919901991199219931994199519961997199819992000200120022003200420052006200720082009201020112012201320142015201620172018201920202021202220232024202520262027202820292030203120322033203420352036203720382039204020412042204320442045204620472048204920502051205220532054205520562057205820592060206120622063206420652066206720682069207020712072207320742075207620772078207920802081208220832084208520862087208820892090209120922093209420952096209720982099210021012102210321042105210621072108210921102111211221132114211521162117211821192120212121222123212421252126212721282129213021312132213321342135213621372138213921402141214221432144214521462147214821492150215121522153215421552156215721582159216021612162216321642165216621672168216921702171217221732174217521762177217821792180218121822183218421852186218721882189219021912192219321942195219621972198219922002201220222032204220522062207220822092210221122122213221422152216221722182219222022212222222322242225222622272228222922302231223222332234223522362237223822392240224122422243224422452246224722482249225022512252225322542255225622572258225922602261226222632264226522662267226822692270227122722273227422752276227722782279228022812282228322842285228622872288228922902291229222932294229522962297229822992300230123022303230423052306230723082309231023112312231323142315231623172318231923202321232223232324232523262327232823292330233123322333233423352336233723382339234023412342234323442345234623472348234923502351235223532354235523562357235823592360236123622363236423652366236723682369237023712372237323742375237623772378237923802381238223832384238523862387238823892390239123922393239423952396239723982399240024012402240324042405240624072408240924102411241224132414241524162417241824192420242124222423242424252426242724282429243024312432243324342435243624372438243924402441244224432444244524462447244824492450245124522453245424552456245724582459246024612462246324642465246624672468246924702471247224732474247524762477247824792480248124822483248424852486248724882489249024912492249324942495249624972498249925002501250225032504250525062507250825092510251125122513251425152516251725182519252025212522252325242525252625272528252925302531253225332534253525362537253825392540254125422543254425452546254725482549255025512552255325542555255625572558255925602561256225632564256525662567256825692570257125722573257425752576257725782579258025812582258325842585258625872588258925902591259225932594259525962597259825992600260126022603260426052606260726082609261026112612261326142615261626172618261926202621262226232624262526262627262826292630263126322633263426352636263726382639264026412642264326442645264626472648264926502651265226532654265526562657265826592660266126622663266426652666266726682669267026712672267326742675267626772678267926802681268226832684268526862687268826892690269126922693269426952696269726982699270027012702270327042705270627072708270927102711271227132714271527162717271827192720272127222723272427252726272727282729273027312732273327342735273627372738273927402741274227432744274527462747274827492750275127522753275427552756275727582759276027612762276327642765276627672768276927702771277227732774277527762777277827792780278127822783278427852786278727882789279027912792279327942795279627972798279928002801280228032804280528062807280828092810281128122813281428152816281728182819282028212822282328242825282628272828282928302831283228332834283528362837283828392840284128422843284428452846284728482849285028512852285328542855285628572858285928602861286228632864286528662867286828692870287128722873287428752876287728782879288028812882288328842885288628872888288928902891289228932894289528962897289828992900290129022903290429052906290729082909291029112912291329142915291629172918291929202921292229232924292529262927292829292930293129322933293429352936293729382939294029412942294329442945294629472948294929502951295229532954295529562957295829592960296129622963296429652966296729682969297029712972297329742975297629772978297929802981298229832984298529862987298829892990299129922993299429952996299729982999300030013002300330043005300630073008300930103011301230133014301530163017301830193020302130223023302430253026302730283029303030313032303330343035303630373038303930403041304230433044304530463047304830493050305130523053305430553056305730583059306030613062306330643065306630673068306930703071307230733074307530763077307830793080308130823083308430853086308730883089309030913092309330943095309630973098309931003101310231033104310531063107310831093110311131123113311431153116311731183119312031213122312331243125312631273128312931303131313231333134313531363137313831393140314131423143314431453146314731483149315031513152315331543155315631573158315931603161316231633164316531663167316831693170317131723173317431753176317731783179318031813182318331843185318631873188318931903191319231933194319531963197319831993200320132023203320432053206320732083209321032113212321332143215321632173218321932203221322232233224322532263227322832293230323132323233323432353236323732383239324032413242324332443245324632473248324932503251325232533254325532563257325832593260326132623263326432653266326732683269327032713272327332743275327632773278327932803281328232833284328532863287328832893290329132923293329432953296329732983299330033013302330333043305330633073308330933103311331233133314331533163317331833193320332133223323332433253326332733283329333033313332333333343335333633373338333933403341334233433344334533463347334833493350335133523353335433553356335733583359336033613362336333643365336633673368336933703371337233733374337533763377337833793380338133823383338433853386338733883389339033913392339333943395339633973398339934003401340234033404340534063407340834093410341134123413341434153416341734183419342034213422342334243425342634273428342934303431343234333434343534363437343834393440344134423443344434453446344734483449345034513452345334543455345634573458345934603461346234633464346534663467346834693470347134723473347434753476347734783479348034813482348334843485348634873488348934903491349234933494349534963497349834993500350135023503350435053506350735083509351035113512351335143515351635173518351935203521352235233524352535263527352835293530353135323533353435353536353735383539354035413542354335443545354635473548354935503551355235533554355535563557355835593560356135623563356435653566356735683569357035713572357335743575357635773578357935803581358235833584 | 
							- /* Copyright (c) 2001-2004, Roger Dingledine.
 
-  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
 
-  * Copyright (c) 2007-2009, The Tor Project, Inc. */
 
- /* See LICENSE for licensing information */
 
- #include "or.h"
 
- #if defined(EXPORTMALLINFO) && defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
 
- #ifndef OPENBSD
 
- #include <malloc.h>
 
- #endif
 
- #endif
 
- /**
 
-  * \file directory.c
 
-  * \brief Code to send and fetch directories and router
 
-  * descriptors via HTTP.  Directories use dirserv.c to generate the
 
-  * results; clients use routers.c to parse them.
 
-  **/
 
- /* In-points to directory.c:
 
-  *
 
-  * - directory_post_to_dirservers(), called from
 
-  *   router_upload_dir_desc_to_dirservers() in router.c
 
-  *   upload_service_descriptor() in rendservice.c
 
-  * - directory_get_from_dirserver(), called from
 
-  *   rend_client_refetch_renddesc() in rendclient.c
 
-  *   run_scheduled_events() in main.c
 
-  *   do_hup() in main.c
 
-  * - connection_dir_process_inbuf(), called from
 
-  *   connection_process_inbuf() in connection.c
 
-  * - connection_dir_finished_flushing(), called from
 
-  *   connection_finished_flushing() in connection.c
 
-  * - connection_dir_finished_connecting(), called from
 
-  *   connection_finished_connecting() in connection.c
 
-  */
 
- static void directory_send_command(dir_connection_t *conn,
 
-                              int purpose, int direct, const char *resource,
 
-                              const char *payload, size_t payload_len,
 
-                              int supports_conditional_consensus,
 
-                              time_t if_modified_since);
 
- static int directory_handle_command(dir_connection_t *conn);
 
- static int body_is_plausible(const char *body, size_t body_len, int purpose);
 
- static int purpose_needs_anonymity(uint8_t dir_purpose,
 
-                                    uint8_t router_purpose);
 
- static char *http_get_header(const char *headers, const char *which);
 
- static void http_set_address_origin(const char *headers, connection_t *conn);
 
- static void connection_dir_download_networkstatus_failed(
 
-                                dir_connection_t *conn, int status_code);
 
- static void connection_dir_download_routerdesc_failed(dir_connection_t *conn);
 
- static void connection_dir_download_cert_failed(
 
-                                dir_connection_t *conn, int status_code);
 
- static void dir_networkstatus_download_failed(smartlist_t *failed,
 
-                                               int status_code);
 
- static void dir_routerdesc_download_failed(smartlist_t *failed,
 
-                                            int status_code,
 
-                                            int router_purpose,
 
-                                            int was_extrainfo,
 
-                                            int was_descriptor_digests);
 
- static void note_client_request(int purpose, int compressed, size_t bytes);
 
- static int client_likes_consensus(networkstatus_t *v, const char *want_url);
 
- static void directory_initiate_command_rend(const char *address,
 
-                                             const tor_addr_t *addr,
 
-                                             uint16_t or_port,
 
-                                             uint16_t dir_port,
 
-                                             int supports_conditional_consensus,
 
-                                             int supports_begindir,
 
-                                             const char *digest,
 
-                                             uint8_t dir_purpose,
 
-                                             uint8_t router_purpose,
 
-                                             int anonymized_connection,
 
-                                             const char *resource,
 
-                                             const char *payload,
 
-                                             size_t payload_len,
 
-                                             time_t if_modified_since,
 
-                                             const rend_data_t *rend_query);
 
- /********* START VARIABLES **********/
 
- /** How far in the future do we allow a directory server to tell us it is
 
-  * before deciding that one of us has the wrong time? */
 
- #define ALLOW_DIRECTORY_TIME_SKEW (30*60)
 
- #define X_ADDRESS_HEADER "X-Your-Address-Is: "
 
- /** HTTP cache control: how long do we tell proxies they can cache each
 
-  * kind of document we serve? */
 
- #define FULL_DIR_CACHE_LIFETIME (60*60)
 
- #define RUNNINGROUTERS_CACHE_LIFETIME (20*60)
 
- #define DIRPORTFRONTPAGE_CACHE_LIFETIME (20*60)
 
- #define NETWORKSTATUS_CACHE_LIFETIME (5*60)
 
- #define ROUTERDESC_CACHE_LIFETIME (30*60)
 
- #define ROUTERDESC_BY_DIGEST_CACHE_LIFETIME (48*60*60)
 
- #define ROBOTS_CACHE_LIFETIME (24*60*60)
 
- /********* END VARIABLES ************/
 
- /** Return true iff the directory purpose 'purpose' must use an
 
-  * anonymous connection to a directory. */
 
- static int
 
- purpose_needs_anonymity(uint8_t dir_purpose, uint8_t router_purpose)
 
- {
 
-   if (get_options()->AllDirActionsPrivate)
 
-     return 1;
 
-   if (router_purpose == ROUTER_PURPOSE_BRIDGE && has_completed_circuit)
 
-     return 1; /* if no circuits yet, we may need this info to bootstrap. */
 
-   if (dir_purpose == DIR_PURPOSE_UPLOAD_DIR ||
 
-       dir_purpose == DIR_PURPOSE_UPLOAD_VOTE ||
 
-       dir_purpose == DIR_PURPOSE_UPLOAD_SIGNATURES ||
 
-       dir_purpose == DIR_PURPOSE_FETCH_V2_NETWORKSTATUS ||
 
-       dir_purpose == DIR_PURPOSE_FETCH_STATUS_VOTE ||
 
-       dir_purpose == DIR_PURPOSE_FETCH_DETACHED_SIGNATURES ||
 
-       dir_purpose == DIR_PURPOSE_FETCH_CONSENSUS ||
 
-       dir_purpose == DIR_PURPOSE_FETCH_CERTIFICATE ||
 
-       dir_purpose == DIR_PURPOSE_FETCH_SERVERDESC ||
 
-       dir_purpose == DIR_PURPOSE_FETCH_EXTRAINFO)
 
-     return 0;
 
-   return 1;
 
- }
 
- /** Return a newly allocated string describing <b>auth</b>. */
 
- char *
 
- authority_type_to_string(authority_type_t auth)
 
- {
 
-   char *result;
 
-   smartlist_t *lst = smartlist_create();
 
-   if (auth & V1_AUTHORITY)
 
-     smartlist_add(lst, (void*)"V1");
 
-   if (auth & V2_AUTHORITY)
 
-     smartlist_add(lst, (void*)"V2");
 
-   if (auth & BRIDGE_AUTHORITY)
 
-     smartlist_add(lst, (void*)"Bridge");
 
-   if (auth & HIDSERV_AUTHORITY)
 
-     smartlist_add(lst, (void*)"Hidden service");
 
-   if (smartlist_len(lst)) {
 
-     result = smartlist_join_strings(lst, ", ", 0, NULL);
 
-   } else {
 
-     result = tor_strdup("[Not an authority]");
 
-   }
 
-   smartlist_free(lst);
 
-   return result;
 
- }
 
- /** Return a string describing a given directory connection purpose. */
 
- static const char *
 
- dir_conn_purpose_to_string(int purpose)
 
- {
 
-   switch (purpose)
 
-     {
 
-     case DIR_PURPOSE_FETCH_RENDDESC:
 
-       return "hidden-service descriptor fetch";
 
-     case DIR_PURPOSE_UPLOAD_DIR:
 
-       return "server descriptor upload";
 
-     case DIR_PURPOSE_UPLOAD_RENDDESC:
 
-       return "hidden-service descriptor upload";
 
-     case DIR_PURPOSE_UPLOAD_VOTE:
 
-       return "server vote upload";
 
-     case DIR_PURPOSE_UPLOAD_SIGNATURES:
 
-       return "consensus signature upload";
 
-     case DIR_PURPOSE_FETCH_V2_NETWORKSTATUS:
 
-       return "network-status fetch";
 
-     case DIR_PURPOSE_FETCH_SERVERDESC:
 
-       return "server descriptor fetch";
 
-     case DIR_PURPOSE_FETCH_EXTRAINFO:
 
-       return "extra-info fetch";
 
-     case DIR_PURPOSE_FETCH_CONSENSUS:
 
-       return "consensus network-status fetch";
 
-     case DIR_PURPOSE_FETCH_CERTIFICATE:
 
-       return "authority cert fetch";
 
-     case DIR_PURPOSE_FETCH_STATUS_VOTE:
 
-       return "status vote fetch";
 
-     case DIR_PURPOSE_FETCH_DETACHED_SIGNATURES:
 
-       return "consensus signature fetch";
 
-     case DIR_PURPOSE_FETCH_RENDDESC_V2:
 
-       return "hidden-service v2 descriptor fetch";
 
-     case DIR_PURPOSE_UPLOAD_RENDDESC_V2:
 
-       return "hidden-service v2 descriptor upload";
 
-     }
 
-   log_warn(LD_BUG, "Called with unknown purpose %d", purpose);
 
-   return "(unknown)";
 
- }
 
- /** Return true iff <b>identity_digest</b> is the digest of a router we
 
-  * believe to support extrainfo downloads.  (If <b>is_authority</b> we do
 
-  * additional checking that's only valid for authorities.) */
 
- int
 
- router_supports_extrainfo(const char *identity_digest, int is_authority)
 
- {
 
-   routerinfo_t *ri = router_get_by_digest(identity_digest);
 
-   if (ri) {
 
-     if (ri->caches_extra_info)
 
-       return 1;
 
-     if (is_authority && ri->platform &&
 
-         tor_version_as_new_as(ri->platform, "Tor 0.2.0.0-alpha-dev (r10070)"))
 
-       return 1;
 
-   }
 
-   if (is_authority) {
 
-     routerstatus_t *rs = router_get_consensus_status_by_id(identity_digest);
 
-     if (rs && rs->version_supports_extrainfo_upload)
 
-       return 1;
 
-   }
 
-   return 0;
 
- }
 
- /** Return true iff any trusted directory authority has accepted our
 
-  * server descriptor.
 
-  *
 
-  * We consider any authority sufficient because waiting for all of
 
-  * them means it never happens while any authority is down; we don't
 
-  * go for something more complex in the middle (like \>1/3 or \>1/2 or
 
-  * \>=1/2) because that doesn't seem necessary yet.
 
-  */
 
- int
 
- directories_have_accepted_server_descriptor(void)
 
- {
 
-   smartlist_t *servers = router_get_trusted_dir_servers();
 
-   or_options_t *options = get_options();
 
-   SMARTLIST_FOREACH(servers, trusted_dir_server_t *, d, {
 
-     if ((d->type & options->_PublishServerDescriptor) &&
 
-         d->has_accepted_serverdesc) {
 
-       return 1;
 
-     }
 
-   });
 
-   return 0;
 
- }
 
- /** Start a connection to every suitable directory authority, using
 
-  * connection purpose 'purpose' and uploading the payload 'payload'
 
-  * (length 'payload_len').  The purpose should be one of
 
-  * 'DIR_PURPOSE_UPLOAD_DIR' or 'DIR_PURPOSE_UPLOAD_RENDDESC'.
 
-  *
 
-  * <b>type</b> specifies what sort of dir authorities (V1, V2,
 
-  * HIDSERV, BRIDGE) we should upload to.
 
-  *
 
-  * If <b>extrainfo_len</b> is nonzero, the first <b>payload_len</b> bytes of
 
-  * <b>payload</b> hold a router descriptor, and the next <b>extrainfo_len</b>
 
-  * bytes of <b>payload</b> hold an extra-info document.  Upload the descriptor
 
-  * to all authorities, and the extra-info document to all authorities that
 
-  * support it.
 
-  */
 
- void
 
- directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose,
 
-                              authority_type_t type,
 
-                              const char *payload,
 
-                              size_t payload_len, size_t extrainfo_len)
 
- {
 
-   int post_via_tor;
 
-   smartlist_t *dirservers = router_get_trusted_dir_servers();
 
-   int found = 0;
 
-   tor_assert(dirservers);
 
-   /* This tries dirservers which we believe to be down, but ultimately, that's
 
-    * harmless, and we may as well err on the side of getting things uploaded.
 
-    */
 
-   SMARTLIST_FOREACH_BEGIN(dirservers, trusted_dir_server_t *, ds) {
 
-       routerstatus_t *rs = &(ds->fake_status);
 
-       size_t upload_len = payload_len;
 
-       tor_addr_t ds_addr;
 
-       if ((type & ds->type) == 0)
 
-         continue;
 
-       found = 1; /* at least one authority of this type was listed */
 
-       if (dir_purpose == DIR_PURPOSE_UPLOAD_DIR)
 
-         ds->has_accepted_serverdesc = 0;
 
-       if (extrainfo_len && router_supports_extrainfo(ds->digest, 1)) {
 
-         upload_len += extrainfo_len;
 
-         log_info(LD_DIR, "Uploading an extrainfo too (length %d)",
 
-                  (int) extrainfo_len);
 
-       }
 
-       tor_addr_from_ipv4h(&ds_addr, ds->addr);
 
-       post_via_tor = purpose_needs_anonymity(dir_purpose, router_purpose) ||
 
-         !fascist_firewall_allows_address_dir(&ds_addr, ds->dir_port);
 
-       directory_initiate_command_routerstatus(rs, dir_purpose,
 
-                                               router_purpose,
 
-                                               post_via_tor,
 
-                                               NULL, payload, upload_len, 0);
 
-   } SMARTLIST_FOREACH_END(ds);
 
-   if (!found) {
 
-     char *s = authority_type_to_string(type);
 
-     log_warn(LD_DIR, "Publishing server descriptor to directory authorities "
 
-              "of type '%s', but no authorities of that type listed!", s);
 
-     tor_free(s);
 
-   }
 
- }
 
- /** Start a connection to a random running directory server, using
 
-  * connection purpose <b>dir_purpose</b>, intending to fetch descriptors
 
-  * of purpose <b>router_purpose</b>, and requesting <b>resource</b>.
 
-  * Use <b>pds_flags</b> as arguments to router_pick_directory_server()
 
-  * or router_pick_trusteddirserver().
 
-  */
 
- void
 
- directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose,
 
-                              const char *resource, int pds_flags)
 
- {
 
-   routerstatus_t *rs = NULL;
 
-   or_options_t *options = get_options();
 
-   int prefer_authority = directory_fetches_from_authorities(options);
 
-   int get_via_tor = purpose_needs_anonymity(dir_purpose, router_purpose);
 
-   authority_type_t type;
 
-   time_t if_modified_since = 0;
 
-   /* FFFF we could break this switch into its own function, and call
 
-    * it elsewhere in directory.c. -RD */
 
-   switch (dir_purpose) {
 
-     case DIR_PURPOSE_FETCH_EXTRAINFO:
 
-       type = EXTRAINFO_CACHE |
 
-              (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_AUTHORITY :
 
-                                                         V2_AUTHORITY);
 
-       break;
 
-     case DIR_PURPOSE_FETCH_V2_NETWORKSTATUS:
 
-     case DIR_PURPOSE_FETCH_SERVERDESC:
 
-       type = (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_AUTHORITY :
 
-                                                         V2_AUTHORITY);
 
-       break;
 
-     case DIR_PURPOSE_FETCH_RENDDESC:
 
-       type = HIDSERV_AUTHORITY;
 
-       break;
 
-     case DIR_PURPOSE_FETCH_STATUS_VOTE:
 
-     case DIR_PURPOSE_FETCH_DETACHED_SIGNATURES:
 
-       type = V3_AUTHORITY;
 
-       break;
 
-     case DIR_PURPOSE_FETCH_CONSENSUS:
 
-     case DIR_PURPOSE_FETCH_CERTIFICATE:
 
-       type = V3_AUTHORITY;
 
-       break;
 
-     default:
 
-       log_warn(LD_BUG, "Unexpected purpose %d", (int)dir_purpose);
 
-       return;
 
-   }
 
-   if (DIR_PURPOSE_FETCH_CONSENSUS) {
 
-     networkstatus_t *v = networkstatus_get_latest_consensus();
 
-     if (v)
 
-       if_modified_since = v->valid_after + 180;
 
-   }
 
-   if (!options->FetchServerDescriptors && type != HIDSERV_AUTHORITY)
 
-     return;
 
-   if (!get_via_tor) {
 
-     if (options->UseBridges && type != BRIDGE_AUTHORITY) {
 
-       /* want to ask a running bridge for which we have a descriptor. */
 
-       /* XXX022 we assume that all of our bridges can answer any
 
-        * possible directory question. This won't be true forever. -RD */
 
-       /* It certainly is not true with conditional consensus downloading,
 
-        * so, for now, never assume the server supports that. */
 
-       routerinfo_t *ri = choose_random_entry(NULL);
 
-       if (ri) {
 
-         tor_addr_t addr;
 
-         tor_addr_from_ipv4h(&addr, ri->addr);
 
-         directory_initiate_command(ri->address, &addr,
 
-                                    ri->or_port, 0,
 
-                                    0, /* don't use conditional consensus url */
 
-                                    1, ri->cache_info.identity_digest,
 
-                                    dir_purpose,
 
-                                    router_purpose,
 
-                                    0, resource, NULL, 0, if_modified_since);
 
-       } else
 
-         log_notice(LD_DIR, "Ignoring directory request, since no bridge "
 
-                            "nodes are available yet.");
 
-       return;
 
-     } else {
 
-       if (prefer_authority || type == BRIDGE_AUTHORITY) {
 
-         /* only ask authdirservers, and don't ask myself */
 
-         rs = router_pick_trusteddirserver(type, pds_flags);
 
-         if (rs == NULL && (pds_flags & PDS_NO_EXISTING_SERVERDESC_FETCH)) {
 
-           /* We don't want to fetch from any authorities that we're currently
 
-            * fetching server descriptors from, and we got no match.  Did we
 
-            * get no match because all the authorities have connections
 
-            * fetching server descriptors (in which case we should just
 
-            * return,) or because all the authorities are down or on fire or
 
-            * unreachable or something (in which case we should go on with
 
-            * our fallback code)? */
 
-           pds_flags &= ~PDS_NO_EXISTING_SERVERDESC_FETCH;
 
-           rs = router_pick_trusteddirserver(type, pds_flags);
 
-           if (rs) {
 
-             log_debug(LD_DIR, "Deferring serverdesc fetch: all authorities "
 
-                       "are in use.");
 
-             return;
 
-           }
 
-         }
 
-       }
 
-       if (!rs && type != BRIDGE_AUTHORITY) {
 
-         /* anybody with a non-zero dirport will do */
 
-         rs = router_pick_directory_server(type, pds_flags);
 
-         if (!rs) {
 
-           log_info(LD_DIR, "No router found for %s; falling back to "
 
-                    "dirserver list.", dir_conn_purpose_to_string(dir_purpose));
 
-           rs = router_pick_trusteddirserver(type, pds_flags);
 
-           if (!rs)
 
-             get_via_tor = 1; /* last resort: try routing it via Tor */
 
-         }
 
-       }
 
-     }
 
-   } else { /* get_via_tor */
 
-     /* Never use fascistfirewall; we're going via Tor. */
 
-     if (dir_purpose == DIR_PURPOSE_FETCH_RENDDESC) {
 
-       /* only ask hidserv authorities, any of them will do */
 
-       pds_flags |= PDS_IGNORE_FASCISTFIREWALL|PDS_ALLOW_SELF;
 
-       rs = router_pick_trusteddirserver(HIDSERV_AUTHORITY, pds_flags);
 
-     } else {
 
-       /* anybody with a non-zero dirport will do. Disregard firewalls. */
 
-       pds_flags |= PDS_IGNORE_FASCISTFIREWALL;
 
-       rs = router_pick_directory_server(type, pds_flags);
 
-       /* If we have any hope of building an indirect conn, we know some router
 
-        * descriptors.  If (rs==NULL), we can't build circuits anyway, so
 
-        * there's no point in falling back to the authorities in this case. */
 
-     }
 
-   }
 
-   if (rs)
 
-     directory_initiate_command_routerstatus(rs, dir_purpose,
 
-                                             router_purpose,
 
-                                             get_via_tor,
 
-                                             resource, NULL, 0,
 
-                                             if_modified_since);
 
-   else {
 
-     log_notice(LD_DIR,
 
-                "While fetching directory info, "
 
-                "no running dirservers known. Will try again later. "
 
-                "(purpose %d)", dir_purpose);
 
-     if (!purpose_needs_anonymity(dir_purpose, router_purpose)) {
 
-       /* remember we tried them all and failed. */
 
-       directory_all_unreachable(time(NULL));
 
-     }
 
-   }
 
- }
 
- /** As directory_get_from_dirserver, but initiates a request to <i>every</i>
 
-  * directory authority other than ourself.  Only for use by authorities when
 
-  * searching for missing information while voting. */
 
- void
 
- directory_get_from_all_authorities(uint8_t dir_purpose,
 
-                                    uint8_t router_purpose,
 
-                                    const char *resource)
 
- {
 
-   tor_assert(dir_purpose == DIR_PURPOSE_FETCH_STATUS_VOTE ||
 
-              dir_purpose == DIR_PURPOSE_FETCH_DETACHED_SIGNATURES);
 
-   SMARTLIST_FOREACH(router_get_trusted_dir_servers(),
 
-                     trusted_dir_server_t *, ds,
 
-     {
 
-       routerstatus_t *rs;
 
-       if (router_digest_is_me(ds->digest))
 
-         continue;
 
-       if (!(ds->type & V3_AUTHORITY))
 
-         continue;
 
-       rs = &ds->fake_status;
 
-       directory_initiate_command_routerstatus(rs, dir_purpose, router_purpose,
 
-                                               0, resource, NULL, 0, 0);
 
-     });
 
- }
 
- /** Same as directory_initiate_command_routerstatus(), but accepts
 
-  * rendezvous data to fetch a hidden service descriptor. */
 
- void
 
- directory_initiate_command_routerstatus_rend(routerstatus_t *status,
 
-                                              uint8_t dir_purpose,
 
-                                              uint8_t router_purpose,
 
-                                              int anonymized_connection,
 
-                                              const char *resource,
 
-                                              const char *payload,
 
-                                              size_t payload_len,
 
-                                              time_t if_modified_since,
 
-                                              const rend_data_t *rend_query)
 
- {
 
-   routerinfo_t *router;
 
-   char address_buf[INET_NTOA_BUF_LEN+1];
 
-   struct in_addr in;
 
-   const char *address;
 
-   tor_addr_t addr;
 
-   router = router_get_by_digest(status->identity_digest);
 
-   if (!router && anonymized_connection) {
 
-     log_info(LD_DIR, "Not sending anonymized request to directory '%s'; we "
 
-                      "don't have its router descriptor.", status->nickname);
 
-     return;
 
-   } else if (router) {
 
-     address = router->address;
 
-   } else {
 
-     in.s_addr = htonl(status->addr);
 
-     tor_inet_ntoa(&in, address_buf, sizeof(address_buf));
 
-     address = address_buf;
 
-   }
 
-   tor_addr_from_ipv4h(&addr, status->addr);
 
-   directory_initiate_command_rend(address, &addr,
 
-                              status->or_port, status->dir_port,
 
-                              status->version_supports_conditional_consensus,
 
-                              status->version_supports_begindir,
 
-                              status->identity_digest,
 
-                              dir_purpose, router_purpose,
 
-                              anonymized_connection, resource,
 
-                              payload, payload_len, if_modified_since,
 
-                              rend_query);
 
- }
 
- /** Launch a new connection to the directory server <b>status</b> to
 
-  * upload or download a server or rendezvous
 
-  * descriptor. <b>dir_purpose</b> determines what
 
-  * kind of directory connection we're launching, and must be one of
 
-  * DIR_PURPOSE_{FETCH|UPLOAD}_{DIR|RENDDESC|RENDDESC_V2}. <b>router_purpose</b>
 
-  * specifies the descriptor purposes we have in mind (currently only
 
-  * used for FETCH_DIR).
 
-  *
 
-  * When uploading, <b>payload</b> and <b>payload_len</b> determine the content
 
-  * of the HTTP post.  Otherwise, <b>payload</b> should be NULL.
 
-  *
 
-  * When fetching a rendezvous descriptor, <b>resource</b> is the service ID we
 
-  * want to fetch.
 
-  */
 
- void
 
- directory_initiate_command_routerstatus(routerstatus_t *status,
 
-                                         uint8_t dir_purpose,
 
-                                         uint8_t router_purpose,
 
-                                         int anonymized_connection,
 
-                                         const char *resource,
 
-                                         const char *payload,
 
-                                         size_t payload_len,
 
-                                         time_t if_modified_since)
 
- {
 
-   directory_initiate_command_routerstatus_rend(status, dir_purpose,
 
-                                           router_purpose,
 
-                                           anonymized_connection, resource,
 
-                                           payload, payload_len,
 
-                                           if_modified_since, NULL);
 
- }
 
- /** Return true iff <b>conn</b> is the client side of a directory connection
 
-  * we launched to ourself in order to determine the reachability of our
 
-  * dir_port. */
 
- static int
 
- directory_conn_is_self_reachability_test(dir_connection_t *conn)
 
- {
 
-   if (conn->requested_resource &&
 
-       !strcmpstart(conn->requested_resource,"authority")) {
 
-     routerinfo_t *me = router_get_my_routerinfo();
 
-     if (me &&
 
-         router_digest_is_me(conn->identity_digest) &&
 
-         tor_addr_eq_ipv4h(&conn->_base.addr, me->addr) && /*XXXX prop 118*/
 
-         me->dir_port == conn->_base.port)
 
-       return 1;
 
-   }
 
-   return 0;
 
- }
 
- /** Called when we are unable to complete the client's request to a directory
 
-  * server due to a network error: Mark the router as down and try again if
 
-  * possible.
 
-  */
 
- void
 
- connection_dir_request_failed(dir_connection_t *conn)
 
- {
 
-   if (directory_conn_is_self_reachability_test(conn)) {
 
-     routerinfo_t *me = router_get_my_routerinfo();
 
-     if (me)
 
-       control_event_server_status(LOG_WARN,
 
-                                   "REACHABILITY_FAILED DIRADDRESS=%s:%d",
 
-                                   me->address, me->dir_port);
 
-     return; /* this was a test fetch. don't retry. */
 
-   }
 
-   if (entry_list_can_grow(get_options()))
 
-     router_set_status(conn->identity_digest, 0); /* don't try him again */
 
-   if (conn->_base.purpose == DIR_PURPOSE_FETCH_V2_NETWORKSTATUS) {
 
-     log_info(LD_DIR, "Giving up on directory server at '%s'; retrying",
 
-              conn->_base.address);
 
-     connection_dir_download_networkstatus_failed(conn, -1);
 
-   } else if (conn->_base.purpose == DIR_PURPOSE_FETCH_SERVERDESC ||
 
-              conn->_base.purpose == DIR_PURPOSE_FETCH_EXTRAINFO) {
 
-     log_info(LD_DIR, "Giving up on directory server at '%s'; retrying",
 
-              conn->_base.address);
 
-     connection_dir_download_routerdesc_failed(conn);
 
-   } else if (conn->_base.purpose == DIR_PURPOSE_FETCH_CONSENSUS) {
 
-     networkstatus_consensus_download_failed(0);
 
-   } else if (conn->_base.purpose == DIR_PURPOSE_FETCH_CERTIFICATE) {
 
-     log_info(LD_DIR, "Giving up on directory server at '%s'; retrying",
 
-              conn->_base.address);
 
-     connection_dir_download_cert_failed(conn, 0);
 
-   } else if (conn->_base.purpose == DIR_PURPOSE_FETCH_DETACHED_SIGNATURES) {
 
-     log_info(LD_DIR, "Giving up downloading detached signatures from '%s'",
 
-              conn->_base.address);
 
-   } else if (conn->_base.purpose == DIR_PURPOSE_FETCH_STATUS_VOTE) {
 
-     log_info(LD_DIR, "Giving up downloading votes from '%s'",
 
-              conn->_base.address);
 
-   }
 
- }
 
- /** Called when an attempt to download one or more network status
 
-  * documents on connection <b>conn</b> failed. Decide whether to
 
-  * retry the fetch now, later, or never.
 
-  */
 
- static void
 
- connection_dir_download_networkstatus_failed(dir_connection_t *conn,
 
-                                              int status_code)
 
- {
 
-   if (!conn->requested_resource) {
 
-     /* We never reached directory_send_command, which means that we never
 
-      * opened a network connection.  Either we're out of sockets, or the
 
-      * network is down.  Either way, retrying would be pointless. */
 
-     return;
 
-   }
 
-   if (!strcmpstart(conn->requested_resource, "all")) {
 
-     /* We're a non-authoritative directory cache; try again. Ignore status
 
-      * code, since we don't want to keep trying forever in a tight loop
 
-      * if all the authorities are shutting us out. */
 
-     smartlist_t *trusted_dirs = router_get_trusted_dir_servers();
 
-     SMARTLIST_FOREACH(trusted_dirs, trusted_dir_server_t *, ds,
 
-                       download_status_failed(&ds->v2_ns_dl_status, 0));
 
-     directory_get_from_dirserver(conn->_base.purpose, conn->router_purpose,
 
-                                  "all.z", 0 /* don't retry_if_no_servers */);
 
-   } else if (!strcmpstart(conn->requested_resource, "fp/")) {
 
-     /* We were trying to download by fingerprint; mark them all as having
 
-      * failed, and possibly retry them later.*/
 
-     smartlist_t *failed = smartlist_create();
 
-     dir_split_resource_into_fingerprints(conn->requested_resource+3,
 
-                                          failed, NULL, 0, 0);
 
-     if (smartlist_len(failed)) {
 
-       dir_networkstatus_download_failed(failed, status_code);
 
-       SMARTLIST_FOREACH(failed, char *, cp, tor_free(cp));
 
-     }
 
-     smartlist_free(failed);
 
-   }
 
- }
 
- /** Called when an attempt to download one or more router descriptors
 
-  * or extra-info documents on connection <b>conn</b> failed.
 
-  */
 
- static void
 
- connection_dir_download_routerdesc_failed(dir_connection_t *conn)
 
- {
 
-   /* No need to increment the failure count for routerdescs, since
 
-    * it's not their fault. */
 
-   /* No need to relaunch descriptor downloads here: we already do it
 
-    * every 10 or 60 seconds (FOO_DESCRIPTOR_RETRY_INTERVAL) in main.c. */
 
-   tor_assert(conn->_base.purpose == DIR_PURPOSE_FETCH_SERVERDESC ||
 
-              conn->_base.purpose == DIR_PURPOSE_FETCH_EXTRAINFO);
 
-   (void) conn;
 
- }
 
- /** Called when an attempt to fetch a certificate fails. */
 
- static void
 
- connection_dir_download_cert_failed(dir_connection_t *conn, int status)
 
- {
 
-   smartlist_t *failed;
 
-   tor_assert(conn->_base.purpose == DIR_PURPOSE_FETCH_CERTIFICATE);
 
-   if (!conn->requested_resource)
 
-     return;
 
-   failed = smartlist_create();
 
-   dir_split_resource_into_fingerprints(conn->requested_resource+3,
 
-                                        failed, NULL, 1, 0);
 
-   SMARTLIST_FOREACH(failed, char *, cp,
 
-   {
 
-     authority_cert_dl_failed(cp, status);
 
-     tor_free(cp);
 
-   });
 
-   smartlist_free(failed);
 
-   update_certificate_downloads(time(NULL));
 
- }
 
- /** Evaluate the situation and decide if we should use an encrypted
 
-  * "begindir-style" connection for this directory request.
 
-  * 1) If or_port is 0, or it's a direct conn and or_port is firewalled
 
-  *    or we're a dir mirror, no.
 
-  * 2) If we prefer to avoid begindir conns, and we're not fetching or
 
-  * publishing a bridge relay descriptor, no.
 
-  * 3) Else yes.
 
-  */
 
- static int
 
- directory_command_should_use_begindir(or_options_t *options,
 
-                                       const tor_addr_t *addr,
 
-                                       int or_port, uint8_t router_purpose,
 
-                                       int anonymized_connection)
 
- {
 
-   if (!or_port)
 
-     return 0; /* We don't know an ORPort -- no chance. */
 
-   if (!anonymized_connection)
 
-     if (!fascist_firewall_allows_address_or(addr, or_port) ||
 
-         directory_fetches_from_authorities(options) ||
 
-         (server_mode(options) && !options->Address))
 
-       return 0; /* We're firewalled or are acting like a relay -- also no. */
 
-   if (!options->TunnelDirConns &&
 
-       router_purpose != ROUTER_PURPOSE_BRIDGE)
 
-     return 0; /* We prefer to avoid using begindir conns. Fine. */
 
-   return 1;
 
- }
 
- /** Helper for directory_initiate_command_routerstatus: send the
 
-  * command to a server whose address is <b>address</b>, whose IP is
 
-  * <b>addr</b>, whose directory port is <b>dir_port</b>, whose tor version
 
-  * <b>supports_begindir</b>, and whose identity key digest is
 
-  * <b>digest</b>. */
 
- void
 
- directory_initiate_command(const char *address, const tor_addr_t *_addr,
 
-                            uint16_t or_port, uint16_t dir_port,
 
-                            int supports_conditional_consensus,
 
-                            int supports_begindir, const char *digest,
 
-                            uint8_t dir_purpose, uint8_t router_purpose,
 
-                            int anonymized_connection, const char *resource,
 
-                            const char *payload, size_t payload_len,
 
-                            time_t if_modified_since)
 
- {
 
-   directory_initiate_command_rend(address, _addr, or_port, dir_port,
 
-                              supports_conditional_consensus,
 
-                              supports_begindir, digest, dir_purpose,
 
-                              router_purpose, anonymized_connection,
 
-                              resource, payload, payload_len,
 
-                              if_modified_since, NULL);
 
- }
 
- /** Same as directory_initiate_command(), but accepts rendezvous data to
 
-  * fetch a hidden service descriptor. */
 
- static void
 
- directory_initiate_command_rend(const char *address, const tor_addr_t *_addr,
 
-                                 uint16_t or_port, uint16_t dir_port,
 
-                                 int supports_conditional_consensus,
 
-                                 int supports_begindir, const char *digest,
 
-                                 uint8_t dir_purpose, uint8_t router_purpose,
 
-                                 int anonymized_connection,
 
-                                 const char *resource,
 
-                                 const char *payload, size_t payload_len,
 
-                                 time_t if_modified_since,
 
-                                 const rend_data_t *rend_query)
 
- {
 
-   dir_connection_t *conn;
 
-   or_options_t *options = get_options();
 
-   int socket_error = 0;
 
-   int use_begindir = supports_begindir &&
 
-                      directory_command_should_use_begindir(options, _addr,
 
-                        or_port, router_purpose, anonymized_connection);
 
-   tor_addr_t addr;
 
-   tor_assert(address);
 
-   tor_assert(_addr);
 
-   tor_assert(or_port || dir_port);
 
-   tor_assert(digest);
 
-   tor_addr_copy(&addr, _addr);
 
-   log_debug(LD_DIR, "anonymized %d, use_begindir %d.",
 
-             anonymized_connection, use_begindir);
 
-   log_debug(LD_DIR, "Initiating %s", dir_conn_purpose_to_string(dir_purpose));
 
-   /* ensure that we don't make direct connections when a SOCKS server is
 
-    * configured. */
 
-   if (!anonymized_connection && !use_begindir && !options->HttpProxy &&
 
-       (options->Socks4Proxy || options->Socks5Proxy)) {
 
-     log_warn(LD_DIR, "Cannot connect to a directory server through a "
 
-                      "SOCKS proxy!");
 
-     return;
 
-   }
 
-   conn = dir_connection_new(AF_INET);
 
-   /* set up conn so it's got all the data we need to remember */
 
-   tor_addr_copy(&conn->_base.addr, &addr);
 
-   conn->_base.port = use_begindir ? or_port : dir_port;
 
-   conn->_base.address = tor_strdup(address);
 
-   memcpy(conn->identity_digest, digest, DIGEST_LEN);
 
-   conn->_base.purpose = dir_purpose;
 
-   conn->router_purpose = router_purpose;
 
-   /* give it an initial state */
 
-   conn->_base.state = DIR_CONN_STATE_CONNECTING;
 
-   /* decide whether we can learn our IP address from this conn */
 
-   conn->dirconn_direct = !anonymized_connection;
 
-   /* copy rendezvous data, if any */
 
-   if (rend_query)
 
-     conn->rend_data = rend_data_dup(rend_query);
 
-   if (!anonymized_connection && !use_begindir) {
 
-     /* then we want to connect to dirport directly */
 
-     if (options->HttpProxy) {
 
-       tor_addr_copy(&addr, &options->HttpProxyAddr);
 
-       dir_port = options->HttpProxyPort;
 
-     }
 
-     switch (connection_connect(TO_CONN(conn), conn->_base.address, &addr,
 
-                                dir_port, &socket_error)) {
 
-       case -1:
 
-         connection_dir_request_failed(conn); /* retry if we want */
 
-         /* XXX we only pass 'conn' above, not 'resource', 'payload',
 
-          * etc. So in many situations it can't retry! -RD */
 
-         connection_free(TO_CONN(conn));
 
-         return;
 
-       case 1:
 
-         /* start flushing conn */
 
-         conn->_base.state = DIR_CONN_STATE_CLIENT_SENDING;
 
-         /* fall through */
 
-       case 0:
 
-         /* queue the command on the outbuf */
 
-         directory_send_command(conn, dir_purpose, 1, resource,
 
-                                payload, payload_len,
 
-                                supports_conditional_consensus,
 
-                                if_modified_since);
 
-         connection_watch_events(TO_CONN(conn), READ_EVENT | WRITE_EVENT);
 
-         /* writable indicates finish, readable indicates broken link,
 
-            error indicates broken link in windowsland. */
 
-     }
 
-   } else { /* we want to connect via a tor connection */
 
-     edge_connection_t *linked_conn;
 
-     /* If it's an anonymized connection, remember the fact that we
 
-      * wanted it for later: maybe we'll want it again soon. */
 
-     if (anonymized_connection && use_begindir)
 
-       rep_hist_note_used_internal(time(NULL), 0, 1);
 
-     else if (anonymized_connection && !use_begindir)
 
-       rep_hist_note_used_port(time(NULL), conn->_base.port);
 
-     /* make an AP connection
 
-      * populate it and add it at the right state
 
-      * hook up both sides
 
-      */
 
-     linked_conn =
 
-       connection_ap_make_link(conn->_base.address, conn->_base.port,
 
-                               digest, use_begindir, conn->dirconn_direct);
 
-     if (!linked_conn) {
 
-       log_warn(LD_NET,"Making tunnel to dirserver failed.");
 
-       connection_mark_for_close(TO_CONN(conn));
 
-       return;
 
-     }
 
-     connection_link_connections(TO_CONN(conn), TO_CONN(linked_conn));
 
-     if (connection_add(TO_CONN(conn)) < 0) {
 
-       log_warn(LD_NET,"Unable to add connection for link to dirserver.");
 
-       connection_mark_for_close(TO_CONN(conn));
 
-       return;
 
-     }
 
-     conn->_base.state = DIR_CONN_STATE_CLIENT_SENDING;
 
-     /* queue the command on the outbuf */
 
-     directory_send_command(conn, dir_purpose, 0, resource,
 
-                            payload, payload_len,
 
-                            supports_conditional_consensus,
 
-                            if_modified_since);
 
-     connection_watch_events(TO_CONN(conn), READ_EVENT|WRITE_EVENT);
 
-     connection_start_reading(TO_CONN(linked_conn));
 
-   }
 
- }
 
- /** Return true iff anything we say on <b>conn</b> is being encrypted before
 
-  * we send it to the client/server. */
 
- int
 
- connection_dir_is_encrypted(dir_connection_t *conn)
 
- {
 
-   /* Right now it's sufficient to see if conn is or has been linked, since
 
-    * the only thing it could be linked to is an edge connection on a
 
-    * circuit, and the only way it could have been unlinked is at the edge
 
-    * connection getting closed.
 
-    */
 
-   return TO_CONN(conn)->linked;
 
- }
 
- /** Helper for sorting
 
-  *
 
-  * sort strings alphabetically
 
-  */
 
- static int
 
- _compare_strs(const void **a, const void **b)
 
- {
 
-   const char *s1 = *a, *s2 = *b;
 
-   return strcmp(s1, s2);
 
- }
 
- #define CONDITIONAL_CONSENSUS_FPR_LEN 3
 
- #if (CONDITIONAL_CONSENSUS_FPR_LEN > DIGEST_LEN)
 
- #error "conditional consensus fingerprint length is larger than digest length"
 
- #endif
 
- /** Return the URL we should use for a consensus download.
 
-  *
 
-  * This url depends on whether or not the server we go to
 
-  * is sufficiently new to support conditional consensus downloading,
 
-  * i.e. GET .../consensus/<b>fpr</b>+<b>fpr</b>+<b>fpr</b>
 
-  */
 
- static char *
 
- directory_get_consensus_url(int supports_conditional_consensus)
 
- {
 
-   char *url;
 
-   int len;
 
-   if (supports_conditional_consensus) {
 
-     char *authority_id_list;
 
-     smartlist_t *authority_digets = smartlist_create();
 
-     SMARTLIST_FOREACH(router_get_trusted_dir_servers(),
 
-                       trusted_dir_server_t *, ds,
 
-       {
 
-         char *hex;
 
-         if (!(ds->type & V3_AUTHORITY))
 
-           continue;
 
-         hex = tor_malloc(2*CONDITIONAL_CONSENSUS_FPR_LEN+1);
 
-         base16_encode(hex, 2*CONDITIONAL_CONSENSUS_FPR_LEN+1,
 
-                       ds->v3_identity_digest, CONDITIONAL_CONSENSUS_FPR_LEN);
 
-         smartlist_add(authority_digets, hex);
 
-       });
 
-     smartlist_sort(authority_digets, _compare_strs);
 
-     authority_id_list = smartlist_join_strings(authority_digets,
 
-                                                "+", 0, NULL);
 
-     len = strlen(authority_id_list)+64;
 
-     url = tor_malloc(len);
 
-     tor_snprintf(url, len, "/tor/status-vote/current/consensus/%s.z",
 
-                  authority_id_list);
 
-     SMARTLIST_FOREACH(authority_digets, char *, cp, tor_free(cp));
 
-     smartlist_free(authority_digets);
 
-     tor_free(authority_id_list);
 
-   } else {
 
-     url = tor_strdup("/tor/status-vote/current/consensus.z");
 
-   }
 
-   return url;
 
- }
 
- /** Queue an appropriate HTTP command on conn-\>outbuf.  The other args
 
-  * are as in directory_initiate_command.
 
-  */
 
- static void
 
- directory_send_command(dir_connection_t *conn,
 
-                        int purpose, int direct, const char *resource,
 
-                        const char *payload, size_t payload_len,
 
-                        int supports_conditional_consensus,
 
-                        time_t if_modified_since)
 
- {
 
-   char proxystring[256];
 
-   char proxyauthstring[256];
 
-   char hoststring[128];
 
-   char imsstring[RFC1123_TIME_LEN+32];
 
-   char *url;
 
-   char request[8192];
 
-   const char *httpcommand = NULL;
 
-   size_t len;
 
-   tor_assert(conn);
 
-   tor_assert(conn->_base.type == CONN_TYPE_DIR);
 
-   tor_free(conn->requested_resource);
 
-   if (resource)
 
-     conn->requested_resource = tor_strdup(resource);
 
-   /* come up with a string for which Host: we want */
 
-   if (conn->_base.port == 80) {
 
-     strlcpy(hoststring, conn->_base.address, sizeof(hoststring));
 
-   } else {
 
-     tor_snprintf(hoststring, sizeof(hoststring),"%s:%d",
 
-                  conn->_base.address, conn->_base.port);
 
-   }
 
-   /* Format if-modified-since */
 
-   if (!if_modified_since) {
 
-     imsstring[0] = '\0';
 
-   } else {
 
-     char b[RFC1123_TIME_LEN+1];
 
-     format_rfc1123_time(b, if_modified_since);
 
-     tor_snprintf(imsstring, sizeof(imsstring), "\r\nIf-Modified-Since: %s", b);
 
-   }
 
-   /* come up with some proxy lines, if we're using one. */
 
-   if (direct && get_options()->HttpProxy) {
 
-     char *base64_authenticator=NULL;
 
-     const char *authenticator = get_options()->HttpProxyAuthenticator;
 
-     tor_snprintf(proxystring, sizeof(proxystring),"http://%s", hoststring);
 
-     if (authenticator) {
 
-       base64_authenticator = alloc_http_authenticator(authenticator);
 
-       if (!base64_authenticator)
 
-         log_warn(LD_BUG, "Encoding http authenticator failed");
 
-     }
 
-     if (base64_authenticator) {
 
-       tor_snprintf(proxyauthstring, sizeof(proxyauthstring),
 
-                    "\r\nProxy-Authorization: Basic %s",
 
-                    base64_authenticator);
 
-       tor_free(base64_authenticator);
 
-     } else {
 
-       proxyauthstring[0] = 0;
 
-     }
 
-   } else {
 
-     proxystring[0] = 0;
 
-     proxyauthstring[0] = 0;
 
-   }
 
-   switch (purpose) {
 
-     case DIR_PURPOSE_FETCH_V2_NETWORKSTATUS:
 
-       tor_assert(resource);
 
-       httpcommand = "GET";
 
-       len = strlen(resource)+32;
 
-       url = tor_malloc(len);
 
-       tor_snprintf(url, len, "/tor/status/%s", resource);
 
-       break;
 
-     case DIR_PURPOSE_FETCH_CONSENSUS:
 
-       tor_assert(!resource);
 
-       tor_assert(!payload);
 
-       httpcommand = "GET";
 
-       url = directory_get_consensus_url(supports_conditional_consensus);
 
-       log_info(LD_DIR, "Downloading consensus from %s using %s",
 
-                hoststring, url);
 
-       break;
 
-     case DIR_PURPOSE_FETCH_CERTIFICATE:
 
-       tor_assert(resource);
 
-       tor_assert(!payload);
 
-       httpcommand = "GET";
 
-       len = strlen(resource)+32;
 
-       url = tor_malloc(len);
 
-       tor_snprintf(url, len, "/tor/keys/%s", resource);
 
-       break;
 
-     case DIR_PURPOSE_FETCH_STATUS_VOTE:
 
-       tor_assert(resource);
 
-       tor_assert(!payload);
 
-       httpcommand = "GET";
 
-       len = strlen(resource)+32;
 
-       url = tor_malloc(len);
 
-       tor_snprintf(url, len, "/tor/status-vote/next/%s.z", resource);
 
-       break;
 
-     case DIR_PURPOSE_FETCH_DETACHED_SIGNATURES:
 
-       tor_assert(!resource);
 
-       tor_assert(!payload);
 
-       httpcommand = "GET";
 
-       url = tor_strdup("/tor/status-vote/next/consensus-signatures.z");
 
-       break;
 
-     case DIR_PURPOSE_FETCH_SERVERDESC:
 
-       tor_assert(resource);
 
-       httpcommand = "GET";
 
-       len = strlen(resource)+32;
 
-       url = tor_malloc(len);
 
-       tor_snprintf(url, len, "/tor/server/%s", resource);
 
-       break;
 
-     case DIR_PURPOSE_FETCH_EXTRAINFO:
 
-       tor_assert(resource);
 
-       httpcommand = "GET";
 
-       len = strlen(resource)+32;
 
-       url = tor_malloc(len);
 
-       tor_snprintf(url, len, "/tor/extra/%s", resource);
 
-       break;
 
-     case DIR_PURPOSE_UPLOAD_DIR:
 
-       tor_assert(!resource);
 
-       tor_assert(payload);
 
-       httpcommand = "POST";
 
-       url = tor_strdup("/tor/");
 
-       break;
 
-     case DIR_PURPOSE_UPLOAD_VOTE:
 
-       tor_assert(!resource);
 
-       tor_assert(payload);
 
-       httpcommand = "POST";
 
-       url = tor_strdup("/tor/post/vote");
 
-       break;
 
-     case DIR_PURPOSE_UPLOAD_SIGNATURES:
 
-       tor_assert(!resource);
 
-       tor_assert(payload);
 
-       httpcommand = "POST";
 
-       url = tor_strdup("/tor/post/consensus-signature");
 
-       break;
 
-     case DIR_PURPOSE_FETCH_RENDDESC_V2:
 
-       tor_assert(resource);
 
-       tor_assert(strlen(resource) <= REND_DESC_ID_V2_LEN_BASE32);
 
-       tor_assert(!payload);
 
-       httpcommand = "GET";
 
-       len = strlen(resource) + 32;
 
-       url = tor_malloc(len);
 
-       tor_snprintf(url, len, "/tor/rendezvous2/%s", resource);
 
-       break;
 
-     case DIR_PURPOSE_UPLOAD_RENDDESC:
 
-       tor_assert(!resource);
 
-       tor_assert(payload);
 
-       httpcommand = "POST";
 
-       url = tor_strdup("/tor/rendezvous/publish");
 
-       break;
 
-     case DIR_PURPOSE_UPLOAD_RENDDESC_V2:
 
-       tor_assert(!resource);
 
-       tor_assert(payload);
 
-       httpcommand = "POST";
 
-       url = tor_strdup("/tor/rendezvous2/publish");
 
-       break;
 
-     default:
 
-       tor_assert(0);
 
-       return;
 
-   }
 
-   if (strlen(proxystring) + strlen(url) >= 4096) {
 
-     log_warn(LD_BUG,
 
-              "Squid does not like URLs longer than 4095 bytes, and this "
 
-              "one is %d bytes long: %s%s",
 
-              (int)(strlen(proxystring) + strlen(url)), proxystring, url);
 
-   }
 
-   tor_snprintf(request, sizeof(request), "%s %s", httpcommand, proxystring);
 
-   connection_write_to_buf(request, strlen(request), TO_CONN(conn));
 
-   connection_write_to_buf(url, strlen(url), TO_CONN(conn));
 
-   tor_free(url);
 
-   if (!strcmp(httpcommand, "GET") && !payload) {
 
-     tor_snprintf(request, sizeof(request),
 
-                  " HTTP/1.0\r\nHost: %s%s%s\r\n\r\n",
 
-                  hoststring,
 
-                  imsstring,
 
-                  proxyauthstring);
 
-   } else {
 
-     tor_snprintf(request, sizeof(request),
 
-                  " HTTP/1.0\r\nContent-Length: %lu\r\nHost: %s%s%s\r\n\r\n",
 
-                  payload ? (unsigned long)payload_len : 0,
 
-                  hoststring,
 
-                  imsstring,
 
-                  proxyauthstring);
 
-   }
 
-   connection_write_to_buf(request, strlen(request), TO_CONN(conn));
 
-   if (payload) {
 
-     /* then send the payload afterwards too */
 
-     connection_write_to_buf(payload, payload_len, TO_CONN(conn));
 
-   }
 
- }
 
- /** Parse an HTTP request string <b>headers</b> of the form
 
-  * \verbatim
 
-  * "\%s [http[s]://]\%s HTTP/1..."
 
-  * \endverbatim
 
-  * If it's well-formed, strdup the second \%s into *<b>url</b>, and
 
-  * nul-terminate it. If the url doesn't start with "/tor/", rewrite it
 
-  * so it does. Return 0.
 
-  * Otherwise, return -1.
 
-  */
 
- static int
 
- parse_http_url(const char *headers, char **url)
 
- {
 
-   char *s, *start, *tmp;
 
-   s = (char *)eat_whitespace_no_nl(headers);
 
-   if (!*s) return -1;
 
-   s = (char *)find_whitespace(s); /* get past GET/POST */
 
-   if (!*s) return -1;
 
-   s = (char *)eat_whitespace_no_nl(s);
 
-   if (!*s) return -1;
 
-   start = s; /* this is it, assuming it's valid */
 
-   s = (char *)find_whitespace(start);
 
-   if (!*s) return -1;
 
-   /* tolerate the http[s] proxy style of putting the hostname in the url */
 
-   if (s-start >= 4 && !strcmpstart(start,"http")) {
 
-     tmp = start + 4;
 
-     if (*tmp == 's')
 
-       tmp++;
 
-     if (s-tmp >= 3 && !strcmpstart(tmp,"://")) {
 
-       tmp = strchr(tmp+3, '/');
 
-       if (tmp && tmp < s) {
 
-         log_debug(LD_DIR,"Skipping over 'http[s]://hostname' string");
 
-         start = tmp;
 
-       }
 
-     }
 
-   }
 
-   if (s-start < 5 || strcmpstart(start,"/tor/")) { /* need to rewrite it */
 
-     *url = tor_malloc(s - start + 5);
 
-     strlcpy(*url,"/tor", s-start+5);
 
-     strlcat((*url)+4, start, s-start+1);
 
-   } else {
 
-     *url = tor_strndup(start, s-start);
 
-   }
 
-   return 0;
 
- }
 
- /** Return a copy of the first HTTP header in <b>headers</b> whose key is
 
-  * <b>which</b>.  The key should be given with a terminating colon and space;
 
-  * this function copies everything after, up to but not including the
 
-  * following \\r\\n. */
 
- static char *
 
- http_get_header(const char *headers, const char *which)
 
- {
 
-   const char *cp = headers;
 
-   while (cp) {
 
-     if (!strcasecmpstart(cp, which)) {
 
-       char *eos;
 
-       cp += strlen(which);
 
-       if ((eos = strchr(cp,'\r')))
 
-         return tor_strndup(cp, eos-cp);
 
-       else
 
-         return tor_strdup(cp);
 
-     }
 
-     cp = strchr(cp, '\n');
 
-     if (cp)
 
-       ++cp;
 
-   }
 
-   return NULL;
 
- }
 
- /** If <b>headers</b> indicates that a proxy was involved, then rewrite
 
-  * <b>conn</b>-\>address to describe our best guess of the address that
 
-  * originated this HTTP request. */
 
- static void
 
- http_set_address_origin(const char *headers, connection_t *conn)
 
- {
 
-   char *fwd;
 
-   fwd = http_get_header(headers, "Forwarded-For: ");
 
-   if (!fwd)
 
-     fwd = http_get_header(headers, "X-Forwarded-For: ");
 
-   if (fwd) {
 
-     struct in_addr in;
 
-     if (!tor_inet_aton(fwd, &in) || is_internal_IP(ntohl(in.s_addr), 0)) {
 
-       log_debug(LD_DIR, "Ignoring unrecognized or internal IP %s",
 
-                 escaped(fwd));
 
-       tor_free(fwd);
 
-       return;
 
-     }
 
-     tor_free(conn->address);
 
-     conn->address = tor_strdup(fwd);
 
-     tor_free(fwd);
 
-   }
 
- }
 
- /** Parse an HTTP response string <b>headers</b> of the form
 
-  * \verbatim
 
-  * "HTTP/1.\%d \%d\%s\r\n...".
 
-  * \endverbatim
 
-  *
 
-  * If it's well-formed, assign the status code to *<b>code</b> and
 
-  * return 0.  Otherwise, return -1.
 
-  *
 
-  * On success: If <b>date</b> is provided, set *date to the Date
 
-  * header in the http headers, or 0 if no such header is found.  If
 
-  * <b>compression</b> is provided, set *<b>compression</b> to the
 
-  * compression method given in the Content-Encoding header, or 0 if no
 
-  * such header is found, or -1 if the value of the header is not
 
-  * recognized.  If <b>reason</b> is provided, strdup the reason string
 
-  * into it.
 
-  */
 
- int
 
- parse_http_response(const char *headers, int *code, time_t *date,
 
-                     compress_method_t *compression, char **reason)
 
- {
 
-   unsigned n1, n2;
 
-   char datestr[RFC1123_TIME_LEN+1];
 
-   smartlist_t *parsed_headers;
 
-   tor_assert(headers);
 
-   tor_assert(code);
 
-   while (TOR_ISSPACE(*headers)) headers++; /* tolerate leading whitespace */
 
-   if (tor_sscanf(headers, "HTTP/1.%u %u", &n1, &n2) < 2 ||
 
-       (n1 != 0 && n1 != 1) ||
 
-       (n2 < 100 || n2 >= 600)) {
 
-     log_warn(LD_HTTP,"Failed to parse header %s",escaped(headers));
 
-     return -1;
 
-   }
 
-   *code = n2;
 
-   parsed_headers = smartlist_create();
 
-   smartlist_split_string(parsed_headers, headers, "\n",
 
-                          SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1);
 
-   if (reason) {
 
-     smartlist_t *status_line_elements = smartlist_create();
 
-     tor_assert(smartlist_len(parsed_headers));
 
-     smartlist_split_string(status_line_elements,
 
-                            smartlist_get(parsed_headers, 0),
 
-                            " ", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 3);
 
-     tor_assert(smartlist_len(status_line_elements) <= 3);
 
-     if (smartlist_len(status_line_elements) == 3) {
 
-       *reason = smartlist_get(status_line_elements, 2);
 
-       smartlist_set(status_line_elements, 2, NULL); /* Prevent free */
 
-     }
 
-     SMARTLIST_FOREACH(status_line_elements, char *, cp, tor_free(cp));
 
-     smartlist_free(status_line_elements);
 
-   }
 
-   if (date) {
 
-     *date = 0;
 
-     SMARTLIST_FOREACH(parsed_headers, const char *, s,
 
-       if (!strcmpstart(s, "Date: ")) {
 
-         strlcpy(datestr, s+6, sizeof(datestr));
 
-         /* This will do nothing on failure, so we don't need to check
 
-            the result.   We shouldn't warn, since there are many other valid
 
-            date formats besides the one we use. */
 
-         parse_rfc1123_time(datestr, date);
 
-         break;
 
-       });
 
-   }
 
-   if (compression) {
 
-     const char *enc = NULL;
 
-     SMARTLIST_FOREACH(parsed_headers, const char *, s,
 
-       if (!strcmpstart(s, "Content-Encoding: ")) {
 
-         enc = s+18; break;
 
-       });
 
-     if (!enc || !strcmp(enc, "identity")) {
 
-       *compression = NO_METHOD;
 
-     } else if (!strcmp(enc, "deflate") || !strcmp(enc, "x-deflate")) {
 
-       *compression = ZLIB_METHOD;
 
-     } else if (!strcmp(enc, "gzip") || !strcmp(enc, "x-gzip")) {
 
-       *compression = GZIP_METHOD;
 
-     } else {
 
-       log_info(LD_HTTP, "Unrecognized content encoding: %s. Trying to deal.",
 
-                escaped(enc));
 
-       *compression = UNKNOWN_METHOD;
 
-     }
 
-   }
 
-   SMARTLIST_FOREACH(parsed_headers, char *, s, tor_free(s));
 
-   smartlist_free(parsed_headers);
 
-   return 0;
 
- }
 
- /** Return true iff <b>body</b> doesn't start with a plausible router or
 
-  * running-list or directory opening.  This is a sign of possible compression.
 
-  **/
 
- static int
 
- body_is_plausible(const char *body, size_t len, int purpose)
 
- {
 
-   int i;
 
-   if (len == 0)
 
-     return 1; /* empty bodies don't need decompression */
 
-   if (len < 32)
 
-     return 0;
 
-   if (purpose != DIR_PURPOSE_FETCH_RENDDESC) {
 
-     if (!strcmpstart(body,"router") ||
 
-         !strcmpstart(body,"signed-directory") ||
 
-         !strcmpstart(body,"network-status") ||
 
-         !strcmpstart(body,"running-routers"))
 
-     return 1;
 
-     for (i=0;i<32;++i) {
 
-       if (!TOR_ISPRINT(body[i]) && !TOR_ISSPACE(body[i]))
 
-         return 0;
 
-     }
 
-     return 1;
 
-   } else {
 
-     return 1;
 
-   }
 
- }
 
- /** Called when we've just fetched a bunch of router descriptors in
 
-  * <b>body</b>.  The list <b>which</b>, if present, holds digests for
 
-  * descriptors we requested: descriptor digests if <b>descriptor_digests</b>
 
-  * is true, or identity digests otherwise.  Parse the descriptors, validate
 
-  * them, and annotate them as having purpose <b>purpose</b> and as having been
 
-  * downloaded from <b>source</b>.
 
-  *
 
-  * Return the number of routers actually added. */
 
- static int
 
- load_downloaded_routers(const char *body, smartlist_t *which,
 
-                         int descriptor_digests,
 
-                         int router_purpose,
 
-                         const char *source)
 
- {
 
-   char buf[256];
 
-   char time_buf[ISO_TIME_LEN+1];
 
-   int added = 0;
 
-   int general = router_purpose == ROUTER_PURPOSE_GENERAL;
 
-   format_iso_time(time_buf, time(NULL));
 
-   tor_assert(source);
 
-   if (tor_snprintf(buf, sizeof(buf),
 
-                    "@downloaded-at %s\n"
 
-                    "@source %s\n"
 
-                    "%s%s%s", time_buf, escaped(source),
 
-                    !general ? "@purpose " : "",
 
-                    !general ? router_purpose_to_string(router_purpose) : "",
 
-                    !general ? "\n" : "")<0)
 
-     return added;
 
-   added = router_load_routers_from_string(body, NULL, SAVED_NOWHERE, which,
 
-                                   descriptor_digests, buf);
 
-   control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS,
 
-                           count_loading_descriptors_progress());
 
-   return added;
 
- }
 
- /** We are a client, and we've finished reading the server's
 
-  * response. Parse it and act appropriately.
 
-  *
 
-  * If we're still happy with using this directory server in the future, return
 
-  * 0. Otherwise return -1; and the caller should consider trying the request
 
-  * again.
 
-  *
 
-  * The caller will take care of marking the connection for close.
 
-  */
 
- static int
 
- connection_dir_client_reached_eof(dir_connection_t *conn)
 
- {
 
-   char *body;
 
-   char *headers;
 
-   char *reason = NULL;
 
-   size_t body_len=0, orig_len=0;
 
-   int status_code;
 
-   time_t date_header=0;
 
-   long delta;
 
-   compress_method_t compression;
 
-   int plausible;
 
-   int skewed=0;
 
-   int allow_partial = (conn->_base.purpose == DIR_PURPOSE_FETCH_SERVERDESC ||
 
-                        conn->_base.purpose == DIR_PURPOSE_FETCH_EXTRAINFO);
 
-   int was_compressed=0;
 
-   time_t now = time(NULL);
 
-   switch (fetch_from_buf_http(conn->_base.inbuf,
 
-                               &headers, MAX_HEADERS_SIZE,
 
-                               &body, &body_len, MAX_DIR_DL_SIZE,
 
-                               allow_partial)) {
 
-     case -1: /* overflow */
 
-       log_warn(LD_PROTOCOL,
 
-                "'fetch' response too large (server '%s:%d'). Closing.",
 
-                conn->_base.address, conn->_base.port);
 
-       return -1;
 
-     case 0:
 
-       log_info(LD_HTTP,
 
-                "'fetch' response not all here, but we're at eof. Closing.");
 
-       return -1;
 
-     /* case 1, fall through */
 
-   }
 
-   orig_len = body_len;
 
-   if (parse_http_response(headers, &status_code, &date_header,
 
-                           &compression, &reason) < 0) {
 
-     log_warn(LD_HTTP,"Unparseable headers (server '%s:%d'). Closing.",
 
-              conn->_base.address, conn->_base.port);
 
-     tor_free(body); tor_free(headers);
 
-     return -1;
 
-   }
 
-   if (!reason) reason = tor_strdup("[no reason given]");
 
-   log_debug(LD_DIR,
 
-             "Received response from directory server '%s:%d': %d %s",
 
-             conn->_base.address, conn->_base.port, status_code,
 
-             escaped(reason));
 
-   /* now check if it's got any hints for us about our IP address. */
 
-   if (conn->dirconn_direct) {
 
-     char *guess = http_get_header(headers, X_ADDRESS_HEADER);
 
-     if (guess) {
 
-       router_new_address_suggestion(guess, conn);
 
-       tor_free(guess);
 
-     }
 
-   }
 
-   if (date_header > 0) {
 
-     /* The date header was written very soon after we sent our request,
 
-      * so compute the skew as the difference between sending the request
 
-      * and the date header.  (We used to check now-date_header, but that's
 
-      * inaccurate if we spend a lot of time downloading.)
 
-      */
 
-     delta = conn->_base.timestamp_lastwritten - date_header;
 
-     if (labs(delta)>ALLOW_DIRECTORY_TIME_SKEW) {
 
-       char dbuf[64];
 
-       int trusted = router_digest_is_trusted_dir(conn->identity_digest);
 
-       format_time_interval(dbuf, sizeof(dbuf), delta);
 
-       log_fn(trusted ? LOG_WARN : LOG_INFO,
 
-              LD_HTTP,
 
-              "Received directory with skewed time (server '%s:%d'): "
 
-              "It seems that our clock is %s by %s, or that theirs is %s. "
 
-              "Tor requires an accurate clock to work: please check your time, "
 
-              "timezone, and date settings.",
 
-              conn->_base.address, conn->_base.port,
 
-              delta>0 ? "ahead" : "behind", dbuf,
 
-              delta>0 ? "behind" : "ahead");
 
-       skewed = 1; /* don't check the recommended-versions line */
 
-       control_event_general_status(trusted ? LOG_WARN : LOG_NOTICE,
 
-                                "CLOCK_SKEW SKEW=%ld SOURCE=DIRSERV:%s:%d",
 
-                                delta, conn->_base.address, conn->_base.port);
 
-     } else {
 
-       log_debug(LD_HTTP, "Time on received directory is within tolerance; "
 
-                 "we are %ld seconds skewed.  (That's okay.)", delta);
 
-     }
 
-   }
 
-   (void) skewed; /* skewed isn't used yet. */
 
-   if (status_code == 503 && body_len < 16) {
 
-     routerstatus_t *rs;
 
-     trusted_dir_server_t *ds;
 
-     log_info(LD_DIR,"Received http status code %d (%s) from server "
 
-              "'%s:%d'. I'll try again soon.",
 
-              status_code, escaped(reason), conn->_base.address,
 
-              conn->_base.port);
 
-     if ((rs = router_get_consensus_status_by_id(conn->identity_digest)))
 
-       rs->last_dir_503_at = now;
 
-     if ((ds = router_get_trusteddirserver_by_digest(conn->identity_digest)))
 
-       ds->fake_status.last_dir_503_at = now;
 
-     tor_free(body); tor_free(headers); tor_free(reason);
 
-     return -1;
 
-   } else if (status_code == 503) {
 
-     /* XXXX022 Remove this once every server with bug 539 is obsolete. */
 
-     log_info(LD_DIR, "Server at '%s:%d' sent us a 503 response, but included "
 
-              "a body anyway.  We'll pretend it gave us a 200.",
 
-              conn->_base.address, conn->_base.port);
 
-     status_code = 200;
 
-   }
 
-   plausible = body_is_plausible(body, body_len, conn->_base.purpose);
 
-   if (compression != NO_METHOD || !plausible) {
 
-     char *new_body = NULL;
 
-     size_t new_len = 0;
 
-     compress_method_t guessed = detect_compression_method(body, body_len);
 
-     if (compression == UNKNOWN_METHOD || guessed != compression) {
 
-       /* Tell the user if we don't believe what we're told about compression.*/
 
-       const char *description1, *description2;
 
-       if (compression == ZLIB_METHOD)
 
-         description1 = "as deflated";
 
-       else if (compression == GZIP_METHOD)
 
-         description1 = "as gzipped";
 
-       else if (compression == NO_METHOD)
 
-         description1 = "as uncompressed";
 
-       else
 
-         description1 = "with an unknown Content-Encoding";
 
-       if (guessed == ZLIB_METHOD)
 
-         description2 = "deflated";
 
-       else if (guessed == GZIP_METHOD)
 
-         description2 = "gzipped";
 
-       else if (!plausible)
 
-         description2 = "confusing binary junk";
 
-       else
 
-         description2 = "uncompressed";
 
-       log_info(LD_HTTP, "HTTP body from server '%s:%d' was labeled %s, "
 
-                "but it seems to be %s.%s",
 
-                conn->_base.address, conn->_base.port, description1,
 
-                description2,
 
-                (compression>0 && guessed>0)?"  Trying both.":"");
 
-     }
 
-     /* Try declared compression first if we can. */
 
-     if (compression == GZIP_METHOD  || compression == ZLIB_METHOD)
 
-       tor_gzip_uncompress(&new_body, &new_len, body, body_len, compression,
 
-                           !allow_partial, LOG_PROTOCOL_WARN);
 
-     /* Okay, if that didn't work, and we think that it was compressed
 
-      * differently, try that. */
 
-     if (!new_body &&
 
-         (guessed == GZIP_METHOD || guessed == ZLIB_METHOD) &&
 
-         compression != guessed)
 
-       tor_gzip_uncompress(&new_body, &new_len, body, body_len, guessed,
 
-                           !allow_partial, LOG_PROTOCOL_WARN);
 
-     /* If we're pretty sure that we have a compressed directory, and
 
-      * we didn't manage to uncompress it, then warn and bail. */
 
-     if (!plausible && !new_body) {
 
-       log_fn(LOG_PROTOCOL_WARN, LD_HTTP,
 
-              "Unable to decompress HTTP body (server '%s:%d').",
 
-              conn->_base.address, conn->_base.port);
 
-       tor_free(body); tor_free(headers); tor_free(reason);
 
-       return -1;
 
-     }
 
-     if (new_body) {
 
-       tor_free(body);
 
-       body = new_body;
 
-       body_len = new_len;
 
-       was_compressed = 1;
 
-     }
 
-   }
 
-   if (conn->_base.purpose == DIR_PURPOSE_FETCH_V2_NETWORKSTATUS) {
 
-     smartlist_t *which = NULL;
 
-     v2_networkstatus_source_t source;
 
-     char *cp;
 
-     log_info(LD_DIR,"Received networkstatus objects (size %d) from server "
 
-              "'%s:%d'",(int) body_len, conn->_base.address, conn->_base.port);
 
-     if (status_code != 200) {
 
-       log_warn(LD_DIR,
 
-            "Received http status code %d (%s) from server "
 
-            "'%s:%d' while fetching \"/tor/status/%s\". I'll try again soon.",
 
-            status_code, escaped(reason), conn->_base.address,
 
-            conn->_base.port, conn->requested_resource);
 
-       tor_free(body); tor_free(headers); tor_free(reason);
 
-       connection_dir_download_networkstatus_failed(conn, status_code);
 
-       return -1;
 
-     }
 
-     if (conn->requested_resource &&
 
-         !strcmpstart(conn->requested_resource,"fp/")) {
 
-       source = NS_FROM_DIR_BY_FP;
 
-       which = smartlist_create();
 
-       dir_split_resource_into_fingerprints(conn->requested_resource+3,
 
-                                            which, NULL, 0, 0);
 
-     } else if (conn->requested_resource &&
 
-                !strcmpstart(conn->requested_resource, "all")) {
 
-       source = NS_FROM_DIR_ALL;
 
-       which = smartlist_create();
 
-       SMARTLIST_FOREACH(router_get_trusted_dir_servers(),
 
-                         trusted_dir_server_t *, ds,
 
-         {
 
-           char *hex = tor_malloc(HEX_DIGEST_LEN+1);
 
-           base16_encode(hex, HEX_DIGEST_LEN+1, ds->digest, DIGEST_LEN);
 
-           smartlist_add(which, hex);
 
-         });
 
-     } else {
 
-       /* XXXX Can we even end up here? -- weasel*/
 
-       source = NS_FROM_DIR_BY_FP;
 
-       log_warn(LD_BUG, "We received a networkstatus but we didn't ask "
 
-                        "for it by fp, nor did we ask for all.");
 
-     }
 
-     cp = body;
 
-     while (*cp) {
 
-       char *next = strstr(cp, "\nnetwork-status-version");
 
-       if (next)
 
-         next[1] = '\0';
 
-       /* learn from it, and then remove it from 'which' */
 
-       if (router_set_networkstatus_v2(cp, now, source, which)<0)
 
-         break;
 
-       if (next) {
 
-         next[1] = 'n';
 
-         cp = next+1;
 
-       } else
 
-         break;
 
-     }
 
-     /* launches router downloads as needed */
 
-     routers_update_all_from_networkstatus(now, 2);
 
-     directory_info_has_arrived(now, 0);
 
-     if (which) {
 
-       if (smartlist_len(which)) {
 
-         dir_networkstatus_download_failed(which, status_code);
 
-       }
 
-       SMARTLIST_FOREACH(which, char *, s, tor_free(s));
 
-       smartlist_free(which);
 
-     }
 
-   }
 
-   if (conn->_base.purpose == DIR_PURPOSE_FETCH_CONSENSUS) {
 
-     int r;
 
-     if (status_code != 200) {
 
-       int severity = (status_code == 304) ? LOG_INFO : LOG_WARN;
 
-       log(severity, LD_DIR,
 
-           "Received http status code %d (%s) from server "
 
-           "'%s:%d' while fetching consensus directory.",
 
-            status_code, escaped(reason), conn->_base.address,
 
-            conn->_base.port);
 
-       tor_free(body); tor_free(headers); tor_free(reason);
 
-       networkstatus_consensus_download_failed(status_code);
 
-       return -1;
 
-     }
 
-     log_info(LD_DIR,"Received consensus directory (size %d) from server "
 
-              "'%s:%d'",(int) body_len, conn->_base.address, conn->_base.port);
 
-     if ((r=networkstatus_set_current_consensus(body, 0))<0) {
 
-       log_fn(r<-1?LOG_WARN:LOG_INFO, LD_DIR,
 
-              "Unable to load consensus directory downloaded from "
 
-              "server '%s:%d'. I'll try again soon.",
 
-              conn->_base.address, conn->_base.port);
 
-       tor_free(body); tor_free(headers); tor_free(reason);
 
-       networkstatus_consensus_download_failed(0);
 
-       return -1;
 
-     }
 
-     /* launches router downloads as needed */
 
-     routers_update_all_from_networkstatus(now, 3);
 
-     directory_info_has_arrived(now, 0);
 
-     log_info(LD_DIR, "Successfully loaded consensus.");
 
-   }
 
-   if (conn->_base.purpose == DIR_PURPOSE_FETCH_CERTIFICATE) {
 
-     if (status_code != 200) {
 
-       log_warn(LD_DIR,
 
-           "Received http status code %d (%s) from server "
 
-           "'%s:%d' while fetching \"/tor/keys/%s\".",
 
-            status_code, escaped(reason), conn->_base.address,
 
-            conn->_base.port, conn->requested_resource);
 
-       connection_dir_download_cert_failed(conn, status_code);
 
-       tor_free(body); tor_free(headers); tor_free(reason);
 
-       return -1;
 
-     }
 
-     log_info(LD_DIR,"Received authority certificates (size %d) from server "
 
-              "'%s:%d'",(int) body_len, conn->_base.address, conn->_base.port);
 
-     if (trusted_dirs_load_certs_from_string(body, 0, 1)<0) {
 
-       log_warn(LD_DIR, "Unable to parse fetched certificates");
 
-       connection_dir_download_cert_failed(conn, status_code);
 
-     } else {
 
-       directory_info_has_arrived(now, 0);
 
-       log_info(LD_DIR, "Successfully loaded certificates from fetch.");
 
-     }
 
-   }
 
-   if (conn->_base.purpose == DIR_PURPOSE_FETCH_STATUS_VOTE) {
 
-     const char *msg;
 
-     int st;
 
-     log_info(LD_DIR,"Got votes (size %d) from server %s:%d",
 
-              (int) body_len, conn->_base.address, conn->_base.port);
 
-     if (status_code != 200) {
 
-       log_warn(LD_DIR,
 
-              "Received http status code %d (%s) from server "
 
-              "'%s:%d' while fetching \"/tor/status-vote/next/%s.z\".",
 
-              status_code, escaped(reason), conn->_base.address,
 
-              conn->_base.port, conn->requested_resource);
 
-       tor_free(body); tor_free(headers); tor_free(reason);
 
-       return -1;
 
-     }
 
-     dirvote_add_vote(body, &msg, &st);
 
-     if (st > 299) {
 
-       log_warn(LD_DIR, "Error adding retrieved vote: %s", msg);
 
-     } else {
 
-       log_info(LD_DIR, "Added vote(s) successfully [msg: %s]", msg);
 
-     }
 
-   }
 
-   if (conn->_base.purpose == DIR_PURPOSE_FETCH_DETACHED_SIGNATURES) {
 
-     const char *msg = NULL;
 
-     log_info(LD_DIR,"Got detached signatures (size %d) from server %s:%d",
 
-              (int) body_len, conn->_base.address, conn->_base.port);
 
-     if (status_code != 200) {
 
-       log_warn(LD_DIR,
 
-         "Received http status code %d (%s) from server "
 
-         "'%s:%d' while fetching \"/tor/status-vote/consensus-signatures.z\".",
 
-              status_code, escaped(reason), conn->_base.address,
 
-              conn->_base.port);
 
-       tor_free(body); tor_free(headers); tor_free(reason);
 
-       return -1;
 
-     }
 
-     if (dirvote_add_signatures(body, conn->_base.address, &msg)<0) {
 
-       log_warn(LD_DIR, "Problem adding detached signatures from %s:%d: %s",
 
-                conn->_base.address, conn->_base.port, msg?msg:"???");
 
-     }
 
-   }
 
-   if (conn->_base.purpose == DIR_PURPOSE_FETCH_SERVERDESC ||
 
-       conn->_base.purpose == DIR_PURPOSE_FETCH_EXTRAINFO) {
 
-     int was_ei = conn->_base.purpose == DIR_PURPOSE_FETCH_EXTRAINFO;
 
-     smartlist_t *which = NULL;
 
-     int n_asked_for = 0;
 
-     int descriptor_digests = conn->requested_resource &&
 
-                              !strcmpstart(conn->requested_resource,"d/");
 
-     log_info(LD_DIR,"Received %s (size %d) from server '%s:%d'",
 
-              was_ei ? "extra server info" : "server info",
 
-              (int)body_len, conn->_base.address, conn->_base.port);
 
-     if (conn->requested_resource &&
 
-         (!strcmpstart(conn->requested_resource,"d/") ||
 
-          !strcmpstart(conn->requested_resource,"fp/"))) {
 
-       which = smartlist_create();
 
-       dir_split_resource_into_fingerprints(conn->requested_resource +
 
-                                              (descriptor_digests ? 2 : 3),
 
-                                            which, NULL, 0, 0);
 
-       n_asked_for = smartlist_len(which);
 
-     }
 
-     if (status_code != 200) {
 
-       int dir_okay = status_code == 404 ||
 
-         (status_code == 400 && !strcmp(reason, "Servers unavailable."));
 
-       /* 404 means that it didn't have them; no big deal.
 
-        * Older (pre-0.1.1.8) servers said 400 Servers unavailable instead. */
 
-       log_fn(dir_okay ? LOG_INFO : LOG_WARN, LD_DIR,
 
-              "Received http status code %d (%s) from server '%s:%d' "
 
-              "while fetching \"/tor/server/%s\". I'll try again soon.",
 
-              status_code, escaped(reason), conn->_base.address,
 
-              conn->_base.port, conn->requested_resource);
 
-       if (!which) {
 
-         connection_dir_download_routerdesc_failed(conn);
 
-       } else {
 
-         dir_routerdesc_download_failed(which, status_code,
 
-                                        conn->router_purpose,
 
-                                        was_ei, descriptor_digests);
 
-         SMARTLIST_FOREACH(which, char *, cp, tor_free(cp));
 
-         smartlist_free(which);
 
-       }
 
-       tor_free(body); tor_free(headers); tor_free(reason);
 
-       return dir_okay ? 0 : -1;
 
-     }
 
-     /* Learn the routers, assuming we requested by fingerprint or "all"
 
-      * or "authority".
 
-      *
 
-      * We use "authority" to fetch our own descriptor for
 
-      * testing, and to fetch bridge descriptors for bootstrapping. Ignore
 
-      * the output of "authority" requests unless we are using bridges,
 
-      * since otherwise they'll be the response from reachability tests,
 
-      * and we don't really want to add that to our routerlist. */
 
-     if (which || (conn->requested_resource &&
 
-                   (!strcmpstart(conn->requested_resource, "all") ||
 
-                    (!strcmpstart(conn->requested_resource, "authority") &&
 
-                     get_options()->UseBridges)))) {
 
-       /* as we learn from them, we remove them from 'which' */
 
-       if (was_ei) {
 
-         router_load_extrainfo_from_string(body, NULL, SAVED_NOWHERE, which,
 
-                                           descriptor_digests);
 
-       } else {
 
-         //router_load_routers_from_string(body, NULL, SAVED_NOWHERE, which,
 
-         //                       descriptor_digests, conn->router_purpose);
 
-         if (load_downloaded_routers(body, which, descriptor_digests,
 
-                                 conn->router_purpose,
 
-                                 conn->_base.address))
 
-           directory_info_has_arrived(now, 0);
 
-       }
 
-     }
 
-     if (which) { /* mark remaining ones as failed */
 
-       log_info(LD_DIR, "Received %d/%d %s requested from %s:%d",
 
-                n_asked_for-smartlist_len(which), n_asked_for,
 
-                was_ei ? "extra-info documents" : "router descriptors",
 
-                conn->_base.address, (int)conn->_base.port);
 
-       if (smartlist_len(which)) {
 
-         dir_routerdesc_download_failed(which, status_code,
 
-                                        conn->router_purpose,
 
-                                        was_ei, descriptor_digests);
 
-       }
 
-       SMARTLIST_FOREACH(which, char *, cp, tor_free(cp));
 
-       smartlist_free(which);
 
-     }
 
-     if (directory_conn_is_self_reachability_test(conn))
 
-       router_dirport_found_reachable();
 
-   }
 
-   if (conn->_base.purpose == DIR_PURPOSE_UPLOAD_DIR) {
 
-     switch (status_code) {
 
-       case 200: {
 
-           trusted_dir_server_t *ds =
 
-             router_get_trusteddirserver_by_digest(conn->identity_digest);
 
-           char *rejected_hdr = http_get_header(headers,
 
-                                                "X-Descriptor-Not-New: ");
 
-           int rejected = 0;
 
-           if (rejected_hdr) {
 
-             if (!strcmp(rejected_hdr, "Yes")) {
 
-               log_info(LD_GENERAL,
 
-                        "Authority '%s' declined our descriptor (not new)",
 
-                        ds->nickname);
 
-               /* XXXX use this information; be sure to upload next one
 
-                * sooner. -NM */
 
-               /* XXXX021 On further thought, the task above implies that we're
 
-                * basing our regenerate-descriptor time on when we uploaded the
 
-                * last descriptor, not on the published time of the last
 
-                * descriptor.  If those are different, that's a bad thing to
 
-                * do. -NM */
 
-               rejected = 1;
 
-             }
 
-             tor_free(rejected_hdr);
 
-           }
 
-           log_info(LD_GENERAL,"eof (status 200) after uploading server "
 
-                    "descriptor: finished.");
 
-           control_event_server_status(
 
-                       LOG_NOTICE, "ACCEPTED_SERVER_DESCRIPTOR DIRAUTH=%s:%d",
 
-                       conn->_base.address, conn->_base.port);
 
-           ds->has_accepted_serverdesc = 1;
 
-           if (directories_have_accepted_server_descriptor())
 
-             control_event_server_status(LOG_NOTICE, "GOOD_SERVER_DESCRIPTOR");
 
-         }
 
-         break;
 
-       case 400:
 
-         log_warn(LD_GENERAL,"http status 400 (%s) response from "
 
-                  "dirserver '%s:%d'. Please correct.",
 
-                  escaped(reason), conn->_base.address, conn->_base.port);
 
-         control_event_server_status(LOG_WARN,
 
-                       "BAD_SERVER_DESCRIPTOR DIRAUTH=%s:%d REASON=\"%s\"",
 
-                       conn->_base.address, conn->_base.port, escaped(reason));
 
-         break;
 
-       default:
 
-         log_warn(LD_GENERAL,
 
-              "http status %d (%s) reason unexpected while uploading "
 
-              "descriptor to server '%s:%d').",
 
-              status_code, escaped(reason), conn->_base.address,
 
-              conn->_base.port);
 
-         break;
 
-     }
 
-     /* return 0 in all cases, since we don't want to mark any
 
-      * dirservers down just because they don't like us. */
 
-   }
 
-   if (conn->_base.purpose == DIR_PURPOSE_UPLOAD_VOTE) {
 
-     switch (status_code) {
 
-       case 200: {
 
-         log_notice(LD_DIR,"Uploaded a vote to dirserver %s:%d",
 
-                    conn->_base.address, conn->_base.port);
 
-         }
 
-         break;
 
-       case 400:
 
-         log_warn(LD_DIR,"http status 400 (%s) response after uploading "
 
-                  "vote to dirserver '%s:%d'. Please correct.",
 
-                  escaped(reason), conn->_base.address, conn->_base.port);
 
-         break;
 
-       default:
 
-         log_warn(LD_GENERAL,
 
-              "http status %d (%s) reason unexpected while uploading "
 
-              "vote to server '%s:%d').",
 
-              status_code, escaped(reason), conn->_base.address,
 
-              conn->_base.port);
 
-         break;
 
-     }
 
-     /* return 0 in all cases, since we don't want to mark any
 
-      * dirservers down just because they don't like us. */
 
-   }
 
-   if (conn->_base.purpose == DIR_PURPOSE_UPLOAD_SIGNATURES) {
 
-     switch (status_code) {
 
-       case 200: {
 
-         log_notice(LD_DIR,"Uploaded signature(s) to dirserver %s:%d",
 
-                    conn->_base.address, conn->_base.port);
 
-         }
 
-         break;
 
-       case 400:
 
-         log_warn(LD_DIR,"http status 400 (%s) response after uploading "
 
-                  "signatures to dirserver '%s:%d'. Please correct.",
 
-                  escaped(reason), conn->_base.address, conn->_base.port);
 
-         break;
 
-       default:
 
-         log_warn(LD_GENERAL,
 
-              "http status %d (%s) reason unexpected while uploading "
 
-              "signatures to server '%s:%d').",
 
-              status_code, escaped(reason), conn->_base.address,
 
-              conn->_base.port);
 
-         break;
 
-     }
 
-     /* return 0 in all cases, since we don't want to mark any
 
-      * dirservers down just because they don't like us. */
 
-   }
 
-   if (conn->_base.purpose == DIR_PURPOSE_FETCH_RENDDESC) {
 
-     tor_assert(conn->rend_data);
 
-     log_info(LD_REND,"Received rendezvous descriptor (size %d, status %d "
 
-              "(%s))",
 
-              (int)body_len, status_code, escaped(reason));
 
-     switch (status_code) {
 
-       case 200:
 
-         if (rend_cache_store(body, body_len, 0) < -1) {
 
-           log_warn(LD_REND,"Failed to parse rendezvous descriptor.");
 
-           /* Any pending rendezvous attempts will notice when
 
-            * connection_about_to_close_connection()
 
-            * cleans this dir conn up. */
 
-           /* We could retry. But since v0 descriptors are going out of
 
-            * style, it isn't worth the hassle. We'll do better in v2. */
 
-         } else {
 
-           /* Success, or at least there's a v2 descriptor already
 
-            * present. Notify pending connections about this. */
 
-           conn->_base.purpose = DIR_PURPOSE_HAS_FETCHED_RENDDESC;
 
-           rend_client_desc_trynow(conn->rend_data->onion_address);
 
-         }
 
-         break;
 
-       case 404:
 
-         /* Not there. Pending connections will be notified when
 
-          * connection_about_to_close_connection() cleans this conn up. */
 
-         break;
 
-       case 400:
 
-         log_warn(LD_REND,
 
-                  "http status 400 (%s). Dirserver didn't like our "
 
-                  "rendezvous query?", escaped(reason));
 
-         break;
 
-       default:
 
-         log_warn(LD_REND,"http status %d (%s) response unexpected while "
 
-                  "fetching hidden service descriptor (server '%s:%d').",
 
-                  status_code, escaped(reason), conn->_base.address,
 
-                  conn->_base.port);
 
-         break;
 
-     }
 
-   }
 
-   if (conn->_base.purpose == DIR_PURPOSE_FETCH_RENDDESC_V2) {
 
-     tor_assert(conn->rend_data);
 
-     log_info(LD_REND,"Received rendezvous descriptor (size %d, status %d "
 
-              "(%s))",
 
-              (int)body_len, status_code, escaped(reason));
 
-     switch (status_code) {
 
-       case 200:
 
-         switch (rend_cache_store_v2_desc_as_client(body, conn->rend_data)) {
 
-           case -2:
 
-             log_warn(LD_REND,"Fetching v2 rendezvous descriptor failed. "
 
-                      "Retrying at another directory.");
 
-             /* We'll retry when connection_about_to_close_connection()
 
-              * cleans this dir conn up. */
 
-             break;
 
-           case -1:
 
-             /* We already have a v0 descriptor here. Ignoring this one
 
-              * and _not_ performing another request. */
 
-             log_info(LD_REND, "Successfully fetched v2 rendezvous "
 
-                      "descriptor, but we already have a v0 descriptor.");
 
-             conn->_base.purpose = DIR_PURPOSE_HAS_FETCHED_RENDDESC;
 
-             break;
 
-           default:
 
-             /* success. notify pending connections about this. */
 
-             log_info(LD_REND, "Successfully fetched v2 rendezvous "
 
-                      "descriptor.");
 
-             conn->_base.purpose = DIR_PURPOSE_HAS_FETCHED_RENDDESC;
 
-             rend_client_desc_trynow(conn->rend_data->onion_address);
 
-             break;
 
-         }
 
-         break;
 
-       case 404:
 
-         /* Not there. We'll retry when
 
-          * connection_about_to_close_connection() cleans this conn up. */
 
-         log_info(LD_REND,"Fetching v2 rendezvous descriptor failed: "
 
-                          "Retrying at another directory.");
 
-         break;
 
-       case 400:
 
-         log_warn(LD_REND, "Fetching v2 rendezvous descriptor failed: "
 
-                  "http status 400 (%s). Dirserver didn't like our "
 
-                  "v2 rendezvous query? Retrying at another directory.",
 
-                  escaped(reason));
 
-         break;
 
-       default:
 
-         log_warn(LD_REND, "Fetching v2 rendezvous descriptor failed: "
 
-                  "http status %d (%s) response unexpected while "
 
-                  "fetching v2 hidden service descriptor (server '%s:%d'). "
 
-                  "Retrying at another directory.",
 
-                  status_code, escaped(reason), conn->_base.address,
 
-                  conn->_base.port);
 
-         break;
 
-     }
 
-   }
 
-   if (conn->_base.purpose == DIR_PURPOSE_UPLOAD_RENDDESC ||
 
-       conn->_base.purpose == DIR_PURPOSE_UPLOAD_RENDDESC_V2) {
 
-     log_info(LD_REND,"Uploaded rendezvous descriptor (status %d "
 
-              "(%s))",
 
-              status_code, escaped(reason));
 
-     switch (status_code) {
 
-       case 200:
 
-         log_info(LD_REND,
 
-                  "Uploading rendezvous descriptor: finished with status "
 
-                  "200 (%s)", escaped(reason));
 
-         break;
 
-       case 400:
 
-         log_warn(LD_REND,"http status 400 (%s) response from dirserver "
 
-                  "'%s:%d'. Malformed rendezvous descriptor?",
 
-                  escaped(reason), conn->_base.address, conn->_base.port);
 
-         break;
 
-       case 503:
 
-         log_info(LD_REND,"http status 503 (%s) response from dirserver "
 
-                  "'%s:%d'. Node is (currently) not acting as v2 hidden "
 
-                  "service directory.",
 
-                  escaped(reason), conn->_base.address, conn->_base.port);
 
-         break;
 
-       default:
 
-         log_warn(LD_REND,"http status %d (%s) response unexpected (server "
 
-                  "'%s:%d').",
 
-                  status_code, escaped(reason), conn->_base.address,
 
-                  conn->_base.port);
 
-         break;
 
-     }
 
-   }
 
-   note_client_request(conn->_base.purpose, was_compressed, orig_len);
 
-   tor_free(body); tor_free(headers); tor_free(reason);
 
-   return 0;
 
- }
 
- /** Called when a directory connection reaches EOF. */
 
- int
 
- connection_dir_reached_eof(dir_connection_t *conn)
 
- {
 
-   int retval;
 
-   if (conn->_base.state != DIR_CONN_STATE_CLIENT_READING) {
 
-     log_info(LD_HTTP,"conn reached eof, not reading. [state=%d] Closing.",
 
-              conn->_base.state);
 
-     connection_close_immediate(TO_CONN(conn)); /* error: give up on flushing */
 
-     connection_mark_for_close(TO_CONN(conn));
 
-     return -1;
 
-   }
 
-   retval = connection_dir_client_reached_eof(conn);
 
-   if (retval == 0) /* success */
 
-     conn->_base.state = DIR_CONN_STATE_CLIENT_FINISHED;
 
-   connection_mark_for_close(TO_CONN(conn));
 
-   return retval;
 
- }
 
- /** If any directory object is arriving, and it's over 10MB large, we're
 
-  * getting DoS'd.  (As of 0.1.2.x, raw directories are about 1MB, and we never
 
-  * ask for more than 96 router descriptors at a time.)
 
-  */
 
- #define MAX_DIRECTORY_OBJECT_SIZE (10*(1<<20))
 
- /** Read handler for directory connections.  (That's connections <em>to</em>
 
-  * directory servers and connections <em>at</em> directory servers.)
 
-  */
 
- int
 
- connection_dir_process_inbuf(dir_connection_t *conn)
 
- {
 
-   tor_assert(conn);
 
-   tor_assert(conn->_base.type == CONN_TYPE_DIR);
 
-   /* Directory clients write, then read data until they receive EOF;
 
-    * directory servers read data until they get an HTTP command, then
 
-    * write their response (when it's finished flushing, they mark for
 
-    * close).
 
-    */
 
-   /* If we're on the dirserver side, look for a command. */
 
-   if (conn->_base.state == DIR_CONN_STATE_SERVER_COMMAND_WAIT) {
 
-     if (directory_handle_command(conn) < 0) {
 
-       connection_mark_for_close(TO_CONN(conn));
 
-       return -1;
 
-     }
 
-     return 0;
 
-   }
 
-   if (buf_datalen(conn->_base.inbuf) > MAX_DIRECTORY_OBJECT_SIZE) {
 
-     log_warn(LD_HTTP, "Too much data received from directory connection: "
 
-              "denial of service attempt, or you need to upgrade?");
 
-     connection_mark_for_close(TO_CONN(conn));
 
-     return -1;
 
-   }
 
-   if (!conn->_base.inbuf_reached_eof)
 
-     log_debug(LD_HTTP,"Got data, not eof. Leaving on inbuf.");
 
-   return 0;
 
- }
 
- /** Create an http response for the client <b>conn</b> out of
 
-  * <b>status</b> and <b>reason_phrase</b>. Write it to <b>conn</b>.
 
-  */
 
- static void
 
- write_http_status_line(dir_connection_t *conn, int status,
 
-                        const char *reason_phrase)
 
- {
 
-   char buf[256];
 
-   if (tor_snprintf(buf, sizeof(buf), "HTTP/1.0 %d %s\r\n\r\n",
 
-       status, reason_phrase ? reason_phrase : "OK") < 0) {
 
-     log_warn(LD_BUG,"status line too long.");
 
-     return;
 
-   }
 
-   connection_write_to_buf(buf, strlen(buf), TO_CONN(conn));
 
- }
 
- /** Write the header for an HTTP/1.0 response onto <b>conn</b>-\>outbuf,
 
-  * with <b>type</b> as the Content-Type.
 
-  *
 
-  * If <b>length</b> is nonnegative, it is the Content-Length.
 
-  * If <b>encoding</b> is provided, it is the Content-Encoding.
 
-  * If <b>cache_lifetime</b> is greater than 0, the content may be cached for
 
-  * up to cache_lifetime seconds.  Otherwise, the content may not be cached. */
 
- static void
 
- write_http_response_header_impl(dir_connection_t *conn, ssize_t length,
 
-                            const char *type, const char *encoding,
 
-                            const char *extra_headers,
 
-                            long cache_lifetime)
 
- {
 
-   char date[RFC1123_TIME_LEN+1];
 
-   char tmp[1024];
 
-   char *cp;
 
-   time_t now = time(NULL);
 
-   tor_assert(conn);
 
-   format_rfc1123_time(date, now);
 
-   cp = tmp;
 
-   tor_snprintf(cp, sizeof(tmp),
 
-                "HTTP/1.0 200 OK\r\nDate: %s\r\n",
 
-                date);
 
-   cp += strlen(tmp);
 
-   if (type) {
 
-     tor_snprintf(cp, sizeof(tmp)-(cp-tmp), "Content-Type: %s\r\n", type);
 
-     cp += strlen(cp);
 
-   }
 
-   if (!is_local_addr(&conn->_base.addr)) {
 
-     /* Don't report the source address for a nearby/private connection.
 
-      * Otherwise we tend to mis-report in cases where incoming ports are
 
-      * being forwarded to a Tor server running behind the firewall. */
 
-     tor_snprintf(cp, sizeof(tmp)-(cp-tmp),
 
-                  X_ADDRESS_HEADER "%s\r\n", conn->_base.address);
 
-     cp += strlen(cp);
 
-   }
 
-   if (encoding) {
 
-     tor_snprintf(cp, sizeof(tmp)-(cp-tmp),
 
-                  "Content-Encoding: %s\r\n", encoding);
 
-     cp += strlen(cp);
 
-   }
 
-   if (length >= 0) {
 
-     tor_snprintf(cp, sizeof(tmp)-(cp-tmp),
 
-                  "Content-Length: %ld\r\n", (long)length);
 
-     cp += strlen(cp);
 
-   }
 
-   if (cache_lifetime > 0) {
 
-     char expbuf[RFC1123_TIME_LEN+1];
 
-     format_rfc1123_time(expbuf, now + cache_lifetime);
 
-     /* We could say 'Cache-control: max-age=%d' here if we start doing
 
-      * http/1.1 */
 
-     tor_snprintf(cp, sizeof(tmp)-(cp-tmp),
 
-                  "Expires: %s\r\n", expbuf);
 
-     cp += strlen(cp);
 
-   } else if (cache_lifetime == 0) {
 
-     /* We could say 'Cache-control: no-cache' here if we start doing
 
-      * http/1.1 */
 
-     strlcpy(cp, "Pragma: no-cache\r\n", sizeof(tmp)-(cp-tmp));
 
-     cp += strlen(cp);
 
-   }
 
-   if (extra_headers) {
 
-     strlcpy(cp, extra_headers, sizeof(tmp)-(cp-tmp));
 
-     cp += strlen(cp);
 
-   }
 
-   if (sizeof(tmp)-(cp-tmp) > 3)
 
-     memcpy(cp, "\r\n", 3);
 
-   else
 
-     tor_assert(0);
 
-   connection_write_to_buf(tmp, strlen(tmp), TO_CONN(conn));
 
- }
 
- /** As write_http_response_header_impl, but sets encoding and content-typed
 
-  * based on whether the response will be <b>compressed</b> or not. */
 
- static void
 
- write_http_response_header(dir_connection_t *conn, ssize_t length,
 
-                            int compressed, long cache_lifetime)
 
- {
 
-   write_http_response_header_impl(conn, length,
 
-                           compressed?"application/octet-stream":"text/plain",
 
-                           compressed?"deflate":"identity",
 
-                              NULL,
 
-                              cache_lifetime);
 
- }
 
- #ifdef INSTRUMENT_DOWNLOADS
 
- typedef struct request_t {
 
-   uint64_t bytes; /**< How many bytes have we transferred? */
 
-   uint64_t count; /**< How many requests have we made? */
 
- } request_t;
 
- /** Map used to keep track of how much data we've up/downloaded in what kind
 
-  * of request.  Maps from request type to pointer to request_t. */
 
- static strmap_t *request_map = NULL;
 
- /** Record that a client request of <b>purpose</b> was made, and that
 
-  * <b>bytes</b> bytes of possibly <b>compressed</b> data were sent/received.
 
-  * Used to keep track of how much we've up/downloaded in what kind of
 
-  * request. */
 
- static void
 
- note_client_request(int purpose, int compressed, size_t bytes)
 
- {
 
-   char *key;
 
-   const char *kind = NULL;
 
-   switch (purpose) {
 
-     case DIR_PURPOSE_FETCH_V2_NETWORKSTATUS: kind = "dl/status"; break;
 
-     case DIR_PURPOSE_FETCH_CONSENSUS:     kind = "dl/consensus"; break;
 
-     case DIR_PURPOSE_FETCH_CERTIFICATE:   kind = "dl/cert"; break;
 
-     case DIR_PURPOSE_FETCH_STATUS_VOTE:   kind = "dl/vote"; break;
 
-     case DIR_PURPOSE_FETCH_DETACHED_SIGNATURES: kind = "dl/detached_sig";
 
-          break;
 
-     case DIR_PURPOSE_FETCH_SERVERDESC:    kind = "dl/server"; break;
 
-     case DIR_PURPOSE_FETCH_EXTRAINFO:     kind = "dl/extra"; break;
 
-     case DIR_PURPOSE_UPLOAD_DIR:          kind = "dl/ul-dir"; break;
 
-     case DIR_PURPOSE_UPLOAD_VOTE:         kind = "dl/ul-vote"; break;
 
-     case DIR_PURPOSE_UPLOAD_SIGNATURES:   kind = "dl/ul-sig"; break;
 
-     case DIR_PURPOSE_FETCH_RENDDESC:      kind = "dl/rend"; break;
 
-     case DIR_PURPOSE_FETCH_RENDDESC_V2:   kind = "dl/rend2"; break;
 
-     case DIR_PURPOSE_UPLOAD_RENDDESC:     kind = "dl/ul-rend"; break;
 
-     case DIR_PURPOSE_UPLOAD_RENDDESC_V2:  kind = "dl/ul-rend2"; break;
 
-   }
 
-   if (kind) {
 
-     key = tor_malloc(256);
 
-     tor_snprintf(key, 256, "%s%s", kind, compressed?".z":"");
 
-   } else {
 
-     key = tor_malloc(256);
 
-     tor_snprintf(key, 256, "unknown purpose (%d)%s",
 
-                  purpose, compressed?".z":"");
 
-   }
 
-   note_request(key, bytes);
 
-   tor_free(key);
 
- }
 
- /** Helper: initialize the request map to instrument downloads. */
 
- static void
 
- ensure_request_map_initialized(void)
 
- {
 
-   if (!request_map)
 
-     request_map = strmap_new();
 
- }
 
- /** Called when we just transmitted or received <b>bytes</b> worth of data
 
-  * because of a request of type <b>key</b> (an arbitrary identifier): adds
 
-  * <b>bytes</b> to the total associated with key. */
 
- void
 
- note_request(const char *key, size_t bytes)
 
- {
 
-   request_t *r;
 
-   ensure_request_map_initialized();
 
-   r = strmap_get(request_map, key);
 
-   if (!r) {
 
-     r = tor_malloc_zero(sizeof(request_t));
 
-     strmap_set(request_map, key, r);
 
-   }
 
-   r->bytes += bytes;
 
-   r->count++;
 
- }
 
- /** Return a newly allocated string holding a summary of bytes used per
 
-  * request type. */
 
- char *
 
- directory_dump_request_log(void)
 
- {
 
-   smartlist_t *lines;
 
-   char tmp[256];
 
-   char *result;
 
-   strmap_iter_t *iter;
 
-   ensure_request_map_initialized();
 
-   lines = smartlist_create();
 
-   for (iter = strmap_iter_init(request_map);
 
-        !strmap_iter_done(iter);
 
-        iter = strmap_iter_next(request_map, iter)) {
 
-     const char *key;
 
-     void *val;
 
-     request_t *r;
 
-     strmap_iter_get(iter, &key, &val);
 
-     r = val;
 
-     tor_snprintf(tmp, sizeof(tmp), "%s  "U64_FORMAT"  "U64_FORMAT"\n",
 
-                  key, U64_PRINTF_ARG(r->bytes), U64_PRINTF_ARG(r->count));
 
-     smartlist_add(lines, tor_strdup(tmp));
 
-   }
 
-   smartlist_sort_strings(lines);
 
-   result = smartlist_join_strings(lines, "", 0, NULL);
 
-   SMARTLIST_FOREACH(lines, char *, cp, tor_free(cp));
 
-   smartlist_free(lines);
 
-   return result;
 
- }
 
- #else
 
- static void
 
- note_client_request(int purpose, int compressed, size_t bytes)
 
- {
 
-   (void)purpose;
 
-   (void)compressed;
 
-   (void)bytes;
 
- }
 
- void
 
- note_request(const char *key, size_t bytes)
 
- {
 
-   (void)key;
 
-   (void)bytes;
 
- }
 
- char *
 
- directory_dump_request_log(void)
 
- {
 
-   return tor_strdup("Not supported.");
 
- }
 
- #endif
 
- /** Decide whether a client would accept the consensus we have
 
-  *
 
-  * Clients can say they only want a consensus if it's signed by more
 
-  * than half the authorities in a list.  They pass this list in
 
-  * the url as "...consensus/<b>fpr</b>+<b>fpr</b>+<b>fpr</b>".
 
-  *
 
-  * <b>fpr</b> may be an abbreviated fingerprint, i.e. only a left substring
 
-  * of the full authority identity digest. (Only strings of even length,
 
-  * i.e. encodings of full bytes, are handled correctly.  In the case
 
-  * of an odd number of hex digits the last one is silently ignored.)
 
-  *
 
-  * Returns 1 if more than half of the requested authorities signed the
 
-  * consensus, 0 otherwise.
 
-  */
 
- int
 
- client_likes_consensus(networkstatus_t *v, const char *want_url)
 
- {
 
-   smartlist_t *want_authorities = smartlist_create();
 
-   int need_at_least;
 
-   int have = 0;
 
-   dir_split_resource_into_fingerprints(want_url, want_authorities, NULL, 0, 0);
 
-   need_at_least = smartlist_len(want_authorities)/2+1;
 
-   SMARTLIST_FOREACH(want_authorities, const char *, d, {
 
-     char want_digest[DIGEST_LEN];
 
-     int want_len = strlen(d)/2;
 
-     if (want_len > DIGEST_LEN)
 
-       want_len = DIGEST_LEN;
 
-     if (base16_decode(want_digest, DIGEST_LEN, d, want_len*2) < 0) {
 
-       log_warn(LD_DIR,"Failed to decode requested authority digest %s.", d);
 
-       continue;
 
-     };
 
-     SMARTLIST_FOREACH(v->voters, networkstatus_voter_info_t *, vi, {
 
-       if (vi->signature &&
 
-           !memcmp(vi->identity_digest, want_digest, want_len)) {
 
-         have++;
 
-         break;
 
-       };
 
-     });
 
-     /* early exit, if we already have enough */
 
-     if (have >= need_at_least)
 
-       break;
 
-   });
 
-   SMARTLIST_FOREACH(want_authorities, char *, d, tor_free(d));
 
-   smartlist_free(want_authorities);
 
-   return (have >= need_at_least);
 
- }
 
- /** Helper function: called when a dirserver gets a complete HTTP GET
 
-  * request.  Look for a request for a directory or for a rendezvous
 
-  * service descriptor.  On finding one, write a response into
 
-  * conn-\>outbuf.  If the request is unrecognized, send a 400.
 
-  * Always return 0. */
 
- static int
 
- directory_handle_command_get(dir_connection_t *conn, const char *headers,
 
-                              const char *body, size_t body_len)
 
- {
 
-   size_t dlen;
 
-   char *url, *url_mem, *header;
 
-   or_options_t *options = get_options();
 
-   time_t if_modified_since = 0;
 
-   int compressed;
 
-   size_t url_len;
 
-   /* We ignore the body of a GET request. */
 
-   (void)body;
 
-   (void)body_len;
 
-   log_debug(LD_DIRSERV,"Received GET command.");
 
-   conn->_base.state = DIR_CONN_STATE_SERVER_WRITING;
 
-   if (parse_http_url(headers, &url) < 0) {
 
-     write_http_status_line(conn, 400, "Bad request");
 
-     return 0;
 
-   }
 
-   if ((header = http_get_header(headers, "If-Modified-Since: "))) {
 
-     struct tm tm;
 
-     if (parse_http_time(header, &tm) == 0) {
 
-       if_modified_since = tor_timegm(&tm);
 
-     }
 
-     /* The correct behavior on a malformed If-Modified-Since header is to
 
-      * act as if no If-Modified-Since header had been given. */
 
-     tor_free(header);
 
-   }
 
-   log_debug(LD_DIRSERV,"rewritten url as '%s'.", url);
 
-   url_mem = url;
 
-   url_len = strlen(url);
 
-   compressed = url_len > 2 && !strcmp(url+url_len-2, ".z");
 
-   if (compressed) {
 
-     url[url_len-2] = '\0';
 
-     url_len -= 2;
 
-   }
 
-   if (!strcmp(url,"/tor/")) {
 
-     const char *frontpage = get_dirportfrontpage();
 
-     if (frontpage) {
 
-       dlen = strlen(frontpage);
 
-       /* Let's return a disclaimer page (users shouldn't use V1 anymore,
 
-          and caches don't fetch '/', so this is safe). */
 
-       if (global_write_bucket_low(TO_CONN(conn), dlen, 1)) {
 
-         log_info(LD_DIRSERV,
 
-                  "Client asked for DirPortFrontPage content, but we've been "
 
-                  "writing too many bytes lately. Sending 503 Dir busy.");
 
-         write_http_status_line(conn, 503, "Directory busy, try again later");
 
-         goto done;
 
-       }
 
-       note_request(url, dlen);
 
-       write_http_response_header_impl(conn, dlen, "text/html", "identity",
 
-                                       NULL, DIRPORTFRONTPAGE_CACHE_LIFETIME);
 
-       connection_write_to_buf(frontpage, dlen, TO_CONN(conn));
 
-       goto done;
 
-     }
 
-     /* if no disclaimer file, fall through and continue */
 
-   }
 
-   if (!strcmp(url,"/tor/") || !strcmp(url,"/tor/dir")) { /* v1 dir fetch */
 
-     cached_dir_t *d = dirserv_get_directory();
 
-     if (!d) {
 
-       log_info(LD_DIRSERV,"Client asked for the mirrored directory, but we "
 
-                "don't have a good one yet. Sending 503 Dir not available.");
 
-       write_http_status_line(conn, 503, "Directory unavailable");
 
-       goto done;
 
-     }
 
-     if (d->published < if_modified_since) {
 
-       write_http_status_line(conn, 304, "Not modified");
 
-       goto done;
 
-     }
 
-     dlen = compressed ? d->dir_z_len : d->dir_len;
 
-     if (global_write_bucket_low(TO_CONN(conn), dlen, 1)) {
 
-       log_debug(LD_DIRSERV,
 
-                "Client asked for the mirrored directory, but we've been "
 
-                "writing too many bytes lately. Sending 503 Dir busy.");
 
-       write_http_status_line(conn, 503, "Directory busy, try again later");
 
-       goto done;
 
-     }
 
-     note_request(url, dlen);
 
-     log_debug(LD_DIRSERV,"Dumping %sdirectory to client.",
 
-               compressed?"compressed ":"");
 
-     write_http_response_header(conn, dlen, compressed,
 
-                           FULL_DIR_CACHE_LIFETIME);
 
-     conn->cached_dir = d;
 
-     conn->cached_dir_offset = 0;
 
-     if (!compressed)
 
-       conn->zlib_state = tor_zlib_new(0, ZLIB_METHOD);
 
-     ++d->refcnt;
 
-     /* Prime the connection with some data. */
 
-     conn->dir_spool_src = DIR_SPOOL_CACHED_DIR;
 
-     connection_dirserv_flushed_some(conn);
 
-     goto done;
 
-   }
 
-   if (!strcmp(url,"/tor/running-routers")) { /* running-routers fetch */
 
-     cached_dir_t *d = dirserv_get_runningrouters();
 
-     if (!d) {
 
-       write_http_status_line(conn, 503, "Directory unavailable");
 
-       goto done;
 
-     }
 
-     if (d->published < if_modified_since) {
 
-       write_http_status_line(conn, 304, "Not modified");
 
-       goto done;
 
-     }
 
-     dlen = compressed ? d->dir_z_len : d->dir_len;
 
-     if (global_write_bucket_low(TO_CONN(conn), dlen, 1)) {
 
-       log_info(LD_DIRSERV,
 
-                "Client asked for running-routers, but we've been "
 
-                "writing too many bytes lately. Sending 503 Dir busy.");
 
-       write_http_status_line(conn, 503, "Directory busy, try again later");
 
-       goto done;
 
-     }
 
-     note_request(url, dlen);
 
-     write_http_response_header(conn, dlen, compressed,
 
-                  RUNNINGROUTERS_CACHE_LIFETIME);
 
-     connection_write_to_buf(compressed ? d->dir_z : d->dir, dlen,
 
-                             TO_CONN(conn));
 
-     goto done;
 
-   }
 
-   if (!strcmpstart(url,"/tor/status/")
 
-       || !strcmpstart(url, "/tor/status-vote/current/consensus")) {
 
-     /* v2 or v3 network status fetch. */
 
-     smartlist_t *dir_fps = smartlist_create();
 
-     int is_v3 = !strcmpstart(url, "/tor/status-vote");
 
-     const char *request_type = NULL;
 
-     const char *key = url + strlen("/tor/status/");
 
-     long lifetime = NETWORKSTATUS_CACHE_LIFETIME;
 
-     if (!is_v3) {
 
-       dirserv_get_networkstatus_v2_fingerprints(dir_fps, key);
 
-       if (!strcmpstart(key, "fp/"))
 
-         request_type = compressed?"/tor/status/fp.z":"/tor/status/fp";
 
-       else if (!strcmpstart(key, "authority"))
 
-         request_type = compressed?"/tor/status/authority.z":
 
-           "/tor/status/authority";
 
-       else if (!strcmpstart(key, "all"))
 
-         request_type = compressed?"/tor/status/all.z":"/tor/status/all";
 
-       else
 
-         request_type = "/tor/status/?";
 
-     } else {
 
-       networkstatus_t *v = networkstatus_get_latest_consensus();
 
-       time_t now = time(NULL);
 
-       #define CONSENSUS_URL_PREFIX "/tor/status-vote/current/consensus/"
 
-       if (v &&
 
-           !strcmpstart(url, CONSENSUS_URL_PREFIX) &&
 
-           !client_likes_consensus(v, url + strlen(CONSENSUS_URL_PREFIX))) {
 
-         write_http_status_line(conn, 404, "Consensus not signed by sufficient "
 
-                                           "number of requested authorities");
 
-         smartlist_free(dir_fps);
 
-         goto done;
 
-       }
 
-       smartlist_add(dir_fps, tor_memdup("\0\0\0\0\0\0\0\0\0\0"
 
-                                         "\0\0\0\0\0\0\0\0\0\0", 20));
 
-       request_type = compressed?"v3.z":"v3";
 
-       lifetime = (v && v->fresh_until > now) ? v->fresh_until - now : 0;
 
-     }
 
-     if (!smartlist_len(dir_fps)) { /* we failed to create/cache cp */
 
-       write_http_status_line(conn, 503, "Network status object unavailable");
 
-       smartlist_free(dir_fps);
 
-       goto done;
 
-     }
 
-     if (!dirserv_remove_old_statuses(dir_fps, if_modified_since)) {
 
-       write_http_status_line(conn, 404, "Not found");
 
-       SMARTLIST_FOREACH(dir_fps, char *, cp, tor_free(cp));
 
-       smartlist_free(dir_fps);
 
-       goto done;
 
-     } else if (!smartlist_len(dir_fps)) {
 
-       write_http_status_line(conn, 304, "Not modified");
 
-       SMARTLIST_FOREACH(dir_fps, char *, cp, tor_free(cp));
 
-       smartlist_free(dir_fps);
 
-       goto done;
 
-     }
 
-     dlen = dirserv_estimate_data_size(dir_fps, 0, compressed);
 
-     if (global_write_bucket_low(TO_CONN(conn), dlen, 2)) {
 
-       log_debug(LD_DIRSERV,
 
-                "Client asked for network status lists, but we've been "
 
-                "writing too many bytes lately. Sending 503 Dir busy.");
 
-       write_http_status_line(conn, 503, "Directory busy, try again later");
 
-       SMARTLIST_FOREACH(dir_fps, char *, fp, tor_free(fp));
 
-       smartlist_free(dir_fps);
 
-       goto done;
 
-     }
 
- #ifdef ENABLE_GEOIP_STATS
 
-     {
 
-       geoip_client_action_t act =
 
-         is_v3 ? GEOIP_CLIENT_NETWORKSTATUS : GEOIP_CLIENT_NETWORKSTATUS_V2;
 
-       struct in_addr in;
 
-       if (tor_inet_aton((TO_CONN(conn))->address, &in))
 
-         geoip_note_client_seen(act, ntohl(in.s_addr), time(NULL));
 
-     }
 
- #endif
 
-     // note_request(request_type,dlen);
 
-     (void) request_type;
 
-     write_http_response_header(conn, -1, compressed,
 
-                                smartlist_len(dir_fps) == 1 ? lifetime : 0);
 
-     conn->fingerprint_stack = dir_fps;
 
-     if (! compressed)
 
-       conn->zlib_state = tor_zlib_new(0, ZLIB_METHOD);
 
-     /* Prime the connection with some data. */
 
-     conn->dir_spool_src = DIR_SPOOL_NETWORKSTATUS;
 
-     connection_dirserv_flushed_some(conn);
 
-     goto done;
 
-   }
 
-   if (!strcmpstart(url,"/tor/status-vote/current/") ||
 
-       !strcmpstart(url,"/tor/status-vote/next/")) {
 
-     /* XXXX If-modified-since is only implemented for the current
 
-      * consensus: that's probably fine, since it's the only vote document
 
-      * people fetch much. */
 
-     int current;
 
-     ssize_t body_len = 0;
 
-     ssize_t estimated_len = 0;
 
-     smartlist_t *items = smartlist_create();
 
-     smartlist_t *dir_items = smartlist_create();
 
-     int lifetime = 60; /* XXXX022 should actually use vote intervals. */
 
-     url += strlen("/tor/status-vote/");
 
-     current = !strcmpstart(url, "current/");
 
-     url = strchr(url, '/');
 
-     tor_assert(url);
 
-     ++url;
 
-     if (!strcmp(url, "consensus")) {
 
-       const char *item;
 
-       tor_assert(!current); /* we handle current consensus specially above,
 
-                              * since it wants to be spooled. */
 
-       if ((item = dirvote_get_pending_consensus()))
 
-         smartlist_add(items, (char*)item);
 
-     } else if (!current && !strcmp(url, "consensus-signatures")) {
 
-       /* XXXX the spec says that we should implement
 
-        * current/consensus-signatures too.  It doesn't seem to be needed,
 
-        * though. */
 
-       const char *item;
 
-       if ((item=dirvote_get_pending_detached_signatures()))
 
-         smartlist_add(items, (char*)item);
 
-     } else if (!strcmp(url, "authority")) {
 
-       const cached_dir_t *d;
 
-       int flags = DGV_BY_ID |
 
-         (current ? DGV_INCLUDE_PREVIOUS : DGV_INCLUDE_PENDING);
 
-       if ((d=dirvote_get_vote(NULL, flags)))
 
-         smartlist_add(dir_items, (cached_dir_t*)d);
 
-     } else {
 
-       const cached_dir_t *d;
 
-       smartlist_t *fps = smartlist_create();
 
-       int flags;
 
-       if (!strcmpstart(url, "d/")) {
 
-         url += 2;
 
-         flags = DGV_INCLUDE_PENDING | DGV_INCLUDE_PREVIOUS;
 
-       } else {
 
-         flags = DGV_BY_ID |
 
-           (current ? DGV_INCLUDE_PREVIOUS : DGV_INCLUDE_PENDING);
 
-       }
 
-       dir_split_resource_into_fingerprints(url, fps, NULL, 1, 1);
 
-       SMARTLIST_FOREACH(fps, char *, fp, {
 
-           if ((d = dirvote_get_vote(fp, flags)))
 
-             smartlist_add(dir_items, (cached_dir_t*)d);
 
-           tor_free(fp);
 
-         });
 
-       smartlist_free(fps);
 
-     }
 
-     if (!smartlist_len(dir_items) && !smartlist_len(items)) {
 
-       write_http_status_line(conn, 404, "Not found");
 
-       goto vote_done;
 
-     }
 
-     SMARTLIST_FOREACH(dir_items, cached_dir_t *, d,
 
-                       body_len += compressed ? d->dir_z_len : d->dir_len);
 
-     estimated_len += body_len;
 
-     SMARTLIST_FOREACH(items, const char *, item, {
 
-         size_t ln = strlen(item);
 
-         if (compressed) {
 
-           estimated_len += ln/2;
 
-         } else {
 
-           body_len += ln; estimated_len += ln;
 
-         }
 
-       });
 
-     if (global_write_bucket_low(TO_CONN(conn), estimated_len, 2)) {
 
-       write_http_status_line(conn, 503, "Directory busy, try again later.");
 
-       goto vote_done;
 
-     }
 
-     write_http_response_header(conn, body_len ? body_len : -1, compressed,
 
-                  lifetime);
 
-     if (smartlist_len(items)) {
 
-       if (compressed) {
 
-         conn->zlib_state = tor_zlib_new(1, ZLIB_METHOD);
 
-         SMARTLIST_FOREACH(items, const char *, c,
 
-                  connection_write_to_buf_zlib(c, strlen(c), conn, 0));
 
-         connection_write_to_buf_zlib("", 0, conn, 1);
 
-       } else {
 
-         SMARTLIST_FOREACH(items, const char *, c,
 
-                          connection_write_to_buf(c, strlen(c), TO_CONN(conn)));
 
-       }
 
-     } else {
 
-       SMARTLIST_FOREACH(dir_items, cached_dir_t *, d,
 
-           connection_write_to_buf(compressed ? d->dir_z : d->dir,
 
-                                   compressed ? d->dir_z_len : d->dir_len,
 
-                                   TO_CONN(conn)));
 
-     }
 
-   vote_done:
 
-     smartlist_free(items);
 
-     smartlist_free(dir_items);
 
-     goto done;
 
-   }
 
-   if (!strcmpstart(url,"/tor/server/") ||
 
-       (!options->BridgeAuthoritativeDir &&
 
-        !options->BridgeRelay && !strcmpstart(url,"/tor/extra/"))) {
 
-     int res;
 
-     const char *msg;
 
-     const char *request_type = NULL;
 
-     int cache_lifetime = 0;
 
-     int is_extra = !strcmpstart(url,"/tor/extra/");
 
-     url += is_extra ? strlen("/tor/extra/") : strlen("/tor/server/");
 
-     conn->fingerprint_stack = smartlist_create();
 
-     res = dirserv_get_routerdesc_fingerprints(conn->fingerprint_stack, url,
 
-                                           &msg,
 
-                                           !connection_dir_is_encrypted(conn),
 
-                                           is_extra);
 
-     if (!strcmpstart(url, "fp/")) {
 
-       request_type = compressed?"/tor/server/fp.z":"/tor/server/fp";
 
-       if (smartlist_len(conn->fingerprint_stack) == 1)
 
-         cache_lifetime = ROUTERDESC_CACHE_LIFETIME;
 
-     } else if (!strcmpstart(url, "authority")) {
 
-       request_type = compressed?"/tor/server/authority.z":
 
-         "/tor/server/authority";
 
-       cache_lifetime = ROUTERDESC_CACHE_LIFETIME;
 
-     } else if (!strcmpstart(url, "all")) {
 
-       request_type = compressed?"/tor/server/all.z":"/tor/server/all";
 
-       cache_lifetime = FULL_DIR_CACHE_LIFETIME;
 
-     } else if (!strcmpstart(url, "d/")) {
 
-       request_type = compressed?"/tor/server/d.z":"/tor/server/d";
 
-       if (smartlist_len(conn->fingerprint_stack) == 1)
 
-         cache_lifetime = ROUTERDESC_BY_DIGEST_CACHE_LIFETIME;
 
-     } else {
 
-       request_type = "/tor/server/?";
 
-     }
 
-     (void) request_type; /* usable for note_request. */
 
-     if (!strcmpstart(url, "d/"))
 
-       conn->dir_spool_src =
 
-         is_extra ? DIR_SPOOL_EXTRA_BY_DIGEST : DIR_SPOOL_SERVER_BY_DIGEST;
 
-     else
 
-       conn->dir_spool_src =
 
-         is_extra ? DIR_SPOOL_EXTRA_BY_FP : DIR_SPOOL_SERVER_BY_FP;
 
-     if (!dirserv_have_any_serverdesc(conn->fingerprint_stack,
 
-                                      conn->dir_spool_src)) {
 
-       res = -1;
 
-       msg = "Not found";
 
-     }
 
-     if (res < 0)
 
-       write_http_status_line(conn, 404, msg);
 
-     else {
 
-       dlen = dirserv_estimate_data_size(conn->fingerprint_stack,
 
-                                         1, compressed);
 
-       if (global_write_bucket_low(TO_CONN(conn), dlen, 2)) {
 
-         log_info(LD_DIRSERV,
 
-                  "Client asked for server descriptors, but we've been "
 
-                  "writing too many bytes lately. Sending 503 Dir busy.");
 
-         write_http_status_line(conn, 503, "Directory busy, try again later");
 
-         conn->dir_spool_src = DIR_SPOOL_NONE;
 
-         goto done;
 
-       }
 
-       write_http_response_header(conn, -1, compressed, cache_lifetime);
 
-       if (compressed)
 
-         conn->zlib_state = tor_zlib_new(1, ZLIB_METHOD);
 
-       /* Prime the connection with some data. */
 
-       connection_dirserv_flushed_some(conn);
 
-     }
 
-     goto done;
 
-   }
 
-   if (!strcmpstart(url,"/tor/keys/")) {
 
-     smartlist_t *certs = smartlist_create();
 
-     ssize_t len = -1;
 
-     if (!strcmp(url, "/tor/keys/all")) {
 
-       authority_cert_get_all(certs);
 
-     } else if (!strcmp(url, "/tor/keys/authority")) {
 
-       authority_cert_t *cert = get_my_v3_authority_cert();
 
-       if (cert)
 
-         smartlist_add(certs, cert);
 
-     } else if (!strcmpstart(url, "/tor/keys/fp/")) {
 
-       smartlist_t *fps = smartlist_create();
 
-       dir_split_resource_into_fingerprints(url+strlen("/tor/keys/fp/"),
 
-                                            fps, NULL, 1, 1);
 
-       SMARTLIST_FOREACH(fps, char *, d, {
 
-           authority_cert_t *c = authority_cert_get_newest_by_id(d);
 
-           if (c) smartlist_add(certs, c);
 
-           tor_free(d);
 
-       });
 
-       smartlist_free(fps);
 
-     } else if (!strcmpstart(url, "/tor/keys/sk/")) {
 
-       smartlist_t *fps = smartlist_create();
 
-       dir_split_resource_into_fingerprints(url+strlen("/tor/keys/sk/"),
 
-                                            fps, NULL, 1, 1);
 
-       SMARTLIST_FOREACH(fps, char *, d, {
 
-           authority_cert_t *c = authority_cert_get_by_sk_digest(d);
 
-           if (c) smartlist_add(certs, c);
 
-           tor_free(d);
 
-       });
 
-       smartlist_free(fps);
 
-     } else if (!strcmpstart(url, "/tor/keys/fp-sk/")) {
 
-       smartlist_t *fp_sks = smartlist_create();
 
-       dir_split_resource_into_fingerprint_pairs(url+strlen("/tor/keys/fp-sk/"),
 
-                                                 fp_sks);
 
-       SMARTLIST_FOREACH(fp_sks, fp_pair_t *, pair, {
 
-           authority_cert_t *c = authority_cert_get_by_digests(pair->first,
 
-                                                               pair->second);
 
-           if (c) smartlist_add(certs, c);
 
-           tor_free(pair);
 
-       });
 
-       smartlist_free(fp_sks);
 
-     } else {
 
-       write_http_status_line(conn, 400, "Bad request");
 
-       goto keys_done;
 
-     }
 
-     if (!smartlist_len(certs)) {
 
-       write_http_status_line(conn, 404, "Not found");
 
-       goto keys_done;
 
-     }
 
-     SMARTLIST_FOREACH(certs, authority_cert_t *, c,
 
-       if (c->cache_info.published_on < if_modified_since)
 
-         SMARTLIST_DEL_CURRENT(certs, c));
 
-     if (!smartlist_len(certs)) {
 
-       write_http_status_line(conn, 304, "Not modified");
 
-       goto keys_done;
 
-     }
 
-     len = 0;
 
-     SMARTLIST_FOREACH(certs, authority_cert_t *, c,
 
-                       len += c->cache_info.signed_descriptor_len);
 
-     if (global_write_bucket_low(TO_CONN(conn), compressed?len/2:len, 2)) {
 
-       write_http_status_line(conn, 503, "Directory busy, try again later.");
 
-       goto keys_done;
 
-     }
 
-     write_http_response_header(conn, compressed?-1:len, compressed, 60*60);
 
-     if (compressed) {
 
-       conn->zlib_state = tor_zlib_new(1, ZLIB_METHOD);
 
-       SMARTLIST_FOREACH(certs, authority_cert_t *, c,
 
-             connection_write_to_buf_zlib(c->cache_info.signed_descriptor_body,
 
-                                          c->cache_info.signed_descriptor_len,
 
-                                          conn, 0));
 
-       connection_write_to_buf_zlib("", 0, conn, 1);
 
-     } else {
 
-       SMARTLIST_FOREACH(certs, authority_cert_t *, c,
 
-             connection_write_to_buf(c->cache_info.signed_descriptor_body,
 
-                                     c->cache_info.signed_descriptor_len,
 
-                                     TO_CONN(conn)));
 
-     }
 
-   keys_done:
 
-     smartlist_free(certs);
 
-     goto done;
 
-   }
 
-   if (options->HidServDirectoryV2 &&
 
-        !strcmpstart(url,"/tor/rendezvous2/")) {
 
-     /* Handle v2 rendezvous descriptor fetch request. */
 
-     const char *descp;
 
-     const char *query = url + strlen("/tor/rendezvous2/");
 
-     if (strlen(query) == REND_DESC_ID_V2_LEN_BASE32) {
 
-       log_info(LD_REND, "Got a v2 rendezvous descriptor request for ID '%s'",
 
-                safe_str(query));
 
-       switch (rend_cache_lookup_v2_desc_as_dir(query, &descp)) {
 
-         case 1: /* valid */
 
-           write_http_response_header(conn, strlen(descp), 0, 0);
 
-           connection_write_to_buf(descp, strlen(descp), TO_CONN(conn));
 
-           break;
 
-         case 0: /* well-formed but not present */
 
-           write_http_status_line(conn, 404, "Not found");
 
-           break;
 
-         case -1: /* not well-formed */
 
-           write_http_status_line(conn, 400, "Bad request");
 
-           break;
 
-       }
 
-     } else { /* not well-formed */
 
-       write_http_status_line(conn, 400, "Bad request");
 
-     }
 
-     goto done;
 
-   }
 
-   if (options->HSAuthoritativeDir && !strcmpstart(url,"/tor/rendezvous/")) {
 
-     /* rendezvous descriptor fetch */
 
-     const char *descp;
 
-     size_t desc_len;
 
-     const char *query = url+strlen("/tor/rendezvous/");
 
-     log_info(LD_REND, "Handling rendezvous descriptor get");
 
-     switch (rend_cache_lookup_desc(query, 0, &descp, &desc_len)) {
 
-       case 1: /* valid */
 
-         write_http_response_header_impl(conn, desc_len,
 
-                                         "application/octet-stream",
 
-                                         NULL, NULL, 0);
 
-         note_request("/tor/rendezvous?/", desc_len);
 
-         /* need to send descp separately, because it may include NULs */
 
-         connection_write_to_buf(descp, desc_len, TO_CONN(conn));
 
-         /* report successful fetch to statistic */
 
-         if (options->HSAuthorityRecordStats) {
 
-           hs_usage_note_fetch_total(query, time(NULL));
 
-           hs_usage_note_fetch_successful(query, time(NULL));
 
-         }
 
-         break;
 
-       case 0: /* well-formed but not present */
 
-         write_http_status_line(conn, 404, "Not found");
 
-         /* report (unsuccessful) fetch to statistic */
 
-         if (options->HSAuthorityRecordStats) {
 
-           hs_usage_note_fetch_total(query, time(NULL));
 
-         }
 
-         break;
 
-       case -1: /* not well-formed */
 
-         write_http_status_line(conn, 400, "Bad request");
 
-         break;
 
-     }
 
-     goto done;
 
-   }
 
-   if (options->BridgeAuthoritativeDir &&
 
-       options->BridgePassword &&
 
-       connection_dir_is_encrypted(conn) &&
 
-       !strcmp(url,"/tor/networkstatus-bridges")) {
 
-     char *status;
 
-     char *secret = alloc_http_authenticator(options->BridgePassword);
 
-     header = http_get_header(headers, "Authorization: Basic ");
 
-     /* now make sure the password is there and right */
 
-     if (!header || strcmp(header, secret)) {
 
-       write_http_status_line(conn, 404, "Not found");
 
-       tor_free(secret);
 
-       tor_free(header);
 
-       goto done;
 
-     }
 
-     tor_free(secret);
 
-     tor_free(header);
 
-     /* all happy now. send an answer. */
 
-     status = networkstatus_getinfo_by_purpose("bridge", time(NULL));
 
-     dlen = strlen(status);
 
-     write_http_response_header(conn, dlen, 0, 0);
 
-     connection_write_to_buf(status, dlen, TO_CONN(conn));
 
-     tor_free(status);
 
-     goto done;
 
-   }
 
-   if (!strcmpstart(url,"/tor/bytes.txt")) {
 
-     char *bytes = directory_dump_request_log();
 
-     size_t len = strlen(bytes);
 
-     write_http_response_header(conn, len, 0, 0);
 
-     connection_write_to_buf(bytes, len, TO_CONN(conn));
 
-     tor_free(bytes);
 
-     goto done;
 
-   }
 
-   if (!strcmp(url,"/tor/robots.txt")) { /* /robots.txt will have been
 
-                                            rewritten to /tor/robots.txt */
 
-     char robots[] = "User-agent: *\r\nDisallow: /\r\n";
 
-     size_t len = strlen(robots);
 
-     write_http_response_header(conn, len, 0, ROBOTS_CACHE_LIFETIME);
 
-     connection_write_to_buf(robots, len, TO_CONN(conn));
 
-     goto done;
 
-   }
 
-   if (!strcmp(url,"/tor/dbg-stability.txt")) {
 
-     const char *stability;
 
-     size_t len;
 
-     if (! authdir_mode_tests_reachability(options) ||
 
-         ! (stability = rep_hist_get_router_stability_doc(time(NULL)))) {
 
-       write_http_status_line(conn, 404, "Not found.");
 
-       goto done;
 
-     }
 
-     len = strlen(stability);
 
-     write_http_response_header(conn, len, 0, 0);
 
-     connection_write_to_buf(stability, len, TO_CONN(conn));
 
-     goto done;
 
-   }
 
- #if defined(EXPORTMALLINFO) && defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
 
- #define ADD_MALLINFO_LINE(x) do {                               \
 
-     tor_snprintf(tmp, sizeof(tmp), "%s %d\n", #x, mi.x);        \
 
-     smartlist_add(lines, tor_strdup(tmp));                      \
 
-   }while(0);
 
-   if (!strcmp(url,"/tor/mallinfo.txt") &&
 
-       (tor_addr_eq_ipv4h(&conn->_base.addr, 0x7f000001ul))) {
 
-     char *result;
 
-     size_t len;
 
-     struct mallinfo mi;
 
-     smartlist_t *lines;
 
-     char tmp[256];
 
-     memset(&mi, 0, sizeof(mi));
 
-     mi = mallinfo();
 
-     lines = smartlist_create();
 
-     ADD_MALLINFO_LINE(arena)
 
-     ADD_MALLINFO_LINE(ordblks)
 
-     ADD_MALLINFO_LINE(smblks)
 
-     ADD_MALLINFO_LINE(hblks)
 
-     ADD_MALLINFO_LINE(hblkhd)
 
-     ADD_MALLINFO_LINE(usmblks)
 
-     ADD_MALLINFO_LINE(fsmblks)
 
-     ADD_MALLINFO_LINE(uordblks)
 
-     ADD_MALLINFO_LINE(fordblks)
 
-     ADD_MALLINFO_LINE(keepcost)
 
-     result = smartlist_join_strings(lines, "", 0, NULL);
 
-     SMARTLIST_FOREACH(lines, char *, cp, tor_free(cp));
 
-     smartlist_free(lines);
 
-     len = strlen(result);
 
-     write_http_response_header(conn, len, 0, 0);
 
-     connection_write_to_buf(result, len, TO_CONN(conn));
 
-     tor_free(result);
 
-     goto done;
 
-   }
 
- #endif
 
-   /* we didn't recognize the url */
 
-   write_http_status_line(conn, 404, "Not found");
 
-  done:
 
-   tor_free(url_mem);
 
-   return 0;
 
- }
 
- /** Helper function: called when a dirserver gets a complete HTTP POST
 
-  * request.  Look for an uploaded server descriptor or rendezvous
 
-  * service descriptor.  On finding one, process it and write a
 
-  * response into conn-\>outbuf.  If the request is unrecognized, send a
 
-  * 400.  Always return 0. */
 
- static int
 
- directory_handle_command_post(dir_connection_t *conn, const char *headers,
 
-                               const char *body, size_t body_len)
 
- {
 
-   char *url = NULL;
 
-   or_options_t *options = get_options();
 
-   log_debug(LD_DIRSERV,"Received POST command.");
 
-   conn->_base.state = DIR_CONN_STATE_SERVER_WRITING;
 
-   if (parse_http_url(headers, &url) < 0) {
 
-     write_http_status_line(conn, 400, "Bad request");
 
-     return 0;
 
-   }
 
-   log_debug(LD_DIRSERV,"rewritten url as '%s'.", url);
 
-   /* Handle v2 rendezvous service publish request. */
 
-   if (options->HidServDirectoryV2 &&
 
-       !strcmpstart(url,"/tor/rendezvous2/publish")) {
 
-     switch (rend_cache_store_v2_desc_as_dir(body)) {
 
-       case -2:
 
-         log_info(LD_REND, "Rejected v2 rend descriptor (length %d) from %s "
 
-                  "since we're not currently a hidden service directory.",
 
-                  (int)body_len, conn->_base.address);
 
-         write_http_status_line(conn, 503, "Currently not acting as v2 "
 
-                                "hidden service directory");
 
-         break;
 
-       case -1:
 
-         log_warn(LD_REND, "Rejected v2 rend descriptor (length %d) from %s.",
 
-                  (int)body_len, conn->_base.address);
 
-         write_http_status_line(conn, 400,
 
-                                "Invalid v2 service descriptor rejected");
 
-         break;
 
-       default:
 
-         write_http_status_line(conn, 200, "Service descriptor (v2) stored");
 
-         log_info(LD_REND, "Handled v2 rendezvous descriptor post: accepted");
 
-     }
 
-     goto done;
 
-   }
 
-   if (!authdir_mode(options)) {
 
-     /* we just provide cached directories; we don't want to
 
-      * receive anything. */
 
-     write_http_status_line(conn, 400, "Nonauthoritative directory does not "
 
-                            "accept posted server descriptors");
 
-     goto done;
 
-   }
 
-   if (authdir_mode_handles_descs(options, -1) &&
 
-       !strcmp(url,"/tor/")) { /* server descriptor post */
 
-     const char *msg = "[None]";
 
-     uint8_t purpose = authdir_mode_bridge(options) ?
 
-                       ROUTER_PURPOSE_BRIDGE : ROUTER_PURPOSE_GENERAL;
 
-     was_router_added_t r = dirserv_add_multiple_descriptors(body, purpose,
 
-                                              conn->_base.address, &msg);
 
-     tor_assert(msg);
 
-     if (WRA_WAS_ADDED(r))
 
-       dirserv_get_directory(); /* rebuild and write to disk */
 
-     if (r == ROUTER_ADDED_NOTIFY_GENERATOR) {
 
-       /* Accepted with a message. */
 
-       log_info(LD_DIRSERV,
 
-                "Problematic router descriptor or extra-info from %s "
 
-                "(\"%s\").",
 
-                conn->_base.address, msg);
 
-       write_http_status_line(conn, 400, msg);
 
-     } else if (r == ROUTER_ADDED_SUCCESSFULLY) {
 
-       write_http_status_line(conn, 200, msg);
 
-     } else if (WRA_WAS_OUTDATED(r)) {
 
-       write_http_response_header_impl(conn, -1, NULL, NULL,
 
-                                       "X-Descriptor-Not-New: Yes\r\n", -1);
 
-     } else {
 
-       log_info(LD_DIRSERV,
 
-                "Rejected router descriptor or extra-info from %s "
 
-                "(\"%s\").",
 
-                conn->_base.address, msg);
 
-       write_http_status_line(conn, 400, msg);
 
-     }
 
-     goto done;
 
-   }
 
-   if (options->HSAuthoritativeDir &&
 
-       !strcmpstart(url,"/tor/rendezvous/publish")) {
 
-     /* rendezvous descriptor post */
 
-     log_info(LD_REND, "Handling rendezvous descriptor post.");
 
-     if (rend_cache_store(body, body_len, 1) < 0) {
 
-       log_fn(LOG_PROTOCOL_WARN, LD_DIRSERV,
 
-              "Rejected rend descriptor (length %d) from %s.",
 
-              (int)body_len, conn->_base.address);
 
-       write_http_status_line(conn, 400,
 
-                              "Invalid v0 service descriptor rejected");
 
-     } else {
 
-       write_http_status_line(conn, 200, "Service descriptor (v0) stored");
 
-     }
 
-     goto done;
 
-   }
 
-   if (authdir_mode_v3(options) &&
 
-       !strcmp(url,"/tor/post/vote")) { /* v3 networkstatus vote */
 
-     const char *msg = "OK";
 
-     int status;
 
-     if (dirvote_add_vote(body, &msg, &status)) {
 
-       write_http_status_line(conn, status, "Vote stored");
 
-     } else {
 
-       tor_assert(msg);
 
-       write_http_status_line(conn, status, msg);
 
-     }
 
-     goto done;
 
-   }
 
-   if (authdir_mode_v3(options) &&
 
-       !strcmp(url,"/tor/post/consensus-signature")) { /* sigs on consensus. */
 
-     const char *msg = NULL;
 
-     if (dirvote_add_signatures(body, conn->_base.address, &msg)>=0) {
 
-       write_http_status_line(conn, 200, msg?msg:"Signatures stored");
 
-     } else {
 
-       log_warn(LD_DIR, "Unable to store signatures posted by %s: %s",
 
-                conn->_base.address, msg?msg:"???");
 
-       write_http_status_line(conn, 400, msg?msg:"Unable to store signatures");
 
-     }
 
-     goto done;
 
-   }
 
-   /* we didn't recognize the url */
 
-   write_http_status_line(conn, 404, "Not found");
 
-  done:
 
-   tor_free(url);
 
-   return 0;
 
- }
 
- /** Called when a dirserver receives data on a directory connection;
 
-  * looks for an HTTP request.  If the request is complete, remove it
 
-  * from the inbuf, try to process it; otherwise, leave it on the
 
-  * buffer.  Return a 0 on success, or -1 on error.
 
-  */
 
- static int
 
- directory_handle_command(dir_connection_t *conn)
 
- {
 
-   char *headers=NULL, *body=NULL;
 
-   size_t body_len=0;
 
-   int r;
 
-   tor_assert(conn);
 
-   tor_assert(conn->_base.type == CONN_TYPE_DIR);
 
-   switch (fetch_from_buf_http(conn->_base.inbuf,
 
-                               &headers, MAX_HEADERS_SIZE,
 
-                               &body, &body_len, MAX_DIR_UL_SIZE, 0)) {
 
-     case -1: /* overflow */
 
-       log_warn(LD_DIRSERV,
 
-                "Invalid input from address '%s'. Closing.",
 
-                conn->_base.address);
 
-       return -1;
 
-     case 0:
 
-       log_debug(LD_DIRSERV,"command not all here yet.");
 
-       return 0;
 
-     /* case 1, fall through */
 
-   }
 
-   http_set_address_origin(headers, TO_CONN(conn));
 
-   //log_debug(LD_DIRSERV,"headers %s, body %s.", headers, body);
 
-   if (!strncasecmp(headers,"GET",3))
 
-     r = directory_handle_command_get(conn, headers, body, body_len);
 
-   else if (!strncasecmp(headers,"POST",4))
 
-     r = directory_handle_command_post(conn, headers, body, body_len);
 
-   else {
 
-     log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
 
-            "Got headers %s with unknown command. Closing.",
 
-            escaped(headers));
 
-     r = -1;
 
-   }
 
-   tor_free(headers); tor_free(body);
 
-   return r;
 
- }
 
- /** Write handler for directory connections; called when all data has
 
-  * been flushed.  Close the connection or wait for a response as
 
-  * appropriate.
 
-  */
 
- int
 
- connection_dir_finished_flushing(dir_connection_t *conn)
 
- {
 
-   tor_assert(conn);
 
-   tor_assert(conn->_base.type == CONN_TYPE_DIR);
 
-   switch (conn->_base.state) {
 
-     case DIR_CONN_STATE_CLIENT_SENDING:
 
-       log_debug(LD_DIR,"client finished sending command.");
 
-       conn->_base.state = DIR_CONN_STATE_CLIENT_READING;
 
-       connection_stop_writing(TO_CONN(conn));
 
-       return 0;
 
-     case DIR_CONN_STATE_SERVER_WRITING:
 
-       log_debug(LD_DIRSERV,"Finished writing server response. Closing.");
 
-       connection_mark_for_close(TO_CONN(conn));
 
-       return 0;
 
-     default:
 
-       log_warn(LD_BUG,"called in unexpected state %d.",
 
-                conn->_base.state);
 
-       tor_fragile_assert();
 
-       return -1;
 
-   }
 
-   return 0;
 
- }
 
- /** Connected handler for directory connections: begin sending data to the
 
-  * server */
 
- int
 
- connection_dir_finished_connecting(dir_connection_t *conn)
 
- {
 
-   tor_assert(conn);
 
-   tor_assert(conn->_base.type == CONN_TYPE_DIR);
 
-   tor_assert(conn->_base.state == DIR_CONN_STATE_CONNECTING);
 
-   log_debug(LD_HTTP,"Dir connection to router %s:%u established.",
 
-             conn->_base.address,conn->_base.port);
 
-   conn->_base.state = DIR_CONN_STATE_CLIENT_SENDING; /* start flushing conn */
 
-   return 0;
 
- }
 
- /** Called when one or more networkstatus fetches have failed (with uppercase
 
-  * fingerprints listed in <b>failed</b>).  Mark those fingerprints as having
 
-  * failed once, unless they failed with status code 503. */
 
- static void
 
- dir_networkstatus_download_failed(smartlist_t *failed, int status_code)
 
- {
 
-   if (status_code == 503)
 
-     return;
 
-   SMARTLIST_FOREACH(failed, const char *, fp,
 
-   {
 
-     char digest[DIGEST_LEN];
 
-     trusted_dir_server_t *dir;
 
-     if (base16_decode(digest, DIGEST_LEN, fp, strlen(fp))<0) {
 
-       log_warn(LD_BUG, "Called with bad fingerprint in list: %s",
 
-                escaped(fp));
 
-       continue;
 
-     }
 
-     dir = router_get_trusteddirserver_by_digest(digest);
 
-     if (dir)
 
-       download_status_failed(&dir->v2_ns_dl_status, status_code);
 
-   });
 
- }
 
- /** Schedule for when servers should download things in general. */
 
- static const int server_dl_schedule[] = {
 
-   0, 0, 0, 60, 60, 60*2, 60*5, 60*15, INT_MAX
 
- };
 
- /** Schedule for when clients should download things in general. */
 
- static const int client_dl_schedule[] = {
 
-   0, 0, 60, 60*5, 60*10, INT_MAX
 
- };
 
- /** Schedule for when servers should download consensuses. */
 
- static const int server_consensus_dl_schedule[] = {
 
-   0, 0, 60, 60*5, 60*10, 60*30, 60*30, 60*30, 60*30, 60*30, 60*60, 60*60*2
 
- };
 
- /** Schedule for when clients should download consensuses. */
 
- static const int client_consensus_dl_schedule[] = {
 
-   0, 0, 60, 60*5, 60*10, 60*30, 60*60, 60*60, 60*60, 60*60*3, 60*60*6, 60*60*12
 
- };
 
- /** Schedule for when clients should download bridge descriptors. */
 
- static const int bridge_dl_schedule[] = {
 
-   60*60, 15*60, 15*60, 60*60
 
- };
 
- /** Decide which download schedule we want to use, and then return a
 
-  * pointer to it along with a pointer to its length. Helper function for
 
-  * download_status_increment_failure() and download_status_reset(). */
 
- static void
 
- find_dl_schedule_and_len(download_status_t *dls, int server,
 
-                          const int **schedule, size_t *schedule_len)
 
- {
 
-   switch (dls->schedule) {
 
-     case DL_SCHED_GENERIC:
 
-       if (server) {
 
-         *schedule = server_dl_schedule;
 
-         *schedule_len = sizeof(server_dl_schedule)/sizeof(int);
 
-       } else {
 
-         *schedule = client_dl_schedule;
 
-         *schedule_len = sizeof(client_dl_schedule)/sizeof(int);
 
-       }
 
-       break;
 
-     case DL_SCHED_CONSENSUS:
 
-       if (server) {
 
-         *schedule = server_consensus_dl_schedule;
 
-         *schedule_len = sizeof(server_consensus_dl_schedule)/sizeof(int);
 
-       } else {
 
-         *schedule = client_consensus_dl_schedule;
 
-         *schedule_len = sizeof(client_consensus_dl_schedule)/sizeof(int);
 
-       }
 
-       break;
 
-     case DL_SCHED_BRIDGE:
 
-       *schedule = bridge_dl_schedule;
 
-       *schedule_len = sizeof(bridge_dl_schedule)/sizeof(int);
 
-       break;
 
-     default:
 
-       tor_assert(0);
 
-   }
 
- }
 
- /** Called when an attempt to download <b>dls</b> has failed with HTTP status
 
-  * <b>status_code</b>.  Increment the failure count (if the code indicates a
 
-  * real failure) and set <b>dls</b>-\>next_attempt_at to an appropriate time
 
-  * in the future. */
 
- time_t
 
- download_status_increment_failure(download_status_t *dls, int status_code,
 
-                                   const char *item, int server, time_t now)
 
- {
 
-   const int *schedule;
 
-   size_t schedule_len;
 
-   int increment;
 
-   tor_assert(dls);
 
-   if (status_code != 503 || server) {
 
-     if (dls->n_download_failures < IMPOSSIBLE_TO_DOWNLOAD-1)
 
-       ++dls->n_download_failures;
 
-   }
 
-   find_dl_schedule_and_len(dls, server, &schedule, &schedule_len);
 
-   if (dls->n_download_failures < schedule_len)
 
-     increment = schedule[dls->n_download_failures];
 
-   else if (dls->n_download_failures == IMPOSSIBLE_TO_DOWNLOAD)
 
-     increment = INT_MAX;
 
-   else
 
-     increment = schedule[schedule_len-1];
 
-   if (increment < INT_MAX)
 
-     dls->next_attempt_at = now+increment;
 
-   else
 
-     dls->next_attempt_at = TIME_MAX;
 
-   if (item) {
 
-     if (increment == 0)
 
-       log_debug(LD_DIR, "%s failed %d time(s); I'll try again immediately.",
 
-                 item, (int)dls->n_download_failures);
 
-     else if (dls->next_attempt_at < TIME_MAX)
 
-       log_debug(LD_DIR, "%s failed %d time(s); I'll try again in %d seconds.",
 
-                 item, (int)dls->n_download_failures,
 
-                 (int)(dls->next_attempt_at-now));
 
-     else
 
-       log_debug(LD_DIR, "%s failed %d time(s); Giving up for a while.",
 
-                 item, (int)dls->n_download_failures);
 
-   }
 
-   return dls->next_attempt_at;
 
- }
 
- /** Reset <b>dls</b> so that it will be considered downloadable
 
-  * immediately, and/or to show that we don't need it anymore.
 
-  *
 
-  * (We find the zeroth element of the download schedule, and set
 
-  * next_attempt_at to be the appropriate offset from 'now'. In most
 
-  * cases this means setting it to 'now', so the item will be immediately
 
-  * downloadable; in the case of bridge descriptors, the zeroth element
 
-  * is an hour from now.) */
 
- void
 
- download_status_reset(download_status_t *dls)
 
- {
 
-   const int *schedule;
 
-   size_t schedule_len;
 
-   find_dl_schedule_and_len(dls, get_options()->DirPort,
 
-                            &schedule, &schedule_len);
 
-   dls->n_download_failures = 0;
 
-   dls->next_attempt_at = time(NULL) + schedule[0];
 
- }
 
- /** Called when one or more routerdesc (or extrainfo, if <b>was_extrainfo</b>)
 
-  * fetches have failed (with uppercase fingerprints listed in <b>failed</b>,
 
-  * either as descriptor digests or as identity digests based on
 
-  * <b>was_descriptor_digests</b>).
 
-  */
 
- static void
 
- dir_routerdesc_download_failed(smartlist_t *failed, int status_code,
 
-                                int router_purpose,
 
-                                int was_extrainfo, int was_descriptor_digests)
 
- {
 
-   char digest[DIGEST_LEN];
 
-   time_t now = time(NULL);
 
-   int server = directory_fetches_from_authorities(get_options());
 
-   if (!was_descriptor_digests) {
 
-     if (router_purpose == ROUTER_PURPOSE_BRIDGE) {
 
-       tor_assert(!was_extrainfo); /* not supported yet */
 
-       SMARTLIST_FOREACH(failed, const char *, cp,
 
-       {
 
-         if (base16_decode(digest, DIGEST_LEN, cp, strlen(cp))<0) {
 
-           log_warn(LD_BUG, "Malformed fingerprint in list: %s",
 
-                    escaped(cp));
 
-           continue;
 
-         }
 
-         retry_bridge_descriptor_fetch_directly(digest);
 
-       });
 
-     }
 
-     return; /* FFFF should implement for other-than-router-purpose someday */
 
-   }
 
-   SMARTLIST_FOREACH(failed, const char *, cp,
 
-   {
 
-     download_status_t *dls = NULL;
 
-     if (base16_decode(digest, DIGEST_LEN, cp, strlen(cp)) < 0) {
 
-       log_warn(LD_BUG, "Malformed fingerprint in list: %s", escaped(cp));
 
-       continue;
 
-     }
 
-     if (was_extrainfo) {
 
-       signed_descriptor_t *sd =
 
-         router_get_by_extrainfo_digest(digest);
 
-       if (sd)
 
-         dls = &sd->ei_dl_status;
 
-     } else {
 
-       dls = router_get_dl_status_by_descriptor_digest(digest);
 
-     }
 
-     if (!dls || dls->n_download_failures >= MAX_ROUTERDESC_DOWNLOAD_FAILURES)
 
-       continue;
 
-     download_status_increment_failure(dls, status_code, cp, server, now);
 
-   });
 
-   /* No need to relaunch descriptor downloads here: we already do it
 
-    * every 10 or 60 seconds (FOO_DESCRIPTOR_RETRY_INTERVAL) in main.c. */
 
- }
 
- /** Helper.  Compare two fp_pair_t objects, and return -1, 0, or 1 as
 
-  * appropriate. */
 
- static int
 
- _compare_pairs(const void **a, const void **b)
 
- {
 
-   const fp_pair_t *fp1 = *a, *fp2 = *b;
 
-   int r;
 
-   if ((r = memcmp(fp1->first, fp2->first, DIGEST_LEN)))
 
-     return r;
 
-   else
 
-     return memcmp(fp1->second, fp2->second, DIGEST_LEN);
 
- }
 
- /** Divide a string <b>res</b> of the form FP1-FP2+FP3-FP4...[.z], where each
 
-  * FP is a hex-encoded fingerprint, into a sequence of distinct sorted
 
-  * fp_pair_t. Skip malformed pairs. On success, return 0 and add those
 
-  * fp_pair_t into <b>pairs_out</b>.  On failure, return -1. */
 
- int
 
- dir_split_resource_into_fingerprint_pairs(const char *res,
 
-                                           smartlist_t *pairs_out)
 
- {
 
-   smartlist_t *pairs_tmp = smartlist_create();
 
-   smartlist_t *pairs_result = smartlist_create();
 
-   smartlist_split_string(pairs_tmp, res, "+", 0, 0);
 
-   if (smartlist_len(pairs_tmp)) {
 
-     char *last = smartlist_get(pairs_tmp,smartlist_len(pairs_tmp)-1);
 
-     size_t last_len = strlen(last);
 
-     if (last_len > 2 && !strcmp(last+last_len-2, ".z")) {
 
-       last[last_len-2] = '\0';
 
-     }
 
-   }
 
-   SMARTLIST_FOREACH_BEGIN(pairs_tmp, char *, cp) {
 
-     if (strlen(cp) != HEX_DIGEST_LEN*2+1) {
 
-       log_info(LD_DIR,
 
-              "Skipping digest pair %s with non-standard length.", escaped(cp));
 
-     } else if (cp[HEX_DIGEST_LEN] != '-') {
 
-       log_info(LD_DIR,
 
-              "Skipping digest pair %s with missing dash.", escaped(cp));
 
-     } else {
 
-       fp_pair_t pair;
 
-       if (base16_decode(pair.first, DIGEST_LEN, cp, HEX_DIGEST_LEN)<0 ||
 
-           base16_decode(pair.second,
 
-                         DIGEST_LEN, cp+HEX_DIGEST_LEN+1, HEX_DIGEST_LEN)<0) {
 
-         log_info(LD_DIR, "Skipping non-decodable digest pair %s", escaped(cp));
 
-       } else {
 
-         smartlist_add(pairs_result, tor_memdup(&pair, sizeof(pair)));
 
-       }
 
-     }
 
-     tor_free(cp);
 
-   } SMARTLIST_FOREACH_END(cp);
 
-   smartlist_free(pairs_tmp);
 
-   /* Uniq-and-sort */
 
-   smartlist_sort(pairs_result, _compare_pairs);
 
-   smartlist_uniq(pairs_result, _compare_pairs, _tor_free);
 
-   smartlist_add_all(pairs_out, pairs_result);
 
-   smartlist_free(pairs_result);
 
-   return 0;
 
- }
 
- /** Given a directory <b>resource</b> request, containing zero
 
-  * or more strings separated by plus signs, followed optionally by ".z", store
 
-  * the strings, in order, into <b>fp_out</b>.  If <b>compressed_out</b> is
 
-  * non-NULL, set it to 1 if the resource ends in ".z", else set it to 0.  If
 
-  * decode_hex is true, then delete all elements that aren't hex digests, and
 
-  * decode the rest.  If sort_uniq is true, then sort the list and remove
 
-  * all duplicates.
 
-  */
 
- int
 
- dir_split_resource_into_fingerprints(const char *resource,
 
-                                      smartlist_t *fp_out, int *compressed_out,
 
-                                      int decode_hex, int sort_uniq)
 
- {
 
-   smartlist_t *fp_tmp = smartlist_create();
 
-   tor_assert(fp_out);
 
-   smartlist_split_string(fp_tmp, resource, "+", 0, 0);
 
-   if (compressed_out)
 
-     *compressed_out = 0;
 
-   if (smartlist_len(fp_tmp)) {
 
-     char *last = smartlist_get(fp_tmp,smartlist_len(fp_tmp)-1);
 
-     size_t last_len = strlen(last);
 
-     if (last_len > 2 && !strcmp(last+last_len-2, ".z")) {
 
-       last[last_len-2] = '\0';
 
-       if (compressed_out)
 
-         *compressed_out = 1;
 
-     }
 
-   }
 
-   if (decode_hex) {
 
-     int i;
 
-     char *cp, *d = NULL;
 
-     for (i = 0; i < smartlist_len(fp_tmp); ++i) {
 
-       cp = smartlist_get(fp_tmp, i);
 
-       if (strlen(cp) != HEX_DIGEST_LEN) {
 
-         log_info(LD_DIR,
 
-                  "Skipping digest %s with non-standard length.", escaped(cp));
 
-         smartlist_del_keeporder(fp_tmp, i--);
 
-         goto again;
 
-       }
 
-       d = tor_malloc_zero(DIGEST_LEN);
 
-       if (base16_decode(d, DIGEST_LEN, cp, HEX_DIGEST_LEN)<0) {
 
-         log_info(LD_DIR, "Skipping non-decodable digest %s", escaped(cp));
 
-         smartlist_del_keeporder(fp_tmp, i--);
 
-         goto again;
 
-       }
 
-       smartlist_set(fp_tmp, i, d);
 
-       d = NULL;
 
-     again:
 
-       tor_free(cp);
 
-       tor_free(d);
 
-     }
 
-   }
 
-   if (sort_uniq) {
 
-     smartlist_t *fp_tmp2 = smartlist_create();
 
-     int i;
 
-     if (decode_hex)
 
-       smartlist_sort_digests(fp_tmp);
 
-     else
 
-       smartlist_sort_strings(fp_tmp);
 
-     if (smartlist_len(fp_tmp))
 
-       smartlist_add(fp_tmp2, smartlist_get(fp_tmp, 0));
 
-     for (i = 1; i < smartlist_len(fp_tmp); ++i) {
 
-       char *cp = smartlist_get(fp_tmp, i);
 
-       char *last = smartlist_get(fp_tmp2, smartlist_len(fp_tmp2)-1);
 
-       if ((decode_hex && memcmp(cp, last, DIGEST_LEN))
 
-           || (!decode_hex && strcasecmp(cp, last)))
 
-         smartlist_add(fp_tmp2, cp);
 
-       else
 
-         tor_free(cp);
 
-     }
 
-     smartlist_free(fp_tmp);
 
-     fp_tmp = fp_tmp2;
 
-   }
 
-   smartlist_add_all(fp_out, fp_tmp);
 
-   smartlist_free(fp_tmp);
 
-   return 0;
 
- }
 
 
  |