netplaySniff – Diff between revs 9 and 10

Subversion Repositories:

?pathlinks?

Rev 9 – Rev 11 – Go to most recent revision – Details – Blame – Last modification – View Log

 const { exec } = require("child_process")
 const Inotify = require('inotify-remastered').Inotify
 const inotify = new Inotify()
 const sqlite = require('sqlite3')
 const { Command } = require('commander')
+const net = require('net')
 // set up logger
 const logger = createLogger({
     format: format.combine(
             timestamp: true
         }),
         new transports.File(
+            {
                 timestamp: true,
-                filename: path.join(path.dirname(fs.realpathSync(__filename)), "log/netplaySniff.log")
+                filename: path.join(path.dirname(fs.realpathSync(__filename)), 'log/netplaySniff.log')
+            }
+        )
+    ]
 })
     .command('run')
     .option('-c, --config <path>', 'path to the configuration file', 'config.yml')
     .option('-d, --database <path>', 'the path where to store a database', 'db/players.db')
     .description('run the program as a daemon')
     .action((options) => {
-        logger.info(`running as a daemon with configuraton options from ${options.config} and database at ${options.database}`)
+        logger.info(`running as a daemon with configuration from ${options.config} and database at ${options.database}`)
+        // load configuration file.
         var config = YAML.load(options.config)
         // Watch the configuration file for changes.
-        const configWatch = inotify.addWatch({
+        inotify.addWatch({
             path: options.config,
             watch_for: Inotify.IN_MODIFY,
             callback: function (event) {
-                logger.info(`Reloading configuration file config.yml`)
-                config = YAML.load(options.config)
+                logger.info(`Reloading configuration file config.yml`)
-                config.db.file = options.database
+                config = YAML.load(options.config)
-            }
-        })
-        // load configuration file.
-        var config = YAML.load(options.config)
         // override configuration options with command-line options
-        config.db.file = options.database
+        })
         const mqttClient = mqtt.connect(config.mqtt.connect)
             logger.error(`MQTT ${error}`)
             console.log(error)
         })
+        // set up packet capture
+        logger.info(`setting up packet capture`)
         // set up packet capture
-        const cap = new Cap()
-        let device = {}
-        switch (config.router) {
-            case 'any':
-                device = config.router
-                break;
-            default:
-                device = Cap.findDevice(`${config.router}`)
-                break;
-        }
+        const cap = new Cap()
-        const filter = `tcp and dst port ${config.netplay.port} and dst host ${config.netplay.host}`
+        const filter = `tcp and dst port ${config.netplay.port}`
         const bufSize = 10 * 1024 * 1024
         const buffer = Buffer.alloc(65535)
-        const linkType = cap.open(device, filter, bufSize, buffer)
+        const linkType = cap.open('any', filter, bufSize, buffer)
         cap.setMinBytes && cap.setMinBytes(0)
