From b5a91b7d04e2170bde7440b3877883c15ece1dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jerry=20Lundstr=C3=B6m?= Date: Wed, 7 Jun 2017 15:48:41 +0200 Subject: [PATCH] Damn the common keyboard sequences... --- src/dns.cpp | 20 ++++++++++---------- src/packetq.cpp | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/dns.cpp b/src/dns.cpp index 9fd1bf8..2179173 100644 --- a/src/dns.cpp +++ b/src/dns.cpp @@ -82,11 +82,11 @@ void Parse_dns::add_packet_columns() add_packet_column("edns0", "", Coltype::_bool, COLUMN_EDNS0); add_packet_column("qr", "", Coltype::_bool, COLUMN_QR); - add_packet_column("edns0_esc", "", Coltype::_bool, COLUMN_EDNS0_ECS); - add_packet_column("edns0_esc_family", "", Coltype::_int, COLUMN_EDNS0_ECS_FAMILY); - add_packet_column("edns0_esc_source", "", Coltype::_int, COLUMN_EDNS0_ECS_SOURCE); - add_packet_column("edns0_esc_scope", "", Coltype::_int, COLUMN_EDNS0_ECS_SCOPE); - add_packet_column("edns0_esc_address", "", Coltype::_text, COLUMN_EDNS0_ECS_ADDRESS); + add_packet_column("edns0_ecs", "", Coltype::_bool, COLUMN_EDNS0_ECS); + add_packet_column("edns0_ecs_family", "", Coltype::_int, COLUMN_EDNS0_ECS_FAMILY); + add_packet_column("edns0_ecs_source", "", Coltype::_int, COLUMN_EDNS0_ECS_SOURCE); + add_packet_column("edns0_ecs_scope", "", Coltype::_int, COLUMN_EDNS0_ECS_SCOPE); + add_packet_column("edns0_ecs_address", "", Coltype::_text, COLUMN_EDNS0_ECS_ADDRESS); } void Parse_dns::add_lookup_tables() @@ -218,11 +218,11 @@ void Parse_dns::on_table_created(Table* table, const std::vector& columns) acc_qname = table->get_accessor("qname"); acc_aname = table->get_accessor("aname"); - acc_edns0_ecs = table->get_accessor("edns0_esc"); - acc_edns0_ecs_family = table->get_accessor("edns0_esc_family"); - acc_edns0_ecs_source = table->get_accessor("edns0_esc_source"); - acc_edns0_ecs_scope = table->get_accessor("edns0_esc_scope"); - acc_edns0_ecs_address = table->get_accessor("edns0_esc_address"); + acc_edns0_ecs = table->get_accessor("edns0_ecs"); + acc_edns0_ecs_family = table->get_accessor("edns0_ecs_family"); + acc_edns0_ecs_source = table->get_accessor("edns0_ecs_source"); + acc_edns0_ecs_scope = table->get_accessor("edns0_ecs_scope"); + acc_edns0_ecs_address = table->get_accessor("edns0_ecs_address"); } Packet::ParseResult Parse_dns::parse(Packet& packet, const std::vector& columns, Row& destination_row, bool sample) diff --git a/src/packetq.cpp b/src/packetq.cpp index c884edb..c49bf5e 100644 --- a/src/packetq.cpp +++ b/src/packetq.cpp @@ -81,11 +81,11 @@ static void usage(char* argv0, bool longversion) " do\n" " edns0\n" " qr\n" - " edns0_esc\n" - " edns0_esc_family\n" - " edns0_esc_source\n" - " edns0_esc_scope\n" - " edns0_esc_address\n" + " edns0_ecs\n" + " edns0_ecs_family\n" + " edns0_ecs_source\n" + " edns0_ecs_scope\n" + " edns0_ecs_address\n" ); }