Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/rofl0r/proxychains-ng.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEthan F <69695757+ethanf89@users.noreply.github.com>2020-08-17 11:31:04 +0300
committerGitHub <noreply@github.com>2020-08-17 11:31:04 +0300
commit0ee5db605b3c9884ff24a2ddcc346f24b76591c5 (patch)
tree4fa7a954e61affb2b9125de07e6c2b1bbec9dd7a /src
parentbf2ef2ce38441ef9d3897ca5ef28414dbef3623f (diff)
Add Haiku support (#340)
Diffstat (limited to 'src')
-rw-r--r--src/common.c7
-rw-r--r--src/libproxychains.c1
2 files changed, 8 insertions, 0 deletions
diff --git a/src/common.c b/src/common.c
index c126ecf..2af642e 100644
--- a/src/common.c
+++ b/src/common.c
@@ -78,6 +78,13 @@ char *get_config_path(char* default_path, char* pbuf, size_t bufsize) {
path = pbuf;
if(check_path(path))
goto have;
+
+ // priority 3b: ~/config/settings/proxychains.conf (for haiku)
+ path = getenv("HOME");
+ snprintf(pbuf, bufsize, "%s/config/settings/%s", path, PROXYCHAINS_CONF_FILE);
+ path = pbuf;
+ if(check_path(path))
+ goto have;
// priority 4: $SYSCONFDIR/proxychains.conf
path = SYSCONFDIR "/" PROXYCHAINS_CONF_FILE;
diff --git a/src/libproxychains.c b/src/libproxychains.c
index 670d447..318c937 100644
--- a/src/libproxychains.c
+++ b/src/libproxychains.c
@@ -38,6 +38,7 @@
#include "core.h"
#include "common.h"
+#undef satosin
#define satosin(x) ((struct sockaddr_in *) &(x))
#define SOCKADDR(x) (satosin(x)->sin_addr.s_addr)
#define SOCKADDR_2(x) (satosin(x)->sin_addr)