projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-consistently use struct GNUNET_HashCode
[oweals/gnunet.git]
/
src
/
fs
/
gnunet-service-fs_lc.c
diff --git
a/src/fs/gnunet-service-fs_lc.c
b/src/fs/gnunet-service-fs_lc.c
index 36aafdde9dd6fbc4dbdee73dd2fcf42d2a7a3a27..f3b18256b1b1e320ee333c6c559097d084c2c607 100644
(file)
--- a/
src/fs/gnunet-service-fs_lc.c
+++ b/
src/fs/gnunet-service-fs_lc.c
@@
-140,7
+140,7
@@
struct GSF_LocalClient
/**
* Context for sending replies.
*/
/**
* Context for sending replies.
*/
- struct GNUNET_
CONNECTION
_TransmitHandle *th;
+ struct GNUNET_
SERVER
_TransmitHandle *th;
};
};
@@
-259,7
+259,7
@@
client_response_handler (void *cls, enum GNUNET_BLOCK_EvaluationResult eval,
lc = cr->lc;
msize = sizeof (struct ClientPutMessage) + data_len;
{
lc = cr->lc;
msize = sizeof (struct ClientPutMessage) + data_len;
{
- char buf[msize];
+ char buf[msize]
GNUNET_ALIGN
;
pm = (struct ClientPutMessage *) buf;
pm->header.type = htons (GNUNET_MESSAGE_TYPE_FS_PUT);
pm = (struct ClientPutMessage *) buf;
pm->header.type = htons (GNUNET_MESSAGE_TYPE_FS_PUT);
@@
-299,7
+299,7
@@
GSF_local_client_start_search_handler_ (struct GNUNET_SERVER_Client *client,
*message,
struct GSF_PendingRequest **prptr)
{
*message,
struct GSF_PendingRequest **prptr)
{
- static GNUNET_HashCode all_zeros;
+ static
struct
GNUNET_HashCode all_zeros;
const struct SearchMessage *sm;
struct GSF_LocalClient *lc;
struct ClientRequest *cr;
const struct SearchMessage *sm;
struct GSF_LocalClient *lc;
struct ClientRequest *cr;
@@
-311,7
+311,7
@@
GSF_local_client_start_search_handler_ (struct GNUNET_SERVER_Client *client,
msize = ntohs (message->size);
if ((msize < sizeof (struct SearchMessage)) ||
msize = ntohs (message->size);
if ((msize < sizeof (struct SearchMessage)) ||
- (0 != (msize - sizeof (struct SearchMessage)) % sizeof (GNUNET_HashCode)))
+ (0 != (msize - sizeof (struct SearchMessage)) % sizeof (
struct
GNUNET_HashCode)))
{
GNUNET_break (0);
*prptr = NULL;
{
GNUNET_break (0);
*prptr = NULL;
@@
-320,7
+320,7
@@
GSF_local_client_start_search_handler_ (struct GNUNET_SERVER_Client *client,
GNUNET_STATISTICS_update (GSF_stats,
gettext_noop ("# client searches received"), 1,
GNUNET_NO);
GNUNET_STATISTICS_update (GSF_stats,
gettext_noop ("# client searches received"), 1,
GNUNET_NO);
- sc = (msize - sizeof (struct SearchMessage)) / sizeof (GNUNET_HashCode);
+ sc = (msize - sizeof (struct SearchMessage)) / sizeof (
struct
GNUNET_HashCode);
sm = (const struct SearchMessage *) message;
type = ntohl (sm->type);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
sm = (const struct SearchMessage *) message;
type = ntohl (sm->type);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@
-340,7
+340,7
@@
GSF_local_client_start_search_handler_ (struct GNUNET_SERVER_Client *client,
(SEARCH_MESSAGE_OPTION_CONTINUED was always set) and that have a
matching query and type */
if ((GNUNET_YES != prd->has_started) &&
(SEARCH_MESSAGE_OPTION_CONTINUED was always set) and that have a
matching query and type */
if ((GNUNET_YES != prd->has_started) &&
- (0 != memcmp (&prd->query, &sm->query, sizeof (GNUNET_HashCode))) &&
+ (0 != memcmp (&prd->query, &sm->query, sizeof (
struct
GNUNET_HashCode))) &&
(prd->type == type))
break;
cr = cr->next;
(prd->type == type))
break;
cr = cr->next;
@@
-350,7
+350,7
@@
GSF_local_client_start_search_handler_ (struct GNUNET_SERVER_Client *client,
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Have existing request, merging content-seen lists.\n");
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Have existing request, merging content-seen lists.\n");
- GSF_pending_request_update_ (cr->pr, (const GNUNET_HashCode *) &sm[1], sc);
+ GSF_pending_request_update_ (cr->pr, (const
struct
GNUNET_HashCode *) &sm[1], sc);
GNUNET_STATISTICS_update (GSF_stats,
gettext_noop
("# client searches updated (merged content seen list)"),
GNUNET_STATISTICS_update (GSF_stats,
gettext_noop
("# client searches updated (merged content seen list)"),
@@
-371,7
+371,7
@@
GSF_local_client_start_search_handler_ (struct GNUNET_SERVER_Client *client,
: NULL,
(0 !=
memcmp (&sm->target, &all_zeros,
: NULL,
(0 !=
memcmp (&sm->target, &all_zeros,
- sizeof (GNUNET_HashCode)))
+ sizeof (
struct
GNUNET_HashCode)))
? (const struct GNUNET_PeerIdentity *)
&sm->target : NULL, NULL, 0,
0 /* bf */ ,
? (const struct GNUNET_PeerIdentity *)
&sm->target : NULL, NULL, 0,
0 /* bf */ ,
@@
-380,7
+380,7
@@
GSF_local_client_start_search_handler_ (struct GNUNET_SERVER_Client *client,
0 /* ttl */ ,
0 /* sender PID */ ,
0 /* origin PID */ ,
0 /* ttl */ ,
0 /* sender PID */ ,
0 /* origin PID */ ,
- (const GNUNET_HashCode *) &sm[1], sc,
+ (const
struct
GNUNET_HashCode *) &sm[1], sc,
&client_response_handler, cr);
}
*prptr = cr->pr;
&client_response_handler, cr);
}
*prptr = cr->pr;
@@
-498,7
+498,7
@@
GSF_client_disconnect_handler_ (void *cls, struct GNUNET_SERVER_Client *client)
}
if (pos->th != NULL)
{
}
if (pos->th != NULL)
{
- GNUNET_
CONNECTION
_notify_transmit_ready_cancel (pos->th);
+ GNUNET_
SERVER
_notify_transmit_ready_cancel (pos->th);
pos->th = NULL;
}
GSF_handle_local_client_disconnect_ (pos);
pos->th = NULL;
}
GSF_handle_local_client_disconnect_ (pos);