diff options
author | Eric Lambert <eric.lambert@sun.com> | 2009-04-08 21:25:52 -0700 |
---|---|---|
committer | Trond Norbye <Trond.Norbye@sun.com> | 2009-05-02 18:41:48 -0700 |
commit | a90d745b7997637eeb87c9a3a26c49003dcd8b18 (patch) | |
tree | 8b6dd1d94c116c3263dfd8d3c769c12bb5ea708c /thread.c | |
parent | a4106cf31d24a4c200fbfc50660f24dcf903e08f (diff) | |
download | memcached-stable-1.3.tar.gz |
fix and test for issue 38 (server does not respond to binary requests)stable-1.3
Diffstat (limited to 'thread.c')
-rw-r--r-- | thread.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -20,7 +20,7 @@ struct conn_queue_item { enum conn_states init_state; int event_flags; int read_buffer_size; - enum protocol protocol; + enum network_transport transport; CQ_ITEM *next; }; @@ -246,9 +246,9 @@ static void thread_libevent_process(int fd, short which, void *arg) { if (NULL != item) { conn *c = conn_new(item->sfd, item->init_state, item->event_flags, - item->read_buffer_size, item->protocol, me->base); + item->read_buffer_size, item->transport, me->base); if (c == NULL) { - if (IS_UDP(item->protocol)) { + if (IS_UDP(item->transport)) { fprintf(stderr, "Can't listen for events on UDP socket\n"); exit(1); } else { @@ -274,7 +274,7 @@ static int last_thread = 0; * of an incoming connection. */ void dispatch_conn_new(int sfd, enum conn_states init_state, int event_flags, - int read_buffer_size, enum protocol prot) { + int read_buffer_size, enum network_transport transport) { CQ_ITEM *item = cqi_new(); int tid = last_thread % (settings.num_threads - 1); @@ -288,7 +288,7 @@ void dispatch_conn_new(int sfd, enum conn_states init_state, int event_flags, item->init_state = init_state; item->event_flags = event_flags; item->read_buffer_size = read_buffer_size; - item->protocol = prot; + item->transport = transport; cq_push(thread->new_conn_queue, item); |