aboutsummaryrefslogtreecommitdiff
path: root/src/include/gnunet_transport_service.h
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2014-01-09 13:31:21 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2014-01-09 13:31:21 +0000
commit2ed861d67db2ffdf22bda9b873c64e5f8782cf8e (patch)
tree59e59ea647a971d2e553ac06ea5a275985c78568 /src/include/gnunet_transport_service.h
parent957037e37439b9378b1242270530db95b06a458c (diff)
downloadgnunet-2ed861d67db2ffdf22bda9b873c64e5f8782cf8e.tar.gz
gnunet-2ed861d67db2ffdf22bda9b873c64e5f8782cf8e.zip
renaming states according to naming convenations
Diffstat (limited to 'src/include/gnunet_transport_service.h')
-rw-r--r--src/include/gnunet_transport_service.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h
index 2c6cc2461..a38a7ac69 100644
--- a/src/include/gnunet_transport_service.h
+++ b/src/include/gnunet_transport_service.h
@@ -110,75 +110,75 @@ enum GNUNET_TRANSPORT_PeerState
110 /** 110 /**
111 * fresh peer or completely disconnected 111 * fresh peer or completely disconnected
112 */ 112 */
113 S_NOT_CONNECTED = 0, 113 GNUNET_TRANSPORT_NOT_CONNECTED = 0,
114 114
115 /** 115 /**
116 * Asked to initiate connection, trying to get address from ATS 116 * Asked to initiate connection, trying to get address from ATS
117 */ 117 */
118 S_INIT_ATS, 118 GNUNET_TRANSPORT_INIT_ATS,
119 119
120 /** 120 /**
121 * Asked to initiate connection, trying to get address approved 121 * Asked to initiate connection, trying to get address approved
122 * by blacklist. 122 * by blacklist.
123 */ 123 */
124 S_INIT_BLACKLIST, 124 GNUNET_TRANSPORT_INIT_BLACKLIST,
125 125
126 /** 126 /**
127 * Sent CONNECT message to other peer, waiting for CONNECT_ACK 127 * Sent CONNECT message to other peer, waiting for CONNECT_ACK
128 */ 128 */
129 S_CONNECT_SENT, 129 GNUNET_TRANSPORT_CONNECT_SENT,
130 130
131 /** 131 /**
132 * Received a CONNECT, do a blacklist check for inbound address 132 * Received a CONNECT, do a blacklist check for inbound address
133 */ 133 */
134 S_CONNECT_RECV_BLACKLIST_INBOUND, 134 GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST_INBOUND,
135 135
136 /** 136 /**
137 * Received a CONNECT, asking ATS about address suggestions. 137 * Received a CONNECT, asking ATS about address suggestions.
138 */ 138 */
139 S_CONNECT_RECV_ATS, 139 GNUNET_TRANSPORT_CONNECT_RECV_ATS,
140 140
141 /** 141 /**
142 * Received CONNECT from other peer, got an address, checking with blacklist. 142 * Received CONNECT from other peer, got an address, checking with blacklist.
143 */ 143 */
144 S_CONNECT_RECV_BLACKLIST, 144 GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST,
145 145
146 /** 146 /**
147 * CONNECT request from other peer was SESSION_ACK'ed, waiting for 147 * CONNECT request from other peer was SESSION_ACK'ed, waiting for
148 * SESSION_ACK. 148 * SESSION_ACK.
149 */ 149 */
150 S_CONNECT_RECV_ACK, 150 GNUNET_TRANSPORT_CONNECT_RECV_ACK,
151 151
152 /** 152 /**
153 * Got our CONNECT_ACK/SESSION_ACK, connection is up. 153 * Got our CONNECT_ACK/SESSION_ACK, connection is up.
154 */ 154 */
155 S_CONNECTED, 155 GNUNET_TRANSPORT_CONNECTED,
156 156
157 /** 157 /**
158 * Connection got into trouble, rest of the system still believes 158 * Connection got into trouble, rest of the system still believes
159 * it to be up, but we're getting a new address from ATS. 159 * it to be up, but we're getting a new address from ATS.
160 */ 160 */
161 S_RECONNECT_ATS, 161 GNUNET_TRANSPORT_RECONNECT_ATS,
162 162
163 /** 163 /**
164 * Connection got into trouble, rest of the system still believes 164 * Connection got into trouble, rest of the system still believes
165 * it to be up; we are checking the new address against the blacklist. 165 * it to be up; we are checking the new address against the blacklist.
166 */ 166 */
167 S_RECONNECT_BLACKLIST, 167 GNUNET_TRANSPORT_RECONNECT_BLACKLIST,
168 168
169 /** 169 /**
170 * Sent CONNECT over new address (either by ATS telling us to switch 170 * Sent CONNECT over new address (either by ATS telling us to switch
171 * addresses or from RECONNECT_ATS); if this fails, we need to tell 171 * addresses or from RECONNECT_ATS); if this fails, we need to tell
172 * the rest of the system about a disconnect. 172 * the rest of the system about a disconnect.
173 */ 173 */
174 S_RECONNECT_SENT, 174 GNUNET_TRANSPORT_RECONNECT_SENT,
175 175
176 /** 176 /**
177 * We have some primary connection, but ATS suggested we switch 177 * We have some primary connection, but ATS suggested we switch
178 * to some alternative; we're now checking the alternative against 178 * to some alternative; we're now checking the alternative against
179 * the blacklist. 179 * the blacklist.
180 */ 180 */
181 S_CONNECTED_SWITCHING_BLACKLIST, 181 GNUNET_TRANSPORT_CONNECTED_SWITCHING_BLACKLIST,
182 182
183 /** 183 /**
184 * We have some primary connection, but ATS suggested we switch 184 * We have some primary connection, but ATS suggested we switch
@@ -186,13 +186,13 @@ enum GNUNET_TRANSPORT_PeerState
186 * alternative session to the other peer and waiting for a 186 * alternative session to the other peer and waiting for a
187 * CONNECT_ACK to make this our primary connection. 187 * CONNECT_ACK to make this our primary connection.
188 */ 188 */
189 S_CONNECTED_SWITCHING_CONNECT_SENT, 189 GNUNET_TRANSPORT_CONNECTED_SWITCHING_CONNECT_SENT,
190 190
191 /** 191 /**
192 * Disconnect in progress (we're sending the DISCONNECT message to the 192 * Disconnect in progress (we're sending the DISCONNECT message to the
193 * other peer; after that is finished, the state will be cleaned up). 193 * other peer; after that is finished, the state will be cleaned up).
194 */ 194 */
195 S_DISCONNECT, 195 GNUNET_TRANSPORT_DISCONNECT,
196 196
197 /** 197 /**
198 * We're finished with the disconnect; and are cleaning up the state 198 * We're finished with the disconnect; and are cleaning up the state
@@ -203,7 +203,7 @@ enum GNUNET_TRANSPORT_PeerState
203 * in this state virtually always means using memory that has been 203 * in this state virtually always means using memory that has been
204 * freed (the exception being the cleanup code in #free_neighbour()). 204 * freed (the exception being the cleanup code in #free_neighbour()).
205 */ 205 */
206 S_DISCONNECT_FINISHED 206 GNUNET_TRANSPORT_DISCONNECT_FINISHED
207}; 207};
208 208
209 209