summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorrofl0r <rofl0r@users.noreply.github.com>2020-09-16 01:38:50 +0100
committerrofl0r <rofl0r@users.noreply.github.com>2020-09-16 02:39:09 +0100
commit487f2aba4720c3d7b3e7eac4786208cbb7ceb492 (patch)
tree171e213e2e011d6ac65ed0aa16b310db0f380591
parente929e81a55241b63d8921c071806195eae91ab91 (diff)
connect_ports: use sblist
-rw-r--r--src/conf.h2
-rw-r--r--src/connect-ports.c16
-rw-r--r--src/connect-ports.h8
3 files changed, 13 insertions, 13 deletions
diff --git a/src/conf.h b/src/conf.h
index 3ed774b..c075215 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -99,7 +99,7 @@ struct config_s {
/*
* Store the list of port allowed by CONNECT.
*/
- vector_t connect_ports;
+ sblist *connect_ports;
/*
* Map of headers which should be let through when the
diff --git a/src/connect-ports.c b/src/connect-ports.c
index 41b4e3d..6070e92 100644
--- a/src/connect-ports.c
+++ b/src/connect-ports.c
@@ -25,10 +25,10 @@
* Now, this routine adds a "port" to the list. It also creates the list if
* it hasn't already by done.
*/
-void add_connect_port_allowed (int port, vector_t *connect_ports)
+void add_connect_port_allowed (int port, sblist **connect_ports)
{
if (!*connect_ports) {
- *connect_ports = vector_create ();
+ *connect_ports = sblist_new (sizeof(int), 16);
if (!*connect_ports) {
log_message (LOG_WARNING,
"Could not create a list of allowed CONNECT ports");
@@ -38,7 +38,7 @@ void add_connect_port_allowed (int port, vector_t *connect_ports)
log_message (LOG_INFO,
"Adding Port [%d] to the list allowed by CONNECT", port);
- vector_append (*connect_ports, &port, sizeof (port));
+ sblist_add (*connect_ports, &port);
}
/*
@@ -47,7 +47,7 @@ void add_connect_port_allowed (int port, vector_t *connect_ports)
* Returns: 1 if allowed
* 0 if denied
*/
-int check_allowed_connect_ports (int port, vector_t connect_ports)
+int check_allowed_connect_ports (int port, sblist *connect_ports)
{
size_t i;
int *data;
@@ -59,8 +59,8 @@ int check_allowed_connect_ports (int port, vector_t connect_ports)
if (!connect_ports)
return 1;
- for (i = 0; i != (size_t) vector_length (connect_ports); ++i) {
- data = (int *) vector_getentry (connect_ports, i, NULL);
+ for (i = 0; i < sblist_getsize (connect_ports); ++i) {
+ data = sblist_get (connect_ports, i);
if (data && *data == port)
return 1;
}
@@ -71,7 +71,7 @@ int check_allowed_connect_ports (int port, vector_t connect_ports)
/**
* Free a connect_ports list.
*/
-void free_connect_ports_list (vector_t connect_ports)
+void free_connect_ports_list (sblist *connect_ports)
{
- vector_delete (connect_ports);
+ sblist_free (connect_ports);
}
diff --git a/src/connect-ports.h b/src/connect-ports.h
index 4b3aaf7..38f511c 100644
--- a/src/connect-ports.h
+++ b/src/connect-ports.h
@@ -22,10 +22,10 @@
#define _TINYPROXY_CONNECT_PORTS_H_
#include "common.h"
-#include "vector.h"
+#include "sblist.h"
-extern void add_connect_port_allowed (int port, vector_t *connect_ports);
-int check_allowed_connect_ports (int port, vector_t connect_ports);
-void free_connect_ports_list (vector_t connect_ports);
+extern void add_connect_port_allowed (int port, sblist **connect_ports);
+int check_allowed_connect_ports (int port, sblist *connect_ports);
+void free_connect_ports_list (sblist *connect_ports);
#endif /* _TINYPROXY_CONNECT_PORTS_ */