diff options
| author | Taylor Yu <catalyst@torproject.org> | 2019-03-20 20:51:12 -0500 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-03-25 14:13:45 +1000 |
| commit | 5d2f5e482e9985ad00f517ac3725b2336fbb930b (patch) | |
| tree | eb5d8503585e62543e240e8c97079cf5d15dec9d /src/core/or/or_connection_st.h | |
| parent | ebc7556dd0af1b7cc3e12ecc04d1db567d348b2e (diff) | |
| download | tor-5d2f5e482e9985ad00f517ac3725b2336fbb930b.tar.gz tor-5d2f5e482e9985ad00f517ac3725b2336fbb930b.zip | |
Correctly report PT vs proxy during bootstrap
Previously, or_connection_t did not record whether or not the
connection uses a pluggable transport. Instead, it stored the
underlying proxy protocol of the pluggable transport in
proxy_type. This made bootstrap reporting treat pluggable transport
connections as plain proxy connections.
Store a separate bit indicating whether a pluggable transport is in
use, and decode this during bootstrap reporting.
Fixes bug 28925; bugfix on 0.4.0.1-alpha.
Diffstat (limited to 'src/core/or/or_connection_st.h')
| -rw-r--r-- | src/core/or/or_connection_st.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/or/or_connection_st.h b/src/core/or/or_connection_st.h index d5db5e8694..a5ce844bff 100644 --- a/src/core/or/or_connection_st.h +++ b/src/core/or/or_connection_st.h @@ -67,6 +67,8 @@ struct or_connection_t { * geoip cache and handled by the DoS mitigation subsystem. We use this to * insure we have a coherent count of concurrent connection. */ unsigned int tracked_for_dos_mitigation : 1; + /** True iff this connection is using a pluggable transport */ + unsigned int is_pt : 1; uint16_t link_proto; /**< What protocol version are we using? 0 for * "none negotiated yet." */ |