X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fquit.cc;h=ffd4cd459cd767e71537e4e0971546f7fe53d70e;hb=256805451de4f0dc6fe3b976894483b43313f46e;hp=0162700d1a1737b7194eff9e3b0c602076adad94;hpb=fd632c80c5d393253d394c9a8721339876602882;p=awesomized%2Flibmemcached diff --git a/libmemcached/quit.cc b/libmemcached/quit.cc index 0162700d..ffd4cd45 100644 --- a/libmemcached/quit.cc +++ b/libmemcached/quit.cc @@ -50,7 +50,7 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death) { if (ptr->fd != INVALID_SOCKET) { - if (io_death == false && ptr->type != MEMCACHED_CONNECTION_UDP && ptr->options.is_shutting_down == false) + if (io_death == false and memcached_is_udp(ptr->root) == false and ptr->options.is_shutting_down == false) { ptr->options.is_shutting_down= true; @@ -100,7 +100,7 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death) ptr->state= MEMCACHED_SERVER_STATE_NEW; ptr->cursor_active= 0; ptr->io_bytes_sent= 0; - ptr->write_buffer_offset= (size_t) ((ptr->type == MEMCACHED_CONNECTION_UDP) ? UDP_DATAGRAM_HEADER_LENGTH : 0); + ptr->write_buffer_offset= size_t(ptr->root and memcached_is_udp(ptr->root) ? UDP_DATAGRAM_HEADER_LENGTH : 0); ptr->read_buffer_length= 0; ptr->read_ptr= ptr->read_buffer; ptr->options.is_shutting_down= false;