X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Fms_conn.h;h=b915888d95d6b9cb420834e55172e719c2745d6b;hb=a713b6d9ee850ae5805c05e8336256cea1f71138;hp=a52a55c95ec62a6f3685e0a394ac092de27be49d;hpb=613d2abe710af39d6daf34673462cd467ed6499a;p=m6w6%2Flibmemcached diff --git a/clients/ms_conn.h b/clients/ms_conn.h index a52a55c9..b915888d 100644 --- a/clients/ms_conn.h +++ b/clients/ms_conn.h @@ -60,7 +60,7 @@ enum conn_states { conn_read, /* reading in a command line */ conn_write, /* writing out a simple response */ - conn_closing, /* closing this connection */ + conn_closing /* closing this connection */ }; /* returned states of memcached command */ @@ -78,7 +78,7 @@ enum mcd_ret MCD_NOTFOUND, /* server not find the object */ MCD_END, /* end of the response of get command */ MCD_DELETED, /* server delete the object successfully */ - MCD_STAT, /* response of stats command */ + MCD_STAT /* response of stats command */ }; /* used to store the current or previous running command state */ @@ -103,7 +103,7 @@ typedef struct udppkt enum protocol { ascii_prot = 3, /* ASCII protocol */ - binary_prot, /* binary protocol */ + binary_prot /* binary protocol */ }; /** @@ -117,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 */ @@ -127,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 */ @@ -159,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 */