diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-07-18 00:44:39 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-07-18 00:44:39 +0200 |
commit | 7f4ddbcab8598e3d5e29c23ce883cdfa664408f1 (patch) | |
tree | 5f1b18463f641f24fad519e0aefb60b97d707b52 /src/cadet/gnunet-service-cadet.c | |
parent | 28ab2c446fba4980a8295d59fdf203a028a35dd6 (diff) | |
download | gnunet-7f4ddbcab8598e3d5e29c23ce883cdfa664408f1.tar.gz gnunet-7f4ddbcab8598e3d5e29c23ce883cdfa664408f1.zip |
merge flags into enum for GNUNET_DISK_pipe() API, fixing #6188
Diffstat (limited to 'src/cadet/gnunet-service-cadet.c')
-rw-r--r-- | src/cadet/gnunet-service-cadet.c | 100 |
1 files changed, 51 insertions, 49 deletions
diff --git a/src/cadet/gnunet-service-cadet.c b/src/cadet/gnunet-service-cadet.c index f3767fb01..2d3b548dd 100644 --- a/src/cadet/gnunet-service-cadet.c +++ b/src/cadet/gnunet-service-cadet.c | |||
@@ -1010,6 +1010,7 @@ handle_info_tunnels (void *cls, | |||
1010 | GNUNET_SERVICE_client_continue (c->client); | 1010 | GNUNET_SERVICE_client_continue (c->client); |
1011 | } | 1011 | } |
1012 | 1012 | ||
1013 | |||
1013 | /** | 1014 | /** |
1014 | * Handler for client's #GNUNET_MESSAGE_TYPE_CADET_DROP_CADET_MESSAGE request. | 1015 | * Handler for client's #GNUNET_MESSAGE_TYPE_CADET_DROP_CADET_MESSAGE request. |
1015 | * | 1016 | * |
@@ -1026,11 +1027,12 @@ handle_drop_message (void *cls, | |||
1026 | ch = lookup_channel (c, | 1027 | ch = lookup_channel (c, |
1027 | message->ccn); | 1028 | message->ccn); |
1028 | 1029 | ||
1029 | GCCH_assign_type_to_drop(ch, message); | 1030 | GCCH_assign_type_to_drop (ch, message); |
1030 | 1031 | ||
1031 | GNUNET_SERVICE_client_continue (c->client); | 1032 | GNUNET_SERVICE_client_continue (c->client); |
1032 | } | 1033 | } |
1033 | 1034 | ||
1035 | |||
1034 | /** | 1036 | /** |
1035 | * Callback called when a client connects to the service. | 1037 | * Callback called when a client connects to the service. |
1036 | * | 1038 | * |
@@ -1327,52 +1329,52 @@ run (void *cls, | |||
1327 | * Define "main" method using service macro. | 1329 | * Define "main" method using service macro. |
1328 | */ | 1330 | */ |
1329 | GNUNET_SERVICE_MAIN | 1331 | GNUNET_SERVICE_MAIN |
1330 | ("cadet", | 1332 | ("cadet", |
1331 | GNUNET_SERVICE_OPTION_NONE, | 1333 | GNUNET_SERVICE_OPTION_NONE, |
1332 | &run, | 1334 | &run, |
1333 | &client_connect_cb, | 1335 | &client_connect_cb, |
1334 | &client_disconnect_cb, | 1336 | &client_disconnect_cb, |
1335 | NULL, | 1337 | NULL, |
1336 | GNUNET_MQ_hd_fixed_size (port_open, | 1338 | GNUNET_MQ_hd_fixed_size (port_open, |
1337 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_PORT_OPEN, | 1339 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_PORT_OPEN, |
1338 | struct GNUNET_CADET_PortMessage, | 1340 | struct GNUNET_CADET_PortMessage, |
1339 | NULL), | 1341 | NULL), |
1340 | GNUNET_MQ_hd_fixed_size (port_close, | 1342 | GNUNET_MQ_hd_fixed_size (port_close, |
1341 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_PORT_CLOSE, | 1343 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_PORT_CLOSE, |
1342 | struct GNUNET_CADET_PortMessage, | 1344 | struct GNUNET_CADET_PortMessage, |
1343 | NULL), | 1345 | NULL), |
1344 | GNUNET_MQ_hd_fixed_size (channel_create, | 1346 | GNUNET_MQ_hd_fixed_size (channel_create, |
1345 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_CREATE, | 1347 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_CREATE, |
1346 | struct GNUNET_CADET_LocalChannelCreateMessage, | 1348 | struct GNUNET_CADET_LocalChannelCreateMessage, |
1347 | NULL), | 1349 | NULL), |
1348 | GNUNET_MQ_hd_fixed_size (channel_destroy, | 1350 | GNUNET_MQ_hd_fixed_size (channel_destroy, |
1349 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_DESTROY, | 1351 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_DESTROY, |
1350 | struct GNUNET_CADET_LocalChannelDestroyMessage, | 1352 | struct GNUNET_CADET_LocalChannelDestroyMessage, |
1351 | NULL), | 1353 | NULL), |
1352 | GNUNET_MQ_hd_var_size (local_data, | 1354 | GNUNET_MQ_hd_var_size (local_data, |
1353 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_DATA, | 1355 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_DATA, |
1354 | struct GNUNET_CADET_LocalData, | 1356 | struct GNUNET_CADET_LocalData, |
1355 | NULL), | 1357 | NULL), |
1356 | GNUNET_MQ_hd_fixed_size (local_ack, | 1358 | GNUNET_MQ_hd_fixed_size (local_ack, |
1357 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_ACK, | 1359 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_ACK, |
1358 | struct GNUNET_CADET_LocalAck, | 1360 | struct GNUNET_CADET_LocalAck, |
1359 | NULL), | 1361 | NULL), |
1360 | GNUNET_MQ_hd_fixed_size (get_peers, | 1362 | GNUNET_MQ_hd_fixed_size (get_peers, |
1361 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_REQUEST_INFO_PEERS, | 1363 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_REQUEST_INFO_PEERS, |
1362 | struct GNUNET_MessageHeader, | 1364 | struct GNUNET_MessageHeader, |
1363 | NULL), | 1365 | NULL), |
1364 | GNUNET_MQ_hd_fixed_size (show_path, | 1366 | GNUNET_MQ_hd_fixed_size (show_path, |
1365 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_REQUEST_INFO_PATH, | 1367 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_REQUEST_INFO_PATH, |
1366 | struct GNUNET_CADET_RequestPathInfoMessage, | 1368 | struct GNUNET_CADET_RequestPathInfoMessage, |
1367 | NULL), | 1369 | NULL), |
1368 | GNUNET_MQ_hd_fixed_size (info_tunnels, | 1370 | GNUNET_MQ_hd_fixed_size (info_tunnels, |
1369 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_REQUEST_INFO_TUNNELS, | 1371 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_REQUEST_INFO_TUNNELS, |
1370 | struct GNUNET_MessageHeader, | 1372 | struct GNUNET_MessageHeader, |
1371 | NULL), | 1373 | NULL), |
1372 | GNUNET_MQ_hd_fixed_size (drop_message, | 1374 | GNUNET_MQ_hd_fixed_size (drop_message, |
1373 | GNUNET_MESSAGE_TYPE_CADET_DROP_CADET_MESSAGE, | 1375 | GNUNET_MESSAGE_TYPE_CADET_DROP_CADET_MESSAGE, |
1374 | struct GNUNET_CADET_RequestDropCadetMessage, | 1376 | struct GNUNET_CADET_RequestDropCadetMessage, |
1375 | NULL), | 1377 | NULL), |
1376 | GNUNET_MQ_handler_end ()); | 1378 | GNUNET_MQ_handler_end ()); |
1377 | 1379 | ||
1378 | /* end of gnunet-service-cadet-new.c */ | 1380 | /* end of gnunet-service-cadet-new.c */ |