Changeset 5756890

Timestamp:

2015-10-25T22:37:56Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

f710673

Parents:

e4c3041

git-author:

dequis <dx@…> (24-10-15 20:45:07)

git-committer:

dequis <dx@…> (25-10-15 22:37:56)

Message:

proxy: Use an array of function pointers for proxy_connect_*

Just cleanup.

File:

• lib/proxy.c (modified) (4 diffs)

lib/proxy.c

@@ -61 +61 @@
 };
 
+typedef int (*proxy_connect_func)(const char *host, unsigned short port_, struct PHB *phb);
+
 static int proxy_connect_none(const char *host, unsigned short port_, struct PHB *phb);
 
@@ -502 +504 @@
 }
 
+static const proxy_connect_func proxy_connect_funcs_array[] = {
+        proxy_connect_none,   /* PROXY_NONE */
+        proxy_connect_http,   /* PROXY_HTTP */
+        proxy_connect_socks4, /* PROXY_SOCKS4 */
+        proxy_connect_socks5, /* PROXY_SOCKS5 */
+        proxy_connect_socks4, /* PROXY_SOCKS4A */
+};
 
 /* Export functions */
@@ -508 +517 @@
 {
         struct PHB *phb;
+        proxy_connect_func fun;
 
         if (!host || port <= 0 || !func || strlen(host) > 128) {
@@ -517 +527 @@
         phb->data = data;
 
-        if (proxytype == PROXY_NONE || !proxyhost[0] || proxyport <= 0) {
-                return proxy_connect_none(host, port, phb);
-        } else if (proxytype == PROXY_HTTP) {
-                return proxy_connect_http(host, port, phb);
-        } else if (proxytype == PROXY_SOCKS4 || proxytype == PROXY_SOCKS4A) {
-                return proxy_connect_socks4(host, port, phb);
-        } else if (proxytype == PROXY_SOCKS5) {
-                return proxy_connect_socks5(host, port, phb);
-        }
-
-        g_free(phb);
-        return -1;
-}
+        if (proxyhost[0] && proxyport > 0 && proxytype >= 0 && proxytype <= G_N_ELEMENTS(proxy_connect_funcs_array)) {
+                fun = proxy_connect_funcs_array[proxytype];
+        } else {
+                fun = proxy_connect_none;
+        }
+
+        return fun(host, port, phb);
+}