-        cap.on('packet', (bytes, truncated) => processPacket(bytes, truncated, config, mqttClient))
+        cap.on('packet', () => {
-        let netplay = {}
+            let netplay = {}
-        if (linkType !== 'ETHERNET') {
-            return
-        }
-        var ret = decoders.Ethernet(buffer)
-        if (ret.info.type !== PROTOCOL.ETHERNET.IPV4) {
-            return
-        }
-        ret = decoders.IPV4(buffer, ret.offset)
-        netplay.ip = ret.info.srcaddr
-        if (ret.info.protocol !== PROTOCOL.IP.TCP) {
+            if (linkType !== 'ETHERNET') {
-            return
+                return
-        }
-        var dataLength = ret.info.totallen - ret.hdrlen
-        ret = decoders.TCP(buffer, ret.offset)
-        dataLength -= ret.hdrlen
+            }
+            var ret = decoders.Ethernet(buffer)
+            if (ret.info.type !== PROTOCOL.ETHERNET.IPV4) {
+                return
+            }
-        var payload = buffer.subarray(ret.offset, ret.offset + dataLength)
+            ret = decoders.IPV4(buffer, ret.offset)
+            netplay.ip = ret.info.srcaddr
+            netplay.to = ret.info.dstaddr
-        // look for the NETPLAY_CMD_NICK in "netplay_private.h" data marker.
+            if (ret.info.protocol !== PROTOCOL.IP.TCP) {
-        if (payload.indexOf('0020', 0, "hex") !== 2) {
-            return
-        }
+                logger.info(`not a tcp protocol`)
-        // remove NULL and NETPLAY_CMD_NICK
+                return
+            }
-        netplay.nick = payload.toString().replace(/[\u0000\u0020]+/gi, '')
-        netplay.hash = shortHash(`${netplay.nick}${netplay.ip}`)
+            var dataLength = ret.info.totallen - ret.hdrlen
-        netplay.time = new Date().toISOString()
             ret = decoders.TCP(buffer, ret.offset)
-        logger.info(`Player ${netplay.nick} joined via IP ${netplay.ip}`);
+            dataLength -= ret.hdrlen
+            var payload = buffer.subarray(ret.offset, ret.offset + dataLength)
+            // look for the NETPLAY_CMD_NICK in "netplay_private.h" data marker.
+            if (payload.indexOf('0020', 0, "hex") !== 2) {
+                return
+            }
+            // remove NULL and NETPLAY_CMD_NICK
-        const db = new sqlite.Database(config.db.file, sqlite.OPEN_CREATE | sqlite.OPEN_READWRITE | sqlite.OPEN_FULLMUTEX, (error) => {
+            netplay.nick = payload.toString().replace(/[\u0000\u0020]+/gi, '')
-            if (error) {
+            netplay.hash = shortHash(`${netplay.nick}${netplay.ip}`)
-                logger.error(`failed to open database: ${error}`)
+            netplay.time = new Date().toISOString()
                 return
+            logger.info(`Player ${netplay.nick} joined via IP ${netplay.ip}`);
-            }
             const db = new sqlite.Database(config.db.file, sqlite.OPEN_CREATE | sqlite.OPEN_READWRITE | sqlite.OPEN_FULLMUTEX, (error) => {
-            db.run(`CREATE TABLE IF NOT EXISTS "players" ("nick" TEXT(15) NOT NULL, "ip" TEXT NOT NULL)`, (error, result) => {
+                if (error) {
-                if (error) {
+                    logger.error(`failed to open database: ${config.db.file}`)
-                    logger.error(`could not create database table: ${error}`);
+                    return
+                }
+                db.run(`CREATE TABLE IF NOT EXISTS "players" ("nick" TEXT(15) NOT NULL, "ip" TEXT NOT NULL)`, (error, result) => {
+                    if (error) {
+                        logger.error(`could not create database table: ${error}`);
-                    return
+                        return
+                    }
                     db.run(`INSERT INTO "players" ("nick", "ip") VALUES ($nick, $ip)`, { $nick: netplay.nick, $ip: netplay.ip }, (error) => {
-                db.run(`INSERT INTO "players" ("nick", "ip") VALUES ($nick, $ip)`, { $nick: netplay.nick, $ip: netplay.ip }, (error) => {
+                        if (error) {
-                    if (error) {
-                        logger.error(`could not insert player and IP into database: ${error}`)
-                        return
-                    }
-                    logger.info(`player added to database`)
-                })
-            })
+                            logger.error(`could not insert player and IP into database: ${error}`)
-        })
+                            return
-        // send data to MQTT server
+                        }
-        const data = JSON.stringify(netplay, null, 4)
-        mqttClient.publish(`${config.mqtt.topic}`, data, (error, packet) => {
-            logger.info(`player data sent to MQTT broker`)
-        })
-        // ban by nick.
-        let nickBanSet = new Set(config.bans.nicknames)
-        if (nickBanSet.has(netplay.nick)) {
-            logger.info(`nick found to be banned: ${netplay.nick}`)
-            exec(`iptables -t mangle -A PREROUTING -p tcp --src ${netplay.ip} --dport ${config.netplay.port} -j DROP`, (error, stdout, stderr) => {
-                if (error) {
-                    logger.error(`Error returned while banning connecting client ${error.message}`)
-                    return
                         logger.info(`player added to database`)
+                    })
+                })
+            })
+            // send data to MQTT server
+            const data = JSON.stringify(netplay, null, 4)
+            mqttClient.publish(`${config.mqtt.topic}`, data, (error, packet) => {
+                logger.info(`player data sent to MQTT broker`)
+            })
+            // ban by nick.
+            let nickBanSet = new Set(config.bans.nicknames)
+            if (nickBanSet.has(netplay.nick)) {
+                logger.info(`nick found to be banned: ${netplay.nick}`)
+                exec(`iptables -t mangle -A PREROUTING -p tcp --src ${netplay.ip} --dport ${config.netplay.port} -j DROP`, (error, stdout, stderr) => {
+                    if (error) {
+                        logger.error(`Error returned while banning connecting client ${error.message}`)
+                        return
+                    }
+                    if (stderr) {
-                if (stderr) {
+                        logger.error(`Standard error returned ${stderr}`)
-                    logger.error(`Standard error returned ${stderr}`)
+                        return
                     return