Merge Andre

[m6w6/libmemcached] / libmemcached / memcached / protocol_binary.h

diff --git a/libmemcached/memcached/protocol_binary.h b/libmemcached/memcached/protocol_binary.h
index c88883088e63770a1aa8357365065983834ccd06..ecdc52e333b1ce19eeb7d2d0f85c23527e8b492c 100644 (file)
--- a/libmemcached/memcached/protocol_binary.h
+++ b/libmemcached/memcached/protocol_binary.h
@@ -35,7 +35,10 @@
 #ifndef PROTOCOL_BINARY_H
 #define PROTOCOL_BINARY_H
 
-#include <stdint.h>
+/**
+ * \addtogroup Protocol
+ * @{
+ */
 
 /**
  * This file contains definitions of the constants and packet formats
@@ -69,9 +72,14 @@ extern "C"
         PROTOCOL_BINARY_RESPONSE_EINVAL = 0x04,
         PROTOCOL_BINARY_RESPONSE_NOT_STORED = 0x05,
         PROTOCOL_BINARY_RESPONSE_DELTA_BADVAL = 0x06,
+        PROTOCOL_BINARY_RESPONSE_AUTH_ERROR = 0x20,
+        PROTOCOL_BINARY_RESPONSE_AUTH_CONTINUE = 0x21,
         PROTOCOL_BINARY_RESPONSE_UNKNOWN_COMMAND = 0x81,
         PROTOCOL_BINARY_RESPONSE_ENOMEM = 0x82,
-        PROTOCOL_BINARY_RESPONSE_EIO = 0xff
+
+        PROTOCOL_BINARY_RESPONSE_PAUSE = 0xfe00,
+        PROTOCOL_BINARY_RESPONSE_EIO = 0xff00
+
     } protocol_binary_response_status;
 
     /**
@@ -107,6 +115,10 @@ extern "C"
         PROTOCOL_BINARY_CMD_APPENDQ = 0x19,
         PROTOCOL_BINARY_CMD_PREPENDQ = 0x1a,
 
+        PROTOCOL_BINARY_CMD_SASL_LIST_MECHS = 0x20,
+        PROTOCOL_BINARY_CMD_SASL_AUTH = 0x21,
+        PROTOCOL_BINARY_CMD_SASL_STEP = 0x22,
+
         /* These commands are used for range operations and exist within
          * this header for use in other projects.  Range operations are
          * not expected to be implemented in the memcached server itself.
@@ -413,6 +425,10 @@ extern "C"
     typedef protocol_binary_request_rangeop protocol_binary_request_rdecr;
     typedef protocol_binary_request_rangeop protocol_binary_request_rdecrq;
 
+    /**
+     * @}
+     */
+
 #ifdef __cplusplus
 }
 #endif