mirror of
https://github.com/libevent/libevent.git
synced 2025-01-20 05:02:55 +08:00
b1b69ac7c1
- Added new EV_CLOSED event - detects premature connection close
by clients without the necessity of reading all the pending
data. Does not depend on EV_READ and/or EV_WRITE.
- Added new EV_FEATURE_EARLY_CLOSED feature for epoll.
Must be supported for listening to EV_CLOSED event.
- Added new regression test: test-closed.c
- All regression tests passed (test/regress and test/test.sh)
- strace output of test-closed using EV_CLOSED:
socketpair(PF_LOCAL, SOCK_STREAM, 0, [6, 7]) = 0
sendto(6, "test string\0", 12, 0, NULL, 0) = 12
shutdown(6, SHUT_WR) = 0
epoll_ctl(3, EPOLL_CTL_ADD, 7, {EPOLLRDHUP, {u32=7, u64=7}}) = 0
epoll_wait(3, {{EPOLLRDHUP, {u32=7, u64=7}}}, 32, 3000) = 1
epoll_ctl(3, EPOLL_CTL_MOD, 7, {EPOLLRDHUP, {u32=7, u64=7}}) = 0
fstat(1, {st_mode=S_IFCHR|0620, st_rdev=makedev(136, 4), ...})
mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYM...
write(1, "closed_cb: detected connection close "..., 45) = 45
118 lines
3.3 KiB
C
118 lines
3.3 KiB
C
/*
|
|
* Copyright (c) 2002-2007 Niels Provos <provos@citi.umich.edu>
|
|
* Copyright (c) 2007-2013 Niels Provos and Nick Mathewson
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
#include "event2/event-config.h"
|
|
|
|
#ifdef _WIN32
|
|
#include <winsock2.h>
|
|
#else
|
|
#include <unistd.h>
|
|
#endif
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#ifdef EVENT__HAVE_SYS_TIME_H
|
|
#include <sys/time.h>
|
|
#endif
|
|
#ifdef EVENT__HAVE_SYS_SOCKET_H
|
|
#include <sys/socket.h>
|
|
#endif
|
|
#include <fcntl.h>
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
|
|
#include <event.h>
|
|
#include <evutil.h>
|
|
|
|
#ifdef EVENT____func__
|
|
#define __func__ EVENT____func__
|
|
#endif
|
|
|
|
struct timeval timeout = {3, 0};
|
|
|
|
static void
|
|
closed_cb(evutil_socket_t fd, short event, void *arg)
|
|
{
|
|
if (EV_TIMEOUT & event) {
|
|
printf("%s: Timeout!\n", __func__);
|
|
exit(1);
|
|
}
|
|
|
|
if (EV_CLOSED & event) {
|
|
printf("%s: detected socket close with success\n", __func__);
|
|
return;
|
|
}
|
|
|
|
printf("%s: unable to detect socket close\n", __func__);
|
|
exit(1);
|
|
}
|
|
|
|
#ifndef SHUT_WR
|
|
#define SHUT_WR 1
|
|
#endif
|
|
|
|
int
|
|
main(int argc, char **argv)
|
|
{
|
|
struct event_base *base;
|
|
struct event_config *cfg;
|
|
struct event *ev;
|
|
const char *test = "test string";
|
|
evutil_socket_t pair[2];
|
|
|
|
/* Initialize the library and check if the backend
|
|
supports EV_FEATURE_EARLY_CLOSE
|
|
*/
|
|
cfg = event_config_new();
|
|
event_config_require_features(cfg, EV_FEATURE_EARLY_CLOSE);
|
|
base = event_base_new_with_config(cfg);
|
|
event_config_free(cfg);
|
|
if (!base) {
|
|
/* Backend doesn't support EV_FEATURE_EARLY_CLOSE */
|
|
return 0;
|
|
}
|
|
|
|
/* Create a pair of sockets */
|
|
if (evutil_socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == -1)
|
|
return (1);
|
|
|
|
/* Send some data on socket 0 and immediately close it */
|
|
if (send(pair[0], test, (int)strlen(test)+1, 0) < 0)
|
|
return (1);
|
|
shutdown(pair[0], SHUT_WR);
|
|
|
|
/* Dispatch */
|
|
ev = event_new(base, pair[1], EV_CLOSED | EV_TIMEOUT, closed_cb, event_self_cbarg());
|
|
event_add(ev, &timeout);
|
|
event_base_dispatch(base);
|
|
|
|
/* Finalize library */
|
|
event_base_free(base);
|
|
return 0;
|
|
}
|
|
|