Move the "function to getsockname() on a listener" to regress_testutils

This reverts commit fab50488fcb741884ccdfa7b83643eac3e5c9cbf.

The function was, on reflection, not important enough to break the feature
freeze, since it's trivial to build on your own.

diff --git a/include/event2/listener.h b/include/event2/listener.h
index dbc0366f3dd1690b921790bc98d767d4ff1a0a58..fa4e949988faee4b18006e45dd60362b76819182 100644 (file)
--- a/include/event2/listener.h
+++ b/include/event2/listener.h
@@ -112,11 +112,6 @@ struct event_base *evconnlistener_get_base(struct evconnlistener *lev);
 /** Return the socket that an evconnlistner is listening on. */
 evutil_socket_t evconnlistener_get_fd(struct evconnlistener *lev);
 
-/** Set ss to the address that an evconnlistner is listening on; returns 0
- * on success, -1 on failure. */
-int evconnlistener_get_address(struct evconnlistener *lev,
-    struct sockaddr *sa, ev_socklen_t *socklen);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/listener.c b/listener.c
index dbd9c83c68ff948410c4be084ff35df0c5595448..edfdaefca4c6bac353b5a0aa2a9260dac10d5dec 100644 (file)
--- a/listener.c
+++ b/listener.c
@@ -261,16 +261,6 @@ event_listener_getfd(struct evconnlistener *lev)
        return event_get_fd(&lev_e->listener);
 }
 
-int
-evconnlistener_get_address(struct evconnlistener *lev,
-    struct sockaddr *sa, ev_socklen_t *socklen)
-{
-       evutil_socket_t s = evconnlistener_get_fd(lev);
-       if (s <= 0)
-               return -1;
-       return getsockname(s, sa, socklen);
-}
-
 struct event_base *
 evconnlistener_get_base(struct evconnlistener *lev)
 {

diff --git a/test/regress_bufferevent.c b/test/regress_bufferevent.c
index 8f4ca68585ae6e6cb508f11879768cbbcb580789..370eee01d5d577df34830165ac170176ae495a52 100644 (file)
--- a/test/regress_bufferevent.c
+++ b/test/regress_bufferevent.c
@@ -79,6 +79,7 @@
 #endif
 
 #include "regress.h"
+#include "regress_testutils.h"
 
 /*
  * simple bufferevent test
@@ -508,7 +509,7 @@ test_bufferevent_connect(void *arg)
 
        sa = (struct sockaddr *)&ss;
        slen = sizeof(ss);
-       if (evconnlistener_get_address(lev, sa, &slen) < 0) {
+       if (regress_get_listener_addr(lev, sa, &slen) < 0) {
                tt_abort_perror("getsockname");
        }
 

diff --git a/test/regress_testutils.c b/test/regress_testutils.c
index f2eeb8b5ecfafc7840041c9a32b2d77f607da038..319178f6e87680a1705f23bf909693250e2de575 100644 (file)
--- a/test/regress_testutils.c
+++ b/test/regress_testutils.c
@@ -183,3 +183,13 @@ regress_dnsserver(struct event_base *base, ev_uint16_t *port,
            regress_dns_server_cb, search_table);
        return dns_port != NULL;
 }
+
+int
+regress_get_listener_addr(struct evconnlistener *lev,
+    struct sockaddr *sa, ev_socklen_t *socklen)
+{
+       evutil_socket_t s = evconnlistener_get_fd(lev);
+       if (s <= 0)
+               return -1;
+       return getsockname(s, sa, socklen);
+}

diff --git a/test/regress_testutils.h b/test/regress_testutils.h
index 56b3214063bfdc898a6cfb1ddbc0c7396802e126..951b40629ddcca0b3808fdb487862a4dee241a29 100644 (file)
--- a/test/regress_testutils.h
+++ b/test/regress_testutils.h
@@ -57,5 +57,10 @@ int regress_dnsserver(struct event_base *base, ev_uint16_t *port,
 /* clean up the global dns server resources */
 void regress_clean_dnsserver(void);
 
+struct evconnlistener;
+struct sockaddr;
+int regress_get_listener_addr(struct evconnlistener *lev,
+    struct sockaddr *sa, ev_socklen_t *socklen);
+
 #endif /* _TESTUTILS_H */