test: allocate fake listeners instead of relying on existance of ones

diff --git a/include/listener.h b/include/listener.h
index a6c8303628639aeb43f4f0e07edcf03cec3dbba1..0f1890da949577c721ca8e5ec861f4c5ee1a9286 100644 (file)
--- a/include/listener.h
+++ b/include/listener.h
@@ -60,7 +60,6 @@ struct Listener
 extern struct Listener *add_listener(int, const char *, unsigned int, struct sslprofile *);
 extern void close_listeners(void);
 extern struct Listener *find_listener(const char *name, int port);
-extern struct Listener *find_listener_flags(unsigned int flags);
 extern const char *get_listener_name(const struct Listener *const);
 extern dlink_list *get_listeners();
 extern void show_ports(struct Client *);

diff --git a/src/listener.c b/src/listener.c
index 837c5edb904756bcc72e9d5dc10cea33b962869b..a62f1e58e70b1cf3e6abcf78d9ec859415820044 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -286,22 +286,6 @@ find_listener(const char *name, int port)
   return find_listener_addr(port, &addr);
 }
 
-struct Listener *
-find_listener_flags(unsigned int flags)
-{
-  dlink_node *ptr;
-
-  DLINK_FOREACH(ptr, ListenerPollList.head)
-  {
-    struct Listener *listener = ptr->data;
-
-    if (listener->flags == flags)
-      return listener;
-  }
-
-  return NULL;
-}
-
 /*
  * add_listener- create a new listener
  * port - the port number to listen on

diff --git a/test/client.c b/test/client.c
index 180d54c5bd197e6c9b01f7a45f95256b00d177b9..4a7de1d7c493bb8bba4ac01dafec6e7ce242356e 100644 (file)
--- a/test/client.c
+++ b/test/client.c
@@ -33,7 +33,7 @@ create(const char *name, struct irc_ssaddr *ip)
   }
 
   struct PlexusClient *pclient = MyMalloc(sizeof(struct PlexusClient));
-  struct Listener *listener = find_listener_flags(0);
+  struct Listener *listener = MyMalloc(sizeof(struct Listener));
   struct Client *client = add_connection(listener, ip, fds[0]);
 
   pclient->client = client;

diff --git a/test/server.c b/test/server.c
index cfc8102d28ed2b3ec38395c74c31660fdca96666..ee17a48b6983c5998bce70184ee046330f721e72 100644 (file)
--- a/test/server.c
+++ b/test/server.c
@@ -33,7 +33,8 @@ create(const char *name, struct irc_ssaddr *ip)
   }
 
   struct PlexusClient *pclient = MyMalloc(sizeof(struct PlexusClient));
-  struct Listener *listener = find_listener_flags(LISTENER_SERVER);
+  struct Listener *listener = MyMalloc(sizeof(struct Listener));
+  listener->flags = LISTENER_SERVER;
   struct Client *client = add_connection(listener, ip, fds[0]);
 
   pclient->client = client;