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

Implemented PacketType Disassociation

Browse Source
This commit is contained in:
Ruakij 2021-11-24 22:35:07 +01:00
parent fe5dec7860
commit d2178f3b73
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/dto/Packet.js
View File

@ -12,6 +12,7 @@ const PacketType = {
Authentication: 'Authentication',
AssociationRequest: 'AssociationRequest',
AssociationResponse: 'AssociationResponse',
Disassociation: 'Disassociation',
Unknown: 'Unknown'
}
@ -58,6 +59,10 @@ class AssociationResponsePacket extends Packet{
associationIsSuccessful;
}
class DisassociationPacket extends Packet{
disassociationReason;
}
// Specify exports
module.exports = {
PacketType,

8
src/streamHandler/PacketStreamFactory.js
View File

@ -1,7 +1,7 @@
const logger = require.main.require("./helper/logger.js")("PacketStreamFactory");
const { Transform } = require('stream');
const { DateTime } = require("luxon");
const { PacketType, Packet, PacketWithSSID, BeaconPacket, ProbeRequestPacket, ProbeResponsePacket, AuthenticationPacket, AuthenticationType, AssociationResponsePacket } = require.main.require('./dto/Packet.js');
const { PacketType, Packet, PacketWithSSID, BeaconPacket, ProbeRequestPacket, ProbeResponsePacket, AuthenticationPacket, AuthenticationType, AssociationResponsePacket, DisassociationPacket } = require.main.require('./dto/Packet.js');
const PACKET_TYPE_MAP = {
"Beacon": PacketType.Beacon,
@ -16,6 +16,7 @@ const PACKET_TYPE_MAP = {
"Authentication": PacketType.Authentication,
"Assoc Request": PacketType.AssociationRequest,
"Assoc Response": PacketType.AssociationResponse,
"Disassociation:": PacketType.Disassociation,
};
const PACKET_TYPES_REGEX = Object.keys(PACKET_TYPE_MAP).join('|');
@ -92,6 +93,11 @@ class PacketStreamFactory extends Transform{
newPacket = new AssociationResponsePacket();
newPacket.associationIsSuccessful = data.match(/Assoc Response\s.{0,30}Successful(?=\s|$)/img) ? true : false;
break;
case PacketType.Disassociation:
newPacket = new DisassociationPacket();
newPacket.disassociationReason = data.match(/(?<=(^|\s)Disassociation:\s).*?(?=\sBSS|$)/img)?.[0] ?? null;
break;
}
if(newPacket) packet = Object.assign(new newPacket, packet); // Use new, more specific, packet and copy old data over
}