Merge branch 'master' of https://github.com/SimulPiscator/AirSane

README.macOS.md

@@ -12,7 +12,7 @@ There, execute the following commands:
 ```
 sudo port install sane-backends jpeg libpng
 sudo port install cmake
-git clone github.com/SimulPiscator/AirSane.git
+git clone https://github.com/SimulPiscator/AirSane.git
 mkdir AirSane-build && cd AirSane-build
 cmake  ../AirSane
 make

README.md

@@ -61,7 +61,7 @@ Build files and instructions for OpenWRT have been published here:
 ### Build on macOS
 AirSane may be run on a macOS installation in order to serve locally attached
 scanners to eSCL clients such as Apple Image Capture. For instructions, see 
-[the macOS README file](README-macOS.md).
+[the macOS README file](README.macOS.md).
 
 ### Build and install from source on Debian/Ubuntu/Raspbian
 #### Build

server/mainserver.cpp

@@ -203,7 +203,7 @@ bool MainServer::run()
                     pService.reset();
             }
 
-            std::shared_ptr<ScannerServer> pServer = std::make_shared<ScannerServer>(pScanner, mPublisher.hostname(), port);
+            std::shared_ptr<ScannerServer> pServer = std::make_shared<ScannerServer>(pScanner, mPublisher.hostname(), interfaceIndex(), port);
             mScanners.push_back(ScannerEntry({pScanner, pService, pServer}));
         }
         ::clock_gettime(CLOCK_MONOTONIC, &t);

server/scannerserver.cpp

@@ -23,9 +23,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <fstream>
 #include <csignal>
 
-ScannerServer::ScannerServer(std::shared_ptr<Scanner> pScanner, const std::string& host, uint16_t port)
+ScannerServer::ScannerServer(std::shared_ptr<Scanner> pScanner, const std::string& host, int idx, uint16_t port)
 : mpScanner(pScanner), mpThread(nullptr), mHost(host)
 {
+    HttpServer::setInterfaceIndex(idx);
     HttpServer::setPort(port);
     mpThread = new std::thread([this]{this->run();});
 }

server/scannerserver.h

@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 class ScannerServer: public HttpServer
 {
 public:
-    ScannerServer(std::shared_ptr<Scanner>, const std::string& host, uint16_t port);
+    ScannerServer(std::shared_ptr<Scanner>, const std::string& host, int interfaceIndex, uint16_t port);
     ~ScannerServer();
 
 protected:

web/httpserver.cpp

@@ -428,7 +428,7 @@ HttpServer &HttpServer::setInterfaceIndex(int i)
     else {
         unsigned int idx = i;
         char buf[IF_NAMESIZE] = { 0 };
-        if(!::if_indextoname(idx, buf)) {
+        if(::if_indextoname(idx, buf)) {
             p->mInterfaceName = buf;
             p->mInterfaceIndex = i;
         }