projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- opaque mq structs
[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 d8f7d5cb3ef51bbe5b5b251d8abcab5db0b88795..f901318153b1cf065dcbeeb6f00348dc06bf8050 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;
};
};
@@
-197,7
+197,7
@@
client_request_destroy (void *cls,
cr->kill_task = GNUNET_SCHEDULER_NO_TASK;
lc = cr->lc;
GNUNET_CONTAINER_DLL_remove (lc->cr_head, lc->cr_tail, cr);
cr->kill_task = GNUNET_SCHEDULER_NO_TASK;
lc = cr->lc;
GNUNET_CONTAINER_DLL_remove (lc->cr_head, lc->cr_tail, cr);
- GSF_pending_request_cancel_ (cr->pr, GNUNET_
NO
);
+ GSF_pending_request_cancel_ (cr->pr, GNUNET_
YES
);
GNUNET_STATISTICS_update (GSF_stats,
gettext_noop ("# client searches active"), -1,
GNUNET_NO);
GNUNET_STATISTICS_update (GSF_stats,
gettext_noop ("# client searches active"), -1,
GNUNET_NO);
@@
-218,6
+218,7
@@
client_request_destroy (void *cls,
* @param pr handle to the original pending request
* @param reply_anonymity_level anonymity level for the reply, UINT32_MAX for "unknown"
* @param expiration when does 'data' expire?
* @param pr handle to the original pending request
* @param reply_anonymity_level anonymity level for the reply, UINT32_MAX for "unknown"
* @param expiration when does 'data' expire?
+ * @param last_transmission when was the last time we've tried to download this block? (FOREVER if unknown)
* @param type type of the block
* @param data response data, NULL on request expiration
* @param data_len number of bytes in data
* @param type type of the block
* @param data response data, NULL on request expiration
* @param data_len number of bytes in data
@@
-227,12
+228,13
@@
client_response_handler (void *cls, enum GNUNET_BLOCK_EvaluationResult eval,
struct GSF_PendingRequest *pr,
uint32_t reply_anonymity_level,
struct GNUNET_TIME_Absolute expiration,
struct GSF_PendingRequest *pr,
uint32_t reply_anonymity_level,
struct GNUNET_TIME_Absolute expiration,
+ struct GNUNET_TIME_Absolute last_transmission,
enum GNUNET_BLOCK_Type type, const void *data,
size_t data_len)
{
struct ClientRequest *cr = cls;
struct GSF_LocalClient *lc;
enum GNUNET_BLOCK_Type type, const void *data,
size_t data_len)
{
struct ClientRequest *cr = cls;
struct GSF_LocalClient *lc;
- struct PutMessage *pm;
+ struct
Client
PutMessage *pm;
const struct GSF_PendingRequestData *prd;
size_t msize;
const struct GSF_PendingRequestData *prd;
size_t msize;
@@
-255,26
+257,33
@@
client_response_handler (void *cls, enum GNUNET_BLOCK_EvaluationResult eval,
GNUNET_NO);
GNUNET_assert (pr == cr->pr);
lc = cr->lc;
GNUNET_NO);
GNUNET_assert (pr == cr->pr);
lc = cr->lc;
- msize = sizeof (struct PutMessage) + data_len;
+ msize = sizeof (struct
Client
PutMessage) + data_len;
{
{
- char buf[msize];
+ char buf[msize]
GNUNET_ALIGN
;
- pm = (struct PutMessage *) buf;
+ pm = (struct
Client
PutMessage *) buf;
pm->header.type = htons (GNUNET_MESSAGE_TYPE_FS_PUT);
pm->header.size = htons (msize);
pm->type = htonl (type);
pm->expiration = GNUNET_TIME_absolute_hton (expiration);
pm->header.type = htons (GNUNET_MESSAGE_TYPE_FS_PUT);
pm->header.size = htons (msize);
pm->type = htonl (type);
pm->expiration = GNUNET_TIME_absolute_hton (expiration);
+ pm->last_transmission = GNUNET_TIME_absolute_hton (last_transmission);
+ pm->num_transmissions = htonl (prd->num_transmissions);
+ pm->respect_offered = htonl (prd->respect_offered);
memcpy (&pm[1], data, data_len);
GSF_local_client_transmit_ (lc, &pm->header);
}
memcpy (&pm[1], data, data_len);
GSF_local_client_transmit_ (lc, &pm->header);
}
-#if DEBUG_FS_CLIENT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Queued reply to query `%s' for local client\n",
GNUNET_h2s (&prd->query), (unsigned int) prd->type);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Queued reply to query `%s' for local client\n",
GNUNET_h2s (&prd->query), (unsigned int) prd->type);
-#endif
- if (eval != GNUNET_BLOCK_EVALUATION_OK_LAST)
+ if (GNUNET_BLOCK_EVALUATION_OK_LAST != eval)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Evaluation %d - keeping query alive\n",
+ (int) eval);
return;
return;
- cr->kill_task = GNUNET_SCHEDULER_add_now (&client_request_destroy, cr);
+ }
+ if (GNUNET_SCHEDULER_NO_TASK == cr->kill_task)
+ cr->kill_task = GNUNET_SCHEDULER_add_now (&client_request_destroy, cr);
}
}
@@
-297,7
+306,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;
@@
-309,7
+318,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;
@@
-318,19
+327,17
@@
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);
sm = (const struct SearchMessage *) message;
type = ntohl (sm->type);
-#if DEBUG_FS_CLIENT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received request for `%s' of type %u from local client\n",
GNUNET_h2s (&sm->query), (unsigned int) type);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received request for `%s' of type %u from local client\n",
GNUNET_h2s (&sm->query), (unsigned int) type);
-#endif
lc = GSF_local_client_lookup_ (client);
cr = NULL;
lc = GSF_local_client_lookup_ (client);
cr = NULL;
- /* detect duplicate
K
BLOCK requests */
- if ((type == GNUNET_BLOCK_TYPE_FS_
K
BLOCK) ||
- (type == GNUNET_BLOCK_TYPE_
FS_NBLOCK) || (type == GNUNET_BLOCK_TYPE_
ANY))
+ /* detect duplicate
U
BLOCK requests */
+ if ((type == GNUNET_BLOCK_TYPE_FS_
U
BLOCK) ||
+ (type == GNUNET_BLOCK_TYPE_ANY))
{
cr = lc->cr_head;
while (cr != NULL)
{
cr = lc->cr_head;
while (cr != NULL)
@@
-340,19
+347,17
@@
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;
}
}
- if (
cr != NULL
)
+ if (
NULL != cr
)
{
{
-#if DEBUG_FS_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");
-#endif
- 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)"),
@@
-369,11
+374,11
@@
GSF_local_client_start_search_handler_ (struct GNUNET_SERVER_Client *client,
options = GSF_PRO_LOCAL_REQUEST;
if (0 != (SEARCH_MESSAGE_OPTION_LOOPBACK_ONLY & ntohl (sm->options)))
options |= GSF_PRO_LOCAL_ONLY;
options = GSF_PRO_LOCAL_REQUEST;
if (0 != (SEARCH_MESSAGE_OPTION_LOOPBACK_ONLY & ntohl (sm->options)))
options |= GSF_PRO_LOCAL_ONLY;
- cr->pr = GSF_pending_request_create_ (options, type,
&sm->query, (type == GNUNET_BLOCK_TYPE_FS_SBLOCK) ? &sm->target /* namespace */
- : NULL,
+ cr->pr = GSF_pending_request_create_ (options, type,
+ &sm->query,
(0 !=
memcmp (&sm->target, &all_zeros,
(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 */ ,
@@
-382,7
+387,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;
@@
-480,18
+485,13
@@
GSF_client_disconnect_handler_ (void *cls, struct GNUNET_SERVER_Client *client)
pos = client_head;
while ((pos != NULL) && (pos->client != client))
pos = pos->next;
pos = client_head;
while ((pos != NULL) && (pos->client != client))
pos = pos->next;
- if (
pos == NULL
)
+ if (
NULL == pos
)
return;
while (NULL != (cr = pos->cr_head))
{
return;
while (NULL != (cr = pos->cr_head))
{
- GNUNET_CONTAINER_DLL_remove (pos->cr_head, pos->cr_tail, cr);
- GSF_pending_request_cancel_ (cr->pr, GNUNET_NO);
- GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# client searches active"), -1,
- GNUNET_NO);
if (GNUNET_SCHEDULER_NO_TASK != cr->kill_task)
GNUNET_SCHEDULER_cancel (cr->kill_task);
if (GNUNET_SCHEDULER_NO_TASK != cr->kill_task)
GNUNET_SCHEDULER_cancel (cr->kill_task);
-
GNUNET_free (cr
);
+
client_request_destroy (cr, NULL
);
}
while (NULL != (res = pos->res_head))
{
}
while (NULL != (res = pos->res_head))
{
@@
-500,7
+500,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);