X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Fms_conn.h;h=cf1e8c0fc9c71dace61c4e10aab87a4dc7cb7b71;hb=0bbb14508a90f9af985efc198428e1560ab9b44a;hp=bb989bedaa9eb4c644c6e70e642a6681a4ea71e1;hpb=ad624f93ee91351c4f3839ca0dc1a9981644d391;p=m6w6%2Flibmemcached

diff --git a/clients/ms_conn.h b/clients/ms_conn.h
index bb989bed..cf1e8c0f 100644
--- a/clients/ms_conn.h
+++ b/clients/ms_conn.h
@@ -17,7 +17,7 @@
 #include <netdb.h>
 
 #include "ms_task.h"
-#include "protocol_binary.h"
+#include <libmemcached/memcached/protocol_binary.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -30,8 +30,7 @@ extern "C" {
 #define UDP_MAX_SEND_PAYLOAD_SIZE    1400                 /* mtu size is 1500 */
 #define UDP_HEADER_SIZE              8                    /* UDP header size */
 #define MAX_SENDBUF_SIZE             (256 * 1024 * 1024)  /* Maximum socket buffer size */
-#define SOCK_WAIT_TIMEOUT            10                   /* maximum waiting time of UDP, 10s */
-#define EVENT_TIMEOUT                10                   /* maximum waiting time of event,10s */
+#define SOCK_WAIT_TIMEOUT            30                   /* maximum waiting time of UDP, 30s */
 #define MAX_UDP_PACKET               (1 << 16)            /* maximum UDP packets, 65536 */
 
 /* Initial size of the sendmsg() scatter/gather array. */
@@ -104,7 +103,6 @@ typedef struct udppkt
 enum protocol
 {
   ascii_prot = 3,           /* ASCII protocol */
-  ascii_udp_prot,           /* ASCII UDP protocol*/
   binary_prot,              /* binary protocol */
 };
 
@@ -119,7 +117,7 @@ enum protocol
  */
 typedef struct conn
 {
-  int conn_idx;             /* connection index in the thread */
+  uint32_t conn_idx;             /* connection index in the thread */
   int sfd;                  /* current tcp sock handler of the connection structure */
   int udpsfd;               /* current udp sock handler of the connection structure*/
   int state;                /* state of the connection */
@@ -129,9 +127,9 @@ typedef struct conn
   bool change_sfd;          /* whether change sfd */
 
   int *tcpsfd;              /* TCP sock array */
-  int total_sfds;           /* how many socks in the tcpsfd array */
-  int alive_sfds;           /* alive socks */
-  int cur_idx;              /* current sock index in tcpsfd array */
+  uint32_t total_sfds;           /* how many socks in the tcpsfd array */
+  uint32_t alive_sfds;           /* alive socks */
+  uint32_t cur_idx;              /* current sock index in tcpsfd array */
 
   ms_cmdstat_t precmd;      /* previous command state */
   ms_cmdstat_t currcmd;     /* current command state */
@@ -161,7 +159,7 @@ typedef struct conn
   int msgbytes;             /* number of bytes in current msg */
 
   /* data for UDP clients */
-  int udp;                          /* is this is a UDP "connection" */
+  bool udp;                          /* is this is a UDP "connection" */
   uint32_t request_id;                   /* UDP request ID of current operation, if this is a UDP "connection" */
   uint8_t *hdrbuf;                  /* udp packet headers */
   int hdrsize;                      /* number of headers' worth of space is allocated */
@@ -229,7 +227,7 @@ int ms_mcd_set(ms_conn_t *c, ms_task_item_t *item);
 
 
 /* used to send the get command to server */
-int ms_mcd_get(ms_conn_t *c, ms_task_item_t *item, bool verify);
+int ms_mcd_get(ms_conn_t *c, ms_task_item_t *item);
 
 
 /* used to send the multi-get command to server */