From eb1ad6de2fcb92e0d9d2d2a8e5218b011586b932 Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan@faked.org>
Date: Mon, 9 Mar 2015 22:30:34 +0100
Subject: [PATCH] try to detect broadcast address, if not specified
---
app.js | 8 +++++++-
config.json-dist | 2 +-
package.json | 1 +
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/app.js b/app.js
index f82bed3..2ec1a64 100644
--- a/app.js
+++ b/app.js
@@ -3,7 +3,6 @@ var config = require('./config.json');
var pathPhotos = config.pathPhotos;
var previewWidth = config.previewWidth;
var previewHeight = config.previewHeight;
-var cardAddr = config.broadcastAddr;
var cardPath = null;
var pathPreviews = './public/previews';
@@ -15,6 +14,7 @@ var downloadPrevious = true;
var downloadList = new Array();
var os = require('os');
+var ip = require('ip');
var http = require('http');
var path = require('path');
var net = require('net');
@@ -36,6 +36,12 @@ var routes = require('./routes/index');
var latestPhoto = require('./routes/latest');
var allPhotos = require('./routes/all');
+var cardAddr = ip.subnet(ip.address(), '255.255.255.0').broadcastAddress;
+
+if (typeof config.broadcastAddr !== undefined) {
+ cardAddr = config.broadcastAddr;
+}
+
process.title = 'WiPho';
var gracefulShutdown = function() {
console.log("Shutting down...");
diff --git a/config.json-dist b/config.json-dist
index 3be43e4..e33ff06 100644
--- a/config.json-dist
+++ b/config.json-dist
@@ -2,6 +2,6 @@
"pathPhotos" : "/path/to/photos/folder",
"previewWidth" : 1920,
"previewHeight" : 1080,
+ "httpPort" : 80,
"broadcastAddr" : "192.168.0.255",
- "httpPort" : 80
}
diff --git a/package.json b/package.json
index 392186c..7f4f1f0 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
"debug": "^0.7.0",
"express": "~4.12.2",
"gm": "^1.17.0",
+ "ip": "^0.3.2",
"jade": "^1.9.2",
"morgan": "^1.5.1",
"serve-favicon": "^2.2.0",
--
GitLab