Compare commits
No commits in common. "7c5c37e9b50869f11a2af35504a4da613a1d3693" and "38fed9604c72744946beb32fa52e077aaaf15757" have entirely different histories.
7c5c37e9b5
...
38fed9604c
24
src/main.js
24
src/main.js
@ -82,22 +82,9 @@ if(errorMsg){
|
|||||||
|
|
||||||
logger.debug("Attaching error-logger..");
|
logger.debug("Attaching error-logger..");
|
||||||
const loggerTcpdump = logFactory("tcpdump");
|
const loggerTcpdump = logFactory("tcpdump");
|
||||||
let linkTypeId;
|
|
||||||
proc.stderr.setEncoding("utf8").on("data", (data) => {
|
proc.stderr.setEncoding("utf8").on("data", (data) => {
|
||||||
if(!data.match(/^(tcpdump: )?listening on /i) || !data.match(/^\d+ packets captured/i)) { // Catch start-error
|
if(!data.match(/^(tcpdump: )?listening on /i) || !data.match(/^\d+ packets captured/i)) { // Catch start-error
|
||||||
loggerTcpdump.debug(data);
|
loggerTcpdump.debug(data);
|
||||||
|
|
||||||
if(!linkTypeId && data.match(/^(tcpdump: )?listening on/i)){ // Grab first data containing listen-info if proper header was found
|
|
||||||
const linkType = data.match(/((?<=link-type ))([a-z].*?) \(.*?\)(?=,)/i)[0];
|
|
||||||
const linkTypeData = linkType.match(/(\S*) (.*)/i);
|
|
||||||
const linkTypeId = linkTypeData[1];
|
|
||||||
const linkTypeDetail = linkTypeData[2];
|
|
||||||
|
|
||||||
if(linkTypeId !== "IEEE802_11_RADIO"){
|
|
||||||
logger.error(`Interface not in Monitor-mode! (Expected 'IEEE802_11_RADIO', but got '${linkTypeId}')`);
|
|
||||||
shutdown(1, "SIGKILL");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else loggerTcpdump.error(data);
|
else loggerTcpdump.error(data);
|
||||||
});
|
});
|
||||||
@ -130,22 +117,17 @@ if(errorMsg){
|
|||||||
loggerTcpdump.debug(`tcpdump exited code: ${code}`);
|
loggerTcpdump.debug(`tcpdump exited code: ${code}`);
|
||||||
if (code) {
|
if (code) {
|
||||||
loggerTcpdump.fatal(`tcpdump exited with non-zero code: ${code}`);
|
loggerTcpdump.fatal(`tcpdump exited with non-zero code: ${code}`);
|
||||||
if(!exitCode) exitCode = 1; // When exitCode is 0, set to 1
|
exit(1);
|
||||||
}
|
}
|
||||||
logger.info("Shutdown");
|
logger.info("Shutdown");
|
||||||
exit(exitCode);
|
exit(0);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Handle stop-signals for graceful shutdown
|
// Handle stop-signals for graceful shutdown
|
||||||
var exitCode = 0;
|
|
||||||
function shutdownReq() {
|
function shutdownReq() {
|
||||||
logger.info("Shutdown request received..");
|
logger.info("Shutdown request received..");
|
||||||
shutdown();
|
|
||||||
}
|
|
||||||
function shutdown(code, signal = "SIGTERM"){
|
|
||||||
if(code) exitCode = code;
|
|
||||||
logger.debug("Stopping subprocess tcpdump, then exiting myself..");
|
logger.debug("Stopping subprocess tcpdump, then exiting myself..");
|
||||||
proc.kill(signal); // Kill process, then upper event-handler will stop self
|
proc.kill(); // Kill process (send SIGTERM), then upper event-handler will stop self
|
||||||
}
|
}
|
||||||
process.on("SIGTERM", shutdownReq);
|
process.on("SIGTERM", shutdownReq);
|
||||||
process.on("SIGINT", shutdownReq);
|
process.on("SIGINT", shutdownReq);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user