author | Michael Krelin <hacker@klever.net> | 2014-01-29 16:55:49 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2014-01-29 16:55:49 (UTC) |
commit | f924f4f199f289a18b642de632ec69558f3af3f9 (patch) (unidiff) | |
tree | 6b763255d80be5dc079f3691aa41e0aca23a0735 | |
parent | ad5abd380d5033d4f5b6235407da0842221636cf (diff) | |
download | iii-f924f4f199f289a18b642de632ec69558f3af3f9.zip iii-f924f4f199f289a18b642de632ec69558f3af3f9.tar.gz iii-f924f4f199f289a18b642de632ec69558f3af3f9.tar.bz2 |
Seems to fix the problem with newer gsoap trying to perform ipv6-specific setsockopt
-rw-r--r-- | src/eyefiworker.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/eyefiworker.cc b/src/eyefiworker.cc index 597a3f2..ac96c7f 100644 --- a/src/eyefiworker.cc +++ b/src/eyefiworker.cc | |||
@@ -18,6 +18,12 @@ | |||
18 | # include "iiidb.h" | 18 | # include "iiidb.h" |
19 | #endif | 19 | #endif |
20 | 20 | ||
21 | #ifdef WITH_IPV6 | ||
22 | # define BINDTO "::" | ||
23 | #else | ||
24 | # define BINDTO 0 | ||
25 | #endif | ||
26 | |||
21 | eyefiworker::eyefiworker() | 27 | eyefiworker::eyefiworker() |
22 | : eyefiService(SOAP_IO_STORE|SOAP_IO_KEEPALIVE) { | 28 | : eyefiService(SOAP_IO_STORE|SOAP_IO_KEEPALIVE) { |
23 | bind_flags = SO_REUSEADDR; max_keep_alive = 0; | 29 | bind_flags = SO_REUSEADDR; max_keep_alive = 0; |
@@ -48,7 +54,7 @@ static void fmimewriteclose_(struct soap *soap,void *handle) { | |||
48 | } | 54 | } |
49 | 55 | ||
50 | int eyefiworker::run(int bindport) { | 56 | int eyefiworker::run(int bindport) { |
51 | if(!soap_valid_socket(bind(0,bindport,64))) | 57 | if(!soap_valid_socket(bind(BINDTO,bindport,64))) |
52 | throw std::runtime_error("failed to bind()"); | 58 | throw std::runtime_error("failed to bind()"); |
53 | signal(SIGCHLD,SIG_IGN); | 59 | signal(SIGCHLD,SIG_IGN); |
54 | fmimewriteopen=fmimewriteopen_; fmimewrite=fmimewrite_; fmimewriteclose=fmimewriteclose_; | 60 | fmimewriteopen=fmimewriteopen_; fmimewrite=fmimewrite_; fmimewriteclose=fmimewriteclose_; |