diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-05-15 08:31:06 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-05-15 08:31:06 +0000 |
commit | 408e4e40532ba164c45bb74530ae0a5f655556e8 (patch) | |
tree | 1e90686db343bfee538d954009570d727fe45d19 | |
parent | 28ce81cd95b3942d30deb45c81fe9f961c4d3d3c (diff) | |
download | gnunet-408e4e40532ba164c45bb74530ae0a5f655556e8.tar.gz gnunet-408e4e40532ba164c45bb74530ae0a5f655556e8.zip |
- missing api changes
-rw-r--r-- | src/include/gnunet_mesh2_service.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/include/gnunet_mesh2_service.h b/src/include/gnunet_mesh2_service.h index f8bc4809c..6ab3f86a0 100644 --- a/src/include/gnunet_mesh2_service.h +++ b/src/include/gnunet_mesh2_service.h | |||
@@ -102,7 +102,6 @@ struct GNUNET_MESH_MessageHandler | |||
102 | * do not have the right size. | 102 | * do not have the right size. |
103 | */ | 103 | */ |
104 | uint16_t expected_size; | 104 | uint16_t expected_size; |
105 | |||
106 | }; | 105 | }; |
107 | 106 | ||
108 | 107 | ||
@@ -117,7 +116,7 @@ struct GNUNET_MESH_MessageHandler | |||
117 | * @param cls closure | 116 | * @param cls closure |
118 | * @param tunnel new handle to the tunnel | 117 | * @param tunnel new handle to the tunnel |
119 | * @param initiator peer that started the tunnel | 118 | * @param initiator peer that started the tunnel |
120 | * @param atsi performance information for the tunnel | 119 | * @param port Port this tunnel is for. |
121 | * @return initial tunnel context for the tunnel | 120 | * @return initial tunnel context for the tunnel |
122 | * (can be NULL -- that's not an error) | 121 | * (can be NULL -- that's not an error) |
123 | */ | 122 | */ |
@@ -127,7 +126,8 @@ typedef void *(GNUNET_MESH_InboundTunnelNotificationHandler) (void *cls, | |||
127 | * tunnel, | 126 | * tunnel, |
128 | const struct | 127 | const struct |
129 | GNUNET_PeerIdentity | 128 | GNUNET_PeerIdentity |
130 | * initiator); | 129 | * initiator, |
130 | uint32_t port); | ||
131 | 131 | ||
132 | 132 | ||
133 | /** | 133 | /** |
@@ -161,6 +161,7 @@ typedef void (GNUNET_MESH_TunnelEndHandler) (void *cls, | |||
161 | * note that the mesh is allowed to drop notifications about | 161 | * note that the mesh is allowed to drop notifications about |
162 | * inbound messages if the client does not process them fast | 162 | * inbound messages if the client does not process them fast |
163 | * enough (for this notification type, a bounded queue is used) | 163 | * enough (for this notification type, a bounded queue is used) |
164 | * @param ports NULL or 0-terminated array of port numbers for incoming tunnels. | ||
164 | * @return handle to the mesh service NULL on error | 165 | * @return handle to the mesh service NULL on error |
165 | * (in this case, init is never called) | 166 | * (in this case, init is never called) |
166 | */ | 167 | */ |
@@ -168,7 +169,8 @@ struct GNUNET_MESH_Handle * | |||
168 | GNUNET_MESH_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, void *cls, | 169 | GNUNET_MESH_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, void *cls, |
169 | GNUNET_MESH_InboundTunnelNotificationHandler new_tunnel, | 170 | GNUNET_MESH_InboundTunnelNotificationHandler new_tunnel, |
170 | GNUNET_MESH_TunnelEndHandler cleaner, | 171 | GNUNET_MESH_TunnelEndHandler cleaner, |
171 | const struct GNUNET_MESH_MessageHandler *handlers); | 172 | const struct GNUNET_MESH_MessageHandler *handlers, |
173 | uint32_t *ports); | ||
172 | 174 | ||
173 | 175 | ||
174 | /** | 176 | /** |
@@ -190,12 +192,14 @@ GNUNET_MESH_disconnect (struct GNUNET_MESH_Handle *handle); | |||
190 | * @param h mesh handle | 192 | * @param h mesh handle |
191 | * @param tunnel_ctx client's tunnel context to associate with the tunnel | 193 | * @param tunnel_ctx client's tunnel context to associate with the tunnel |
192 | * @param peer peer identity the tunnel should go to | 194 | * @param peer peer identity the tunnel should go to |
195 | * @param port Port number. | ||
193 | * @return handle to the tunnel | 196 | * @return handle to the tunnel |
194 | */ | 197 | */ |
195 | struct GNUNET_MESH_Tunnel * | 198 | struct GNUNET_MESH_Tunnel * |
196 | GNUNET_MESH_tunnel_create (struct GNUNET_MESH_Handle *h, | 199 | GNUNET_MESH_tunnel_create (struct GNUNET_MESH_Handle *h, |
197 | void *tunnel_ctx, | 200 | void *tunnel_ctx, |
198 | const struct GNUNET_PeerIdentity *peer); | 201 | const struct GNUNET_PeerIdentity *peer, |
202 | uint32_t port); | ||
199 | 203 | ||
200 | 204 | ||
201 | /** | 205 | /** |