This adds a couple of new options for options parsing.

[m6w6/libmemcached] / libmemcached / constants.h

diff --git a/libmemcached/constants.h b/libmemcached/constants.h
index 5c704027b925eac8a45dccabdaf791dd27b02d15..3c9614d16e0b6931cc23162bd8fd1bcb35946fee 100644 (file)
--- a/libmemcached/constants.h
+++ b/libmemcached/constants.h
@@ -9,20 +9,21 @@
  *
  */
 
-#ifndef __MEMCACHED_CONSTANTS_H__
-#define __MEMCACHED_CONSTANTS_H__
+#pragma once
+#ifndef __LIBMEMCACHED_CONSTANTS_H__
+#define __LIBMEMCACHED_CONSTANTS_H__
 
 /* Public defines */
 #define MEMCACHED_DEFAULT_PORT 11211
 #define MEMCACHED_MAX_KEY 251 /* We add one to have it null terminated */
 #define MEMCACHED_MAX_BUFFER 8196
-#define MEMCACHED_MAX_HOST_LENGTH 64
 #define MEMCACHED_MAX_HOST_SORT_LENGTH 86 /* Used for Ketama */
 #define MEMCACHED_POINTS_PER_SERVER 100
 #define MEMCACHED_POINTS_PER_SERVER_KETAMA 160
 #define MEMCACHED_CONTINUUM_SIZE MEMCACHED_POINTS_PER_SERVER*100 /* This would then set max hosts to 100 */
 #define MEMCACHED_STRIDE 4
-#define MEMCACHED_DEFAULT_TIMEOUT 1000
+#define MEMCACHED_DEFAULT_TIMEOUT 5000
+#define MEMCACHED_DEFAULT_CONNECT_TIMEOUT 4000
 #define MEMCACHED_CONTINUUM_ADDITION 10 /* How many extra slots we should build for in the continuum */
 #define MEMCACHED_PREFIX_KEY_MAX_SIZE 128
 #define MEMCACHED_EXPIRATION_NOT_ADD 0xffffffffU
@@ -69,6 +70,11 @@ typedef enum {
   MEMCACHED_UNKNOWN_STAT_KEY,
   MEMCACHED_E2BIG,
   MEMCACHED_INVALID_ARGUMENTS,
+  MEMCACHED_KEY_TOO_BIG,
+  MEMCACHED_AUTH_PROBLEM,
+  MEMCACHED_AUTH_FAILURE,
+  MEMCACHED_AUTH_CONTINUE,
+  MEMCACHED_PARSE_ERROR,
   MEMCACHED_MAXIMUM_RETURN /* Always add new error code before */
 } memcached_return_t;
 
@@ -114,6 +120,10 @@ typedef enum {
   MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS,
   MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS,
   MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ,
+  MEMCACHED_BEHAVIOR_CORK,
+  MEMCACHED_BEHAVIOR_TCP_KEEPALIVE,
+  MEMCACHED_BEHAVIOR_TCP_KEEPIDLE,
+  MEMCACHED_BEHAVIOR_LOAD_FROM_FILE,
   MEMCACHED_BEHAVIOR_MAX
 } memcached_behavior_t;
 
@@ -143,6 +153,7 @@ typedef enum {
   MEMCACHED_HASH_HSIEH,
   MEMCACHED_HASH_MURMUR,
   MEMCACHED_HASH_JENKINS,
+  MEMCACHED_HASH_CUSTOM,
   MEMCACHED_HASH_MAX
 } memcached_hash_t;
 
@@ -154,4 +165,4 @@ typedef enum {
   MEMCACHED_CONNECTION_MAX
 } memcached_connection_t;
 
-#endif /* __MEMCACHED_CONSTANTS_H__ */
+#endif /* __LIBMEMCACHED_CONSTANTS_H__ */