diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2014-03-26 14:59:36 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2014-03-26 14:59:36 +0000 |
commit | adbb8b5d9635d110f0ee116efa4d9a22d16dfd71 (patch) | |
tree | 3f664fe1b33402fb6a4f844a902c065cbd1c95b4 /src/include/gnunet_transport_service.h | |
parent | c62fc947fac80856859ee2969616285d40c4682c (diff) | |
download | gnunet-adbb8b5d9635d110f0ee116efa4d9a22d16dfd71.tar.gz gnunet-adbb8b5d9635d110f0ee116efa4d9a22d16dfd71.zip |
remove CONNECT_SWITCHING_BLACKLIST state
Diffstat (limited to 'src/include/gnunet_transport_service.h')
-rw-r--r-- | src/include/gnunet_transport_service.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h index 0f231b0ea..82c21d2b8 100644 --- a/src/include/gnunet_transport_service.h +++ b/src/include/gnunet_transport_service.h | |||
@@ -119,12 +119,6 @@ enum GNUNET_TRANSPORT_PeerState | |||
119 | GNUNET_TRANSPORT_PS_INIT_ATS, | 119 | GNUNET_TRANSPORT_PS_INIT_ATS, |
120 | 120 | ||
121 | /** | 121 | /** |
122 | * Asked to initiate connection, trying to get address approved | ||
123 | * by blacklist. | ||
124 | */ | ||
125 | GNUNET_TRANSPORT_PS_INIT_BLACKLIST, | ||
126 | |||
127 | /** | ||
128 | * Sent CONNECT message to other peer, waiting for CONNECT_ACK | 122 | * Sent CONNECT message to other peer, waiting for CONNECT_ACK |
129 | */ | 123 | */ |
130 | GNUNET_TRANSPORT_PS_CONNECT_SENT, | 124 | GNUNET_TRANSPORT_PS_CONNECT_SENT, |
@@ -135,11 +129,6 @@ enum GNUNET_TRANSPORT_PeerState | |||
135 | GNUNET_TRANSPORT_PS_CONNECT_RECV_ATS, | 129 | GNUNET_TRANSPORT_PS_CONNECT_RECV_ATS, |
136 | 130 | ||
137 | /** | 131 | /** |
138 | * Received CONNECT from other peer, got an address, checking with blacklist. | ||
139 | */ | ||
140 | GNUNET_TRANSPORT_PS_CONNECT_RECV_BLACKLIST, | ||
141 | |||
142 | /** | ||
143 | * CONNECT request from other peer was SESSION_ACK'ed, waiting for | 132 | * CONNECT request from other peer was SESSION_ACK'ed, waiting for |
144 | * SESSION_ACK. | 133 | * SESSION_ACK. |
145 | */ | 134 | */ |
@@ -157,12 +146,6 @@ enum GNUNET_TRANSPORT_PeerState | |||
157 | GNUNET_TRANSPORT_PS_RECONNECT_ATS, | 146 | GNUNET_TRANSPORT_PS_RECONNECT_ATS, |
158 | 147 | ||
159 | /** | 148 | /** |
160 | * Connection got into trouble, rest of the system still believes | ||
161 | * it to be up; we are checking the new address against the blacklist. | ||
162 | */ | ||
163 | GNUNET_TRANSPORT_PS_RECONNECT_BLACKLIST, | ||
164 | |||
165 | /** | ||
166 | * Sent CONNECT over new address (either by ATS telling us to switch | 149 | * Sent CONNECT over new address (either by ATS telling us to switch |
167 | * addresses or from RECONNECT_ATS); if this fails, we need to tell | 150 | * addresses or from RECONNECT_ATS); if this fails, we need to tell |
168 | * the rest of the system about a disconnect. | 151 | * the rest of the system about a disconnect. |
@@ -171,13 +154,6 @@ enum GNUNET_TRANSPORT_PeerState | |||
171 | 154 | ||
172 | /** | 155 | /** |
173 | * We have some primary connection, but ATS suggested we switch | 156 | * We have some primary connection, but ATS suggested we switch |
174 | * to some alternative; we're now checking the alternative against | ||
175 | * the blacklist. | ||
176 | */ | ||
177 | GNUNET_TRANSPORT_PS_CONNECTED_SWITCHING_BLACKLIST, | ||
178 | |||
179 | /** | ||
180 | * We have some primary connection, but ATS suggested we switch | ||
181 | * to some alternative; we now sent a CONNECT message for the | 157 | * to some alternative; we now sent a CONNECT message for the |
182 | * alternative session to the other peer and waiting for a | 158 | * alternative session to the other peer and waiting for a |
183 | * CONNECT_ACK to make this our primary connection. | 159 | * CONNECT_ACK to make this our primary connection. |