-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 | |||
@@ -15,12 +15,18 @@ | |||
15 | #include "eyetil.h" | 15 | #include "eyetil.h" |
16 | #include "eyefiworker.h" | 16 | #include "eyefiworker.h" |
17 | #ifdef HAVE_SQLITE | 17 | #ifdef HAVE_SQLITE |
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; |
24 | socket_flags = | 30 | socket_flags = |
25 | #if defined(MSG_NOSIGNAL) | 31 | #if defined(MSG_NOSIGNAL) |
26 | MSG_NOSIGNAL | 32 | MSG_NOSIGNAL |
@@ -45,13 +51,13 @@ static int fmimewrite_(struct soap *soap,void *handle,const char *buf,size_t len | |||
45 | } | 51 | } |
46 | static void fmimewriteclose_(struct soap *soap,void *handle) { | 52 | static void fmimewriteclose_(struct soap *soap,void *handle) { |
47 | static_cast<eyefiworker*>(soap)->mime_writeclose(handle); | 53 | static_cast<eyefiworker*>(soap)->mime_writeclose(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_; |
55 | while(true) { | 61 | while(true) { |
56 | if(!soap_valid_socket(accept())) | 62 | if(!soap_valid_socket(accept())) |
57 | throw std::runtime_error("failed to accept()"); | 63 | throw std::runtime_error("failed to accept()"); |