Commit 9bcd93a3 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge remote-tracking branch 'public/bug10063'

parents 8f793c38 761ee93c

src/or/circpathbias.c

0 → 100644
+1537 −0

File added.

Preview size limit exceeded, changes collapsed.

src/or/circpathbias.h

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2001 Matej Pfajfar.

 * Copyright (c) 2001-2004, Roger Dingledine.

 * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.

 * Copyright (c) 2007-2013, The Tor Project, Inc. */

/* See LICENSE for licensing information */



/**

 * \file circuitbuild.h

 * \brief Header file for circuitbuild.c.

 **/



#ifndef TOR_CIRCPATHBIAS_H

#define TOR_CIRCPATHBIAS_H



double pathbias_get_extreme_rate(const or_options_t *options);

double pathbias_get_extreme_use_rate(const or_options_t *options);

int pathbias_get_dropguards(const or_options_t *options);

void pathbias_count_timeout(origin_circuit_t *circ);

void pathbias_count_build_success(origin_circuit_t *circ);

int pathbias_count_build_attempt(origin_circuit_t *circ);

int pathbias_check_close(origin_circuit_t *circ, int reason);

int pathbias_check_probe_response(circuit_t *circ, const cell_t *cell);

void pathbias_count_use_attempt(origin_circuit_t *circ);

void pathbias_mark_use_success(origin_circuit_t *circ);

void pathbias_mark_use_rollback(origin_circuit_t *circ);

const char *pathbias_state_to_string(path_state_t state);



#endif

src/or/circuitbuild.c

+1 −1519

File changed.

Preview size limit exceeded, changes collapsed.

src/or/circuitbuild.h

+0 −10
Original line number Diff line number Diff line
@@ -57,16 +57,6 @@ const char *build_state_get_exit_nickname(cpath_build_state_t *state); 


const node_t *choose_good_entry_server(uint8_t purpose,

                                       cpath_build_state_t *state);

double pathbias_get_extreme_rate(const or_options_t *options);

double pathbias_get_extreme_use_rate(const or_options_t *options);

int pathbias_get_dropguards(const or_options_t *options);

void pathbias_count_timeout(origin_circuit_t *circ);

int pathbias_check_close(origin_circuit_t *circ, int reason);

int pathbias_check_probe_response(circuit_t *circ, const cell_t *cell);

void pathbias_count_use_attempt(origin_circuit_t *circ);

void pathbias_mark_use_success(origin_circuit_t *circ);

void pathbias_mark_use_rollback(origin_circuit_t *circ);

const char *pathbias_state_to_string(path_state_t state);



#endif

src/or/circuitlist.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#define CIRCUITLIST_PRIVATE

#include "or.h"

#include "channel.h"

#include "circpathbias.h"

#include "circuitbuild.h"

#include "circuitlist.h"

#include "circuituse.h"