protocol_binary_request_header *request,
protocol_binary_response_header *response)
{
- struct memcached_protocol_client_st *client= (void*)cookie;
+ memcached_protocol_client_st *client= (void*)cookie;
if (client->root->pedantic &&
!memcached_binary_protocol_pedantic_check_response(request, response))
uint32_t flags,
uint64_t cas) {
- struct memcached_protocol_client_st *client= (void*)cookie;
+ memcached_protocol_client_st *client= (void*)cookie;
uint8_t opcode= client->current_command->request.opcode;
if (opcode == PROTOCOL_BINARY_CMD_GET || opcode == PROTOCOL_BINARY_CMD_GETQ)
.extlen= 4,
.bodylen= htonl(bodylen + keylen + 4),
},
- .message.body.flags= htonl(flags),
};
+ response.message.body.flags= htonl(flags);
+
protocol_binary_response_status rval;
- const protocol_binary_response_status success = PROTOCOL_BINARY_RESPONSE_SUCCESS;
+ const protocol_binary_response_status success= PROTOCOL_BINARY_RESPONSE_SUCCESS;
if ((rval= client->root->spool(client, response.bytes, sizeof(response.bytes))) != success ||
(rval= client->root->spool(client, key, keylen)) != success ||
(rval= client->root->spool(client, body, bodylen)) != success)
const void *body,
uint32_t bodylen) {
- struct memcached_protocol_client_st *client= (void*)cookie;
+ memcached_protocol_client_st *client= (void*)cookie;
protocol_binary_response_no_extras response= {
.message.header.response= {
};
protocol_binary_response_status rval;
- const protocol_binary_response_status success = PROTOCOL_BINARY_RESPONSE_SUCCESS;
+ const protocol_binary_response_status success= PROTOCOL_BINARY_RESPONSE_SUCCESS;
if ((rval= client->root->spool(client, response.bytes, sizeof(response.bytes))) != success ||
(rval= client->root->spool(client, key, keylen)) != success ||
(rval= client->root->spool(client, body, bodylen)) != success)
const void *text,
uint32_t textlen) {
- struct memcached_protocol_client_st *client= (void*)cookie;
+ memcached_protocol_client_st *client= (void*)cookie;
protocol_binary_response_no_extras response= {
.message.header.response= {
};
protocol_binary_response_status rval;
- const protocol_binary_response_status success = PROTOCOL_BINARY_RESPONSE_SUCCESS;
+ const protocol_binary_response_status success= PROTOCOL_BINARY_RESPONSE_SUCCESS;
if ((rval= client->root->spool(client, response.bytes, sizeof(response.bytes))) != success ||
(rval= client->root->spool(client, text, textlen)) != success)
{
{
protocol_binary_response_status rval;
- struct memcached_protocol_client_st *client= (void*)cookie;
+ memcached_protocol_client_st *client= (void*)cookie;
if (client->root->callback->interface.v1.add != NULL)
{
uint16_t keylen= ntohs(header->request.keylen);
(void)response_handler;
protocol_binary_response_status rval;
- struct memcached_protocol_client_st *client= (void*)cookie;
+ memcached_protocol_client_st *client= (void*)cookie;
if (client->root->callback->interface.v1.decrement != NULL)
{
uint16_t keylen= ntohs(header->request.keylen);
.cas= ntohll(cas),
.bodylen= htonl(8)
},
- .body.value = htonll(result)
+ .body.value= htonll(result)
}
};
rval= response_handler(cookie, header, (void*)&response);
(void)response_handler;
protocol_binary_response_status rval;
- struct memcached_protocol_client_st *client= (void*)cookie;
+ memcached_protocol_client_st *client= (void*)cookie;
if (client->root->callback->interface.v1.delete != NULL)
{
uint16_t keylen= ntohs(header->request.keylen);
(void)response_handler;
protocol_binary_response_status rval;
- struct memcached_protocol_client_st *client= (void*)cookie;
+ memcached_protocol_client_st *client= (void*)cookie;
if (client->root->callback->interface.v1.flush != NULL)
{
protocol_binary_request_flush *flush= (void*)header;
(void)response_handler;
protocol_binary_response_status rval;
- struct memcached_protocol_client_st *client= (void*)cookie;
+ memcached_protocol_client_st *client= (void*)cookie;
if (client->root->callback->interface.v1.get != NULL)
{
uint16_t keylen= ntohs(header->request.keylen);
(void)response_handler;
protocol_binary_response_status rval;
- struct memcached_protocol_client_st *client= (void*)cookie;
+ memcached_protocol_client_st *client= (void*)cookie;
if (client->root->callback->interface.v1.increment != NULL)
{
uint16_t keylen= ntohs(header->request.keylen);
.cas= ntohll(cas),
.bodylen= htonl(8)
},
- .body.value = htonll(result)
+ .body.value= htonll(result)
}
};
protocol_binary_request_header *header,
memcached_binary_protocol_raw_response_handler response_handler)
{
- struct memcached_protocol_client_st *client= (void*)cookie;
+ memcached_protocol_client_st *client= (void*)cookie;
if (client->root->callback->interface.v1.noop != NULL)
{
client->root->callback->interface.v1.noop(cookie);
}
protocol_binary_response_no_extras response= {
- .message = {
- .header.response = {
- .magic = PROTOCOL_BINARY_RES,
+ .message= {
+ .header.response= {
+ .magic= PROTOCOL_BINARY_RES,
.opcode= PROTOCOL_BINARY_CMD_NOOP,
.status= htons(PROTOCOL_BINARY_RESPONSE_SUCCESS),
.opaque= header->request.opaque,
(void)response_handler;
protocol_binary_response_status rval;
- struct memcached_protocol_client_st *client= (void*)cookie;
+ memcached_protocol_client_st *client= (void*)cookie;
if (client->root->callback->interface.v1.append != NULL)
{
uint16_t keylen= ntohs(header->request.keylen);
(void)response_handler;
protocol_binary_response_status rval;
- struct memcached_protocol_client_st *client= (void*)cookie;
+ memcached_protocol_client_st *client= (void*)cookie;
if (client->root->callback->interface.v1.prepend != NULL)
{
uint16_t keylen= ntohs(header->request.keylen);
protocol_binary_request_header *header,
memcached_binary_protocol_raw_response_handler response_handler)
{
- struct memcached_protocol_client_st *client= (void*)cookie;
+ memcached_protocol_client_st *client= (void*)cookie;
if (client->root->callback->interface.v1.quit != NULL)
{
client->root->callback->interface.v1.quit(cookie);
}
protocol_binary_response_no_extras response= {
- .message = {
- .header.response = {
+ .message= {
+ .header.response= {
.magic= PROTOCOL_BINARY_RES,
.opcode= PROTOCOL_BINARY_CMD_QUIT,
.status= htons(PROTOCOL_BINARY_RESPONSE_SUCCESS),
(void)response_handler;
protocol_binary_response_status rval;
- struct memcached_protocol_client_st *client= (void*)cookie;
+ memcached_protocol_client_st *client= (void*)cookie;
if (client->root->callback->interface.v1.replace != NULL)
{
uint16_t keylen= ntohs(header->request.keylen);
(void)response_handler;
protocol_binary_response_status rval;
- struct memcached_protocol_client_st *client= (void*)cookie;
+ memcached_protocol_client_st *client= (void*)cookie;
if (client->root->callback->interface.v1.set != NULL)
{
uint16_t keylen= ntohs(header->request.keylen);
(void)response_handler;
protocol_binary_response_status rval;
- struct memcached_protocol_client_st *client= (void*)cookie;
+ memcached_protocol_client_st *client= (void*)cookie;
if (client->root->callback->interface.v1.stat != NULL)
{
uint16_t keylen= ntohs(header->request.keylen);
(void)header;
protocol_binary_response_status rval;
- struct memcached_protocol_client_st *client= (void*)cookie;
+ memcached_protocol_client_st *client= (void*)cookie;
if (client->root->callback->interface.v1.version != NULL)
{
rval= client->root->callback->interface.v1.version(cookie,
* @return true if success or false if a fatal error occured so that the
* connection should be shut down.
*/
-static bool execute_command(struct memcached_protocol_client_st *client, protocol_binary_request_header *header)
+static protocol_binary_response_status execute_command(memcached_protocol_client_st *client, protocol_binary_request_header *header)
{
if (client->root->pedantic &&
memcached_binary_protocol_pedantic_check_request(header))
}
if (rval != PROTOCOL_BINARY_RESPONSE_SUCCESS &&
- rval != PROTOCOL_BINARY_RESPONSE_EIO)
+ rval != PROTOCOL_BINARY_RESPONSE_EIO &&
+ rval != PROTOCOL_BINARY_RESPONSE_PAUSE)
{
protocol_binary_response_no_extras response= {
.message= {
client->root->callback->post_execute(client, header);
}
- return rval != PROTOCOL_BINARY_RESPONSE_EIO;
+ return rval;
}
/*
** "PROTOECTED" INTERFACE
** **********************************************************************
*/
-enum MEMCACHED_PROTOCOL_EVENT memcached_binary_protocol_process_data(struct memcached_protocol_client_st *client, ssize_t *length, void **endptr)
+memcached_protocol_event_t memcached_binary_protocol_process_data(memcached_protocol_client_st *client, ssize_t *length, void **endptr)
{
/* try to parse all of the received packets */
protocol_binary_request_header *header;
if (header->request.magic != (uint8_t)PROTOCOL_BINARY_REQ)
{
client->error= EINVAL;
- return ERROR_EVENT;
+ return MEMCACHED_PROTOCOL_ERROR_EVENT;
}
ssize_t len= *length;
(len >= (ssize_t)(sizeof(*header) + ntohl(header->request.bodylen))))
{
/* I have the complete package */
- client->current_command = header;
- if (!execute_command(client, header))
+ client->current_command= header;
+ protocol_binary_response_status rv= execute_command(client, header);
+
+ if (rv == PROTOCOL_BINARY_RESPONSE_EIO)
{
*length= len;
*endptr= (void*)header;
- return ERROR_EVENT;
- }
+ return MEMCACHED_PROTOCOL_ERROR_EVENT;
+ } else if (rv == PROTOCOL_BINARY_RESPONSE_PAUSE)
+ return MEMCACHED_PROTOCOL_PAUSE_EVENT;
ssize_t total= (ssize_t)(sizeof(*header) + ntohl(header->request.bodylen));
len -= total;
header= (void*)client->root->input_buffer;
}
}
+ *length= len;
+ *endptr= (void*)header;
}
- *length= len;
- *endptr= (void*)header;
-
- return READ_EVENT;
+ return MEMCACHED_PROTOCOL_READ_EVENT;
}
/*
** PUBLIC INTERFACE
** **********************************************************************
*/
-struct memcached_binary_protocol_callback_st *memcached_binary_protocol_get_callbacks(struct memcached_protocol_st *instance)
+memcached_binary_protocol_callback_st *memcached_binary_protocol_get_callbacks(memcached_protocol_st *instance)
{
return instance->callback;
}
-void memcached_binary_protocol_set_callbacks(struct memcached_protocol_st *instance, struct memcached_binary_protocol_callback_st *callback)
+void memcached_binary_protocol_set_callbacks(memcached_protocol_st *instance, memcached_binary_protocol_callback_st *callback)
{
instance->callback= callback;
}
return raw_response_handler;
}
-void memcached_binary_protocol_set_pedantic(struct memcached_protocol_st *instance, bool enable)
+void memcached_binary_protocol_set_pedantic(memcached_protocol_st *instance, bool enable)
{
instance->pedantic= enable;
}
-bool memcached_binary_protocol_get_pedantic(struct memcached_protocol_st *instance)
+bool memcached_binary_protocol_get_pedantic(memcached_protocol_st *instance)
{
return instance->pedantic;
}