More evconnlistener unit tests: bump its coverage from 71% to 83%.

svn:r1392

diff --git a/test/Makefile.am b/test/Makefile.am
index ad83bcc0dd3308890b8c000c3c3d4a676c740760..a1d3ac70557468657c453067ae9a7edd9557ba4f 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -20,7 +20,7 @@ test_time_LDADD = ../libevent_core.la
 
 regress_SOURCES = regress.c regress_buffer.c regress_http.c regress_dns.c \
        regress_rpc.c regress.gen.c regress.gen.h regress_et.c \
-       regress_bufferevent.c \
+       regress_bufferevent.c regress_listener.c \
        regress_util.c tinytest.c regress_main.c regress_minheap.c \
        $(regress_pthread_SOURCES) $(regress_zlib_SOURCES)
 if PTHREADS

diff --git a/test/regress.h b/test/regress.h
index c751f0712265f0aa206063539b1516bf29074319..612301533fd0d98715a3f307dfa680449f274851 100644 (file)
--- a/test/regress.h
+++ b/test/regress.h
@@ -47,6 +47,7 @@ extern struct testcase_t edgetriggered_testcases[];
 extern struct testcase_t minheap_testcases[];
 extern struct testcase_t iocp_testcases[];
 extern struct testcase_t ssl_testcases[];
+extern struct testcase_t listener_testcases[];
 
 void regress_threads(void *);
 void test_bufferevent_zlib(void *);

diff --git a/test/regress_listener.c b/test/regress_listener.c
new file mode 100644 (file)
index 0000000..2390bd0
--- /dev/null
+++ b/test/regress_listener.c
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2009 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.
+ */
+
+#ifdef WIN32
+#include <winsock2.h>
+#include <windows.h>
+#endif
+
+#ifndef WIN32
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <unistd.h>
+#endif
+
+#include <string.h>
+
+#include <event2/listener.h>
+#include <event2/event.h>
+#include <event2/util.h>
+
+#include "regress.h"
+#include "tinytest.h"
+#include "tinytest_macros.h"
+#include "util-internal.h"
+
+static void
+acceptcb(struct evconnlistener *listener, evutil_socket_t fd,
+    struct sockaddr *addr, int socklen, void *arg)
+{
+       int *ptr = arg;
+       --*ptr;
+       TT_BLATHER(("Got one for %p", ptr));
+       EVUTIL_CLOSESOCKET(fd);
+
+       if (! *ptr)
+               evconnlistener_disable(listener);
+}
+
+static void
+regress_pick_a_port(void *arg)
+{
+       struct basic_test_data *data = arg;
+       struct event_base *base = data->base;
+       struct evconnlistener *listener1 = NULL, *listener2 = NULL;
+       //struct event *connecting;
+       struct sockaddr_in sin;
+       int count1 = 2, count2 = 1;
+       struct sockaddr_storage ss1, ss2;
+       struct sockaddr_in *sin1, *sin2;
+       ev_socklen_t slen1 = sizeof(ss1), slen2 = sizeof(ss2);
+       unsigned int flags =
+           LEV_OPT_CLOSE_ON_FREE|LEV_OPT_REUSEABLE|LEV_OPT_CLOSE_ON_EXEC;
+
+       evutil_socket_t fd1 = -1, fd2 = -1, fd3 = -1;
+
+       memset(&sin, 0, sizeof(sin));
+       sin.sin_family = AF_INET;
+       sin.sin_addr.s_addr = htonl(0x7f000001); /* 127.0.0.1 */
+       sin.sin_port = 0; /* "You pick!" */
+
+       listener1 = evconnlistener_new_bind(base, acceptcb, &count1,
+           flags, -1, (struct sockaddr *)&sin, sizeof(sin));
+       tt_assert(listener1);
+       listener2 = evconnlistener_new_bind(base, acceptcb, &count2,
+           flags, -1, (struct sockaddr *)&sin, sizeof(sin));
+       tt_assert(listener2);
+
+       tt_int_op(evconnlistener_get_fd(listener1), >=, 0);
+       tt_int_op(evconnlistener_get_fd(listener2), >=, 0);
+       tt_assert(getsockname(evconnlistener_get_fd(listener1),
+               (struct sockaddr*)&ss1, &slen1) == 0);
+       tt_assert(getsockname(evconnlistener_get_fd(listener2),
+               (struct sockaddr*)&ss2, &slen2) == 0);
+       tt_int_op(ss1.ss_family, ==, AF_INET);
+       tt_int_op(ss2.ss_family, ==, AF_INET);
+
+       sin1 = (struct sockaddr_in*)&ss1;
+       sin2 = (struct sockaddr_in*)&ss2;
+       tt_int_op(ntohl(sin1->sin_addr.s_addr), ==, 0x7f000001);
+       tt_int_op(ntohl(sin2->sin_addr.s_addr), ==, 0x7f000001);
+       tt_int_op(sin1->sin_port, !=, sin2->sin_port);
+
+       tt_ptr_op(evconnlistener_get_base(listener1), ==, base);
+       tt_ptr_op(evconnlistener_get_base(listener2), ==, base);
+
+       fd1 = fd2 = fd3 = -1;
+       evutil_socket_connect(&fd1, (struct sockaddr*)&ss1, slen1);
+       evutil_socket_connect(&fd2, (struct sockaddr*)&ss1, slen1);
+       evutil_socket_connect(&fd3, (struct sockaddr*)&ss2, slen2);
+
+       event_base_dispatch(base);
+
+       tt_int_op(count1, ==, 0);
+       tt_int_op(count2, ==, 0);
+
+end:
+       if (fd1>=0)
+               EVUTIL_CLOSESOCKET(fd1);
+       if (fd2>=0)
+               EVUTIL_CLOSESOCKET(fd2);
+       if (fd3>=0)
+               EVUTIL_CLOSESOCKET(fd3);
+}
+
+
+struct testcase_t listener_testcases[] = {
+
+       { "randport", regress_pick_a_port, TT_FORK|TT_NEED_BASE,
+         &basic_setup, NULL},
+
+        END_OF_TESTCASES,
+};

diff --git a/test/regress_main.c b/test/regress_main.c
index 4bb0e694b93ec787d9b5f05f47de4564868d81a7..4725b0600f64085148ef6be39a4ae02bb4c183d1 100644 (file)
--- a/test/regress_main.c
+++ b/test/regress_main.c
@@ -290,6 +290,7 @@ struct testgroup_t testgroups[] = {
        { "evtag/", evtag_testcases },
        { "rpc/", rpc_testcases },
        { "thread/", thread_testcases },
+       { "listener/", listener_testcases },
 #ifdef WIN32
        { "iocp/", iocp_testcases },
 #endif