diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-05-08 16:51:49 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-05-08 16:51:49 +0000 |
commit | d9a2991164d5cf154466a76e4ab5629643f7e821 (patch) | |
tree | a7cd81ccbbdee002897f8f82b4450b83b0f0cad1 | |
parent | 3dc32590513ccf54a8d1ab51eb0a5376e9c56413 (diff) | |
download | gnunet-d9a2991164d5cf154466a76e4ab5629643f7e821.tar.gz gnunet-d9a2991164d5cf154466a76e4ab5629643f7e821.zip |
- remove remaining regex code
-rw-r--r-- | src/mesh/gnunet-service-mesh-new.c | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/src/mesh/gnunet-service-mesh-new.c b/src/mesh/gnunet-service-mesh-new.c index 205830281..09e5b73ce 100644 --- a/src/mesh/gnunet-service-mesh-new.c +++ b/src/mesh/gnunet-service-mesh-new.c | |||
@@ -52,11 +52,9 @@ | |||
52 | #include "block_mesh.h" | 52 | #include "block_mesh.h" |
53 | #include "gnunet_dht_service.h" | 53 | #include "gnunet_dht_service.h" |
54 | #include "gnunet_statistics_service.h" | 54 | #include "gnunet_statistics_service.h" |
55 | #include "gnunet_regex_lib.h" | ||
56 | 55 | ||
57 | #define MESH_BLOOM_SIZE 128 | 56 | #define MESH_BLOOM_SIZE 128 |
58 | 57 | ||
59 | #define MESH_DEBUG_REGEX GNUNET_YES | ||
60 | #define MESH_DEBUG_DHT GNUNET_NO | 58 | #define MESH_DEBUG_DHT GNUNET_NO |
61 | #define MESH_DEBUG_CONNECTION GNUNET_NO | 59 | #define MESH_DEBUG_CONNECTION GNUNET_NO |
62 | #define MESH_DEBUG_TIMING __LINUX__ && GNUNET_NO | 60 | #define MESH_DEBUG_TIMING __LINUX__ && GNUNET_NO |
@@ -77,12 +75,6 @@ | |||
77 | #define DEBUG_DHT(...) | 75 | #define DEBUG_DHT(...) |
78 | #endif | 76 | #endif |
79 | 77 | ||
80 | #if MESH_DEBUG_REGEX | ||
81 | #define DEBUG_REGEX(...) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__) | ||
82 | #else | ||
83 | #define DEBUG_REGEX(...) | ||
84 | #endif | ||
85 | |||
86 | #if MESH_DEBUG_TIMING | 78 | #if MESH_DEBUG_TIMING |
87 | #include <time.h> | 79 | #include <time.h> |
88 | double __sum; | 80 | double __sum; |
@@ -181,79 +173,6 @@ struct MeshPeerQueue | |||
181 | 173 | ||
182 | 174 | ||
183 | /** | 175 | /** |
184 | * Struct to store regex information announced by clients. | ||
185 | */ | ||
186 | struct MeshRegexDescriptor | ||
187 | { | ||
188 | /** | ||
189 | * Regular expression itself. | ||
190 | */ | ||
191 | char *regex; | ||
192 | |||
193 | /** | ||
194 | * How many characters per edge can we squeeze? | ||
195 | */ | ||
196 | uint16_t compression; | ||
197 | |||
198 | /** | ||
199 | * Handle to announce the regex. | ||
200 | */ | ||
201 | struct GNUNET_REGEX_announce_handle *h; | ||
202 | }; | ||
203 | |||
204 | |||
205 | /** | ||
206 | * Struct to keep information of searches of services described by a regex | ||
207 | * using a user-provided string service description. | ||
208 | */ | ||
209 | struct MeshRegexSearchInfo | ||
210 | { | ||
211 | /** | ||
212 | * Which tunnel is this for | ||
213 | */ | ||
214 | struct MeshTunnel *t; | ||
215 | |||
216 | /** | ||
217 | * User provided description of the searched service. | ||
218 | */ | ||
219 | char *description; | ||
220 | |||
221 | /** | ||
222 | * Regex search handle. | ||
223 | */ | ||
224 | struct GNUNET_REGEX_search_handle *search_handle; | ||
225 | |||
226 | /** | ||
227 | * Peer that is connecting via connect_by_string. When connected, free ctx. | ||
228 | */ | ||
229 | GNUNET_PEER_Id peer; | ||
230 | |||
231 | /** | ||
232 | * Other peers that are found but not yet being connected to. | ||
233 | */ | ||
234 | GNUNET_PEER_Id *peers; | ||
235 | |||
236 | /** | ||
237 | * Number of elements in peers. | ||
238 | */ | ||
239 | unsigned int n_peers; | ||
240 | |||
241 | /** | ||
242 | * Next peer to try to connect to. | ||
243 | */ | ||
244 | unsigned int i_peer; | ||
245 | |||
246 | /** | ||
247 | * Timeout for a connect attempt. | ||
248 | * When reached, try to connect to a different peer, if any. If not, | ||
249 | * try the same peer again. | ||
250 | */ | ||
251 | GNUNET_SCHEDULER_TaskIdentifier timeout; | ||
252 | |||
253 | }; | ||
254 | |||
255 | |||
256 | /** | ||
257 | * Struct containing all info possibly needed to build a package when called | 176 | * Struct containing all info possibly needed to build a package when called |
258 | * back by core. | 177 | * back by core. |
259 | */ | 178 | */ |