Ticket #9665: 0002-Fix-bug9665.patch

File 0002-Fix-bug9665.patch, 1.7 KB (added by fabio, 6 years ago)

Reworked patch

  • src/or/connection_or.c

    From 99a660ccb48c20afeb8bacedb8df129073639d0c Mon Sep 17 00:00:00 2001
    From: =?UTF-8?q?F=C3=A1bio=20J=2E=20Bertinatto?= <fabiojrb@gmail.com>
    Date: Wed, 6 Nov 2013 21:16:33 -0200
    Subject: [PATCH] Fix bug9665
    
    ---
     src/or/connection_or.c | 5 +++++
     src/or/entrynodes.c    | 8 ++++++++
     2 files changed, 13 insertions(+)
    
    diff --git a/src/or/connection_or.c b/src/or/connection_or.c
    index 089de93..220e48b 100644
    a b connection_or_connect(const tor_addr_t *_addr, uint16_t port, 
    11891189               "your pluggable transport proxy stopped running.",
    11901190               fmt_addrport(&TO_CONN(conn)->addr, TO_CONN(conn)->port),
    11911191               transport_name, transport_name);
     1192
     1193      control_event_bootstrap_problem(
     1194                                "Can't connect to bridge",
     1195                                END_OR_CONN_REASON_NO_ROUTE);
     1196
    11921197    } else {
    11931198      log_warn(LD_GENERAL, "Tried to connect to '%s' through a proxy, but "
    11941199               "the proxy address could not be found.",
  • src/or/entrynodes.c

    diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
    index ebbd85c..c09fa34 100644
    a b fetch_bridge_descriptors(const or_options_t *options, time_t now) 
    20752075        directory_get_from_dirserver(DIR_PURPOSE_FETCH_SERVERDESC,
    20762076                ROUTER_PURPOSE_BRIDGE, resource, 0);
    20772077      }
     2078       
     2079        if (bridge_sl_len >= bridge_sl_idx + 1) {
     2080          log_warn(LD_GENERAL, "All configured bridges are unusable");
     2081 
     2082          control_event_bootstrap_problem(
     2083                  "All configured bridges are unusable",
     2084                  END_OR_CONN_REASON_NO_ROUTE);
     2085        }
    20782086    }
    20792087  SMARTLIST_FOREACH_END(bridge);
    20802088}