Ruakij/rfmon-to-influx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replaced MoreData and isRetry with flags

Browse Source
This commit is contained in:
Ruakij 2021-11-25 01:37:35 +01:00
parent 21e4ff1a66
commit a1ce7a848b
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dto/Packet.js
View File

@ -3,7 +3,6 @@ const PacketType = {
ProbeRequest: 'ProbeRequest', ProbeRequest: 'ProbeRequest',
ProbeResponse: 'ProbeResponse', ProbeResponse: 'ProbeResponse',
Data: 'Data', Data: 'Data',
MoreData: 'MoreData',
RequestToSend: 'RequestToSend', RequestToSend: 'RequestToSend',
ClearToSend: 'ClearToSend', ClearToSend: 'ClearToSend',
Acknowledgment: 'Acknowledgment', Acknowledgment: 'Acknowledgment',
@ -17,9 +16,19 @@ const PacketType = {
Unknown: 'Unknown' Unknown: 'Unknown'
} }
const FlagType = {
MoreFragments: "MoreFragments",
Retry: "Retry",
PwrMgt: "PwrMgt",
MoreData: "MoreData",
Protected: "Protected",
Order: "Order"
}
class Packet{ class Packet{
timestampMicros; timestampMicros;
isRetry;
flags = {};
srcMac; srcMac;
dstMac; dstMac;
@ -80,6 +89,7 @@ class HandshakePacket extends Packet{
// Specify exports // Specify exports
module.exports = { module.exports = {
PacketType, PacketType,
FlagType,
Packet, Packet,
PacketWithSSID, PacketWithSSID,
BeaconPacket, BeaconPacket,

18
src/streamHandler/PacketStreamFactory.js
View File

@ -1,7 +1,7 @@
const logger = require.main.require("./helper/logger.js")("PacketStreamFactory"); const logger = require.main.require("./helper/logger.js")("PacketStreamFactory");
const { Transform } = require('stream'); const { Transform } = require('stream');
const { DateTime } = require("luxon"); const { DateTime } = require("luxon");
const { PacketType, Packet, PacketWithSSID, BeaconPacket, ProbeRequestPacket, ProbeResponsePacket, AuthenticationPacket, AuthenticationType, AssociationResponsePacket, DisassociationPacket, HandshakePacket, HandshakeStage } = require.main.require('./dto/Packet.js'); const { PacketType, FlagType, Packet, PacketWithSSID, BeaconPacket, ProbeRequestPacket, ProbeResponsePacket, AuthenticationPacket, AuthenticationType, AssociationResponsePacket, DisassociationPacket, HandshakePacket, HandshakeStage } = require.main.require('./dto/Packet.js');
const hexConv = require.main.require("./helper/hexConverter.js"); const hexConv = require.main.require("./helper/hexConverter.js");
const PACKET_TYPE_MAP = { const PACKET_TYPE_MAP = {
@ -9,7 +9,6 @@ const PACKET_TYPE_MAP = {
"Probe Request": PacketType.ProbeRequest, "Probe Request": PacketType.ProbeRequest,
"Probe Response": PacketType.ProbeResponse, "Probe Response": PacketType.ProbeResponse,
"Data": PacketType.Data, "Data": PacketType.Data,
"More Data": PacketType.MoreData,
"Request-To-Send": PacketType.RequestToSend, "Request-To-Send": PacketType.RequestToSend,
"Clear-To-Send": PacketType.ClearToSend, "Clear-To-Send": PacketType.ClearToSend,
"Acknowledgment": PacketType.Acknowledgment, "Acknowledgment": PacketType.Acknowledgment,
@ -27,6 +26,14 @@ const AUTHENTICATION_TYPE_MAP = {
"(Open System)-2": AuthenticationType.OpenSystem_2, "(Open System)-2": AuthenticationType.OpenSystem_2,
} }
const FLAG_TYPE_MAP = {
"Retry": FlagType.Retry,
"Pwr Mgmt": FlagType.PwrMgt,
"More Data": FlagType.MoreData,
"Protected": FlagType.Protected,
}
const FLAG_TYPE_MAPS_REGEX = Object.keys(FLAG_TYPE_MAP).join('|');
/** /**
* Read data from text-blocks and convert them to Packet * Read data from text-blocks and convert them to Packet
*/ */
@ -59,7 +66,10 @@ class PacketStreamFactory extends Transform{
// Convert time to epoch-micros Unfortunately luxon doesnt use micros, but millis as smallest time-unit requiring some "hacks" // Convert time to epoch-micros Unfortunately luxon doesnt use micros, but millis as smallest time-unit requiring some "hacks"
packet.timestampMicros = DateTime.fromISO(data.slice(0, 12)).toSeconds() + data.slice(12, 15)/1000000; packet.timestampMicros = DateTime.fromISO(data.slice(0, 12)).toSeconds() + data.slice(12, 15)/1000000;
packet.isRetry = data.match(/(?<=^|\s)Retry(?=$|\s)/i)? true: false; // Find flags
data.match(data.match(new RegExp('(?<=^|\\s)('+ FLAG_TYPE_MAPS_REGEX +')(?=$|\\s)', 'ig'))
?.forEach(match => packet.flags[FLAG_TYPE_MAP[match]] = true) // Set them to true in flags
);
packet.dataRate = Number(data.match(/(?<=^|\s)[0-9]+(\.[0-9]+)?(?=\sMb\/?s($|\s))/i)?.[0]) || null; packet.dataRate = Number(data.match(/(?<=^|\s)[0-9]+(\.[0-9]+)?(?=\sMb\/?s($|\s))/i)?.[0]) || null;
packet.frequency = Number(data.match(/(?<=^|\s)[0-9]{4}(?=\sMHz($|\s))/i)?.[0]) || null; packet.frequency = Number(data.match(/(?<=^|\s)[0-9]{4}(?=\sMHz($|\s))/i)?.[0]) || null;
@ -72,7 +82,7 @@ class PacketStreamFactory extends Transform{
packet.packetType = packetTypeStr? PACKET_TYPE_MAP[packetTypeStr]: packet.packetType = packetTypeStr? PACKET_TYPE_MAP[packetTypeStr]:
data.match(/(SA|TA|DA|RA|BSSID):.{17}\s*$/i)? PacketType.NoData: data.match(/(SA|TA|DA|RA|BSSID):.{17}\s*$/i)? PacketType.NoData:
PacketType.Unknown; PacketType.Unknown;
packet.srcMac = data.match(/(?<=(^|\s)(SA|TA):).{17}(?=$|\s)/i)?.[0] ?? null; packet.srcMac = data.match(/(?<=(^|\s)(SA|TA):).{17}(?=$|\s)/i)?.[0] ?? null;
packet.dstMac = data.match(/(?<=(^|\s)(DA|RA):).{17}(?=$|\s)/i)?.[0] ?? null; packet.dstMac = data.match(/(?<=(^|\s)(DA|RA):).{17}(?=$|\s)/i)?.[0] ?? null;