diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-08-13 11:12:47 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-08-13 11:12:47 +0000 |
commit | 1d39a4da8d582754858266cac8ce1066efd37879 (patch) | |
tree | f9a8cdb4851a22dc343e391e9716a44dc9e7b309 | |
parent | b5cd8634eec7e85f75e1889da0020a67f6ac2319 (diff) | |
download | gnunet-1d39a4da8d582754858266cac8ce1066efd37879.tar.gz gnunet-1d39a4da8d582754858266cac8ce1066efd37879.zip |
- update debug info
-rw-r--r-- | src/include/gnunet_protocols.h | 4 | ||||
-rw-r--r-- | src/mesh/mesh_common.c | 28 |
2 files changed, 21 insertions, 11 deletions
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h index 76655b697..1ad62f5a4 100644 --- a/src/include/gnunet_protocols.h +++ b/src/include/gnunet_protocols.h | |||
@@ -868,13 +868,13 @@ extern "C" | |||
868 | /** | 868 | /** |
869 | * Ask the mesh service to create a new tunnel | 869 | * Ask the mesh service to create a new tunnel |
870 | */ | 870 | */ |
871 | #define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_CREATE 273 | 871 | #define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_CREATE 273 |
872 | #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE 273 | 872 | #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE 273 |
873 | 873 | ||
874 | /** | 874 | /** |
875 | * Ask the mesh service to destroy a tunnel | 875 | * Ask the mesh service to destroy a tunnel |
876 | */ | 876 | */ |
877 | #define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY 274 | 877 | #define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY 274 |
878 | #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY 274 | 878 | #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY 274 |
879 | 879 | ||
880 | /** | 880 | /** |
diff --git a/src/mesh/mesh_common.c b/src/mesh/mesh_common.c index 106555ad8..56b669efc 100644 --- a/src/mesh/mesh_common.c +++ b/src/mesh/mesh_common.c | |||
@@ -30,8 +30,8 @@ | |||
30 | int | 30 | int |
31 | GMC_is_pid_bigger (uint32_t bigger, uint32_t smaller) | 31 | GMC_is_pid_bigger (uint32_t bigger, uint32_t smaller) |
32 | { | 32 | { |
33 | return (GNUNET_YES == PID_OVERFLOW(smaller, bigger) || | 33 | return (GNUNET_YES == PID_OVERFLOW (smaller, bigger) || |
34 | (bigger > smaller && GNUNET_NO == PID_OVERFLOW(bigger, smaller))); | 34 | (bigger > smaller && GNUNET_NO == PID_OVERFLOW (bigger, smaller))); |
35 | } | 35 | } |
36 | 36 | ||
37 | 37 | ||
@@ -63,17 +63,17 @@ GNUNET_MESH_DEBUG_M2S (uint16_t m) | |||
63 | /** | 63 | /** |
64 | * Request the creation of a path | 64 | * Request the creation of a path |
65 | */ | 65 | */ |
66 | case 256: return "GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE"; | 66 | case 256: return "GNUNET_MESSAGE_TYPE_MESH_CONNECTION_CREATE"; |
67 | 67 | ||
68 | /** | 68 | /** |
69 | * Request the modification of an existing path | 69 | * Request the modification of an existing path |
70 | */ | 70 | */ |
71 | case 257: return "GNUNET_MESSAGE_TYPE_MESH_PATH_ACK"; | 71 | case 257: return "GNUNET_MESSAGE_TYPE_MESH_CONNECTION_ACK"; |
72 | 72 | ||
73 | /** | 73 | /** |
74 | * Notify that a connection of a path is no longer valid | 74 | * Notify that a connection of a path is no longer valid |
75 | */ | 75 | */ |
76 | case 258: return "GNUNET_MESSAGE_TYPE_MESH_PATH_BROKEN"; | 76 | case 258: return "GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN"; |
77 | 77 | ||
78 | /** | 78 | /** |
79 | * At some point, the route will spontaneously change | 79 | * At some point, the route will spontaneously change |
@@ -103,7 +103,7 @@ GNUNET_MESH_DEBUG_M2S (uint16_t m) | |||
103 | /** | 103 | /** |
104 | * Request the destuction of a path | 104 | * Request the destuction of a path |
105 | */ | 105 | */ |
106 | case 266: return "GNUNET_MESSAGE_TYPE_MESH_PATH_DESTROY"; | 106 | case 266: return "GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY"; |
107 | 107 | ||
108 | /** | 108 | /** |
109 | * Request the destruction of a whole tunnel | 109 | * Request the destruction of a whole tunnel |
@@ -138,17 +138,27 @@ GNUNET_MESH_DEBUG_M2S (uint16_t m) | |||
138 | /** | 138 | /** |
139 | * Ask the mesh service to create a new tunnel | 139 | * Ask the mesh service to create a new tunnel |
140 | */ | 140 | */ |
141 | case 273: return "GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE"; | 141 | case 273: return "GNUNET_MESSAGE_TYPE_MESH_CHANNEL_CREATE"; |
142 | 142 | ||
143 | /** | 143 | /** |
144 | * Ask the mesh service to destroy a tunnel | 144 | * Ask the mesh service to destroy a tunnel |
145 | */ | 145 | */ |
146 | case 274: return "GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY"; | 146 | case 274: return "GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY"; |
147 | |||
148 | /** | ||
149 | * Ask the mesh service to create a new tunnel | ||
150 | */ | ||
151 | case 280: return "GNUNET_MESSAGE_TYPE_MESH_FWD"; | ||
152 | |||
153 | /** | ||
154 | * Ask the mesh service to destroy a tunnel | ||
155 | */ | ||
156 | case 281: return "GNUNET_MESSAGE_TYPE_MESH_BCK"; | ||
147 | 157 | ||
148 | /** | 158 | /** |
149 | * Local payload traffic | 159 | * Local payload traffic |
150 | */ | 160 | */ |
151 | case 275: return "GNUNET_MESSAGE_TYPE_MESH_LOCAL_DATA"; | 161 | case 285: return "GNUNET_MESSAGE_TYPE_MESH_LOCAL_DATA"; |
152 | 162 | ||
153 | /** | 163 | /** |
154 | * Local ACK for data. | 164 | * Local ACK for data. |