Restore BSD support

[drk1wi]

The relevant code is there... it's just a matter of time to sort some compilation issues.

[loganaden]

Hi,

I tried compiling it on OpenBSD.

SOL_IP isn't present on *BSD.

Here's a diff:

diff --git a/src/connection.cpp b/src/connection.cpp index c4a1685..4b0b6f1 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -43,6 +43,10 @@

include "connection.h"

include "Configuration.h"

+#ifndef SOL_IP +#define SOL_IP IPPROTO_IP +#endif + / ipstr has to be of length INET_ADDRSTRLEN or INET6_ADDRSTRLEN @@ -145,7 +149,7 @@ void* process_connection(void arg) original_port = ntohs(peer_sockaddr.sin_port);

else

• if ( getsockopt (threads[tid].clients[i], SOL_IP, SO_ORIGINALDST, (struct sockaddr)&peer_sockaddr,(socklent) (socklen_t*) &peer_sockaddr_len )){

•     if ( getsockopt (threads[tid].clients[i], SOL_IP, SO_ORIGINAL_DST, (struct sockaddr*)&peer_sockaddr,(socklen_t*) (socklen_t*) &peer_sockaddr_len )){
                        perror("Getsockopt failed: Have you set up your IPTABLES rules correctly ?");
                        goto close_socket;
                    }

  @@ -306,4 +310,4 @@ void* process_connection(void *arg) }

  return 0; -} \ No newline at end of file +}

[loganaden]

Was able to compile, but ran into coredumps on OpenBSD.

Hint appreciated:

-> Verbose mode on. new conn - thread choosen: 9 - nr. of connections already in queue: 0

Program received signal SIGABRT, Aborted. [Switching to thread 1021614] 0x000008597823189a in kill () at :2 2 : No such file or directory. in Current language: auto; currently asm (gdb) bt

0 0x000008597823189a in kill () at :2

1 0x0000085978292a0a in abort () at /usr/src/lib/libc/stdlib/abort.c:70

2 0x0000085978e11a65 in pthread_mutex_unlock (mutexp=Variable "mutexp" is not available.

) at /usr/src/lib/librthread/rthread_sync.c:219

3 0x0000085775f0812e in process_connection (arg=0x3) at connection.cpp:309

4 0x0000085978e1027e in _rthread_start (v=Variable "v" is not available.

) at /usr/src/lib/librthread/rthread.c:128

5 0x000008597821d2ab in __tfork_thread ()

at /usr/src/lib/libc/arch/amd64/sys/tfork_thread.S:75

Cannot access memory at address 0x85984877000

[JustDevZero]

Something similar happens here... :(

Running FreeBSD:

ERROR on accept: Software caused connection abort ERROR on accept: Software caused connection abort ERROR on accept: Software caused connection abort new conn - thread choosen: 9 - nr. of connections already in queue: 0 ERROR on accept: Software caused connection abort ERROR on accept: Software caused connection abort ERROR on accept: Software caused connection abort ERROR on accept: Software caused connection abort Getsockopt failed: Protocol not available