diff --git a/modules/fieldClassifier/README.md b/modules/fieldClassifier/README.md index c4693ca..f7403a3 100644 --- a/modules/fieldClassifier/README.md +++ b/modules/fieldClassifier/README.md @@ -82,6 +82,10 @@ module takes the following parameters: * Specify if the geolocation should be done for source, destination or both IP addresses. Possible values are `src`, `dst` or `both`. Default is `both`. +* `-c`, `--cacheCapacity` number + + * Specify the capacity of the internal cache (number of entries). Default is `4000`. + ## Geolite parameters * `--pathGeolite` path diff --git a/modules/fieldClassifier/src/fieldClassifier.cpp b/modules/fieldClassifier/src/fieldClassifier.cpp index 10b84fd..123995d 100644 --- a/modules/fieldClassifier/src/fieldClassifier.cpp +++ b/modules/fieldClassifier/src/fieldClassifier.cpp @@ -12,8 +12,6 @@ #include "plugins/plugin.hpp" #include -extern int g_debug_level; - namespace NFieldClassifier { void FieldClassifier::handleParams(int argc, char** argv, argparse::ArgumentParser& parser) { @@ -412,13 +410,9 @@ void FieldClassifier::fillInputFieldsToOutput( break; } case DataType::BYTES: { - // Nemea::UnirecArray const arr - // = input->getFieldAsUnirecArray(fieldId); - // output->setFieldFromUnirecArray(arr, fieldId); - - // std::byte value = input->getFieldAsType(fieldId); - // output->setFieldFromType(value, fieldId); - + Nemea::UnirecArray const arr + = input->getFieldAsUnirecArray(fieldId); + output->setFieldFromUnirecArray(arr, fieldId); break; } case DataType::A_INT8: { diff --git a/modules/fieldClassifier/src/plugins/asn.cpp b/modules/fieldClassifier/src/plugins/asn.cpp index 56280f2..98ad30a 100644 --- a/modules/fieldClassifier/src/plugins/asn.cpp +++ b/modules/fieldClassifier/src/plugins/asn.cpp @@ -30,7 +30,7 @@ void ASN::storeParameters(argparse::ArgumentParser& parser) FieldDefinition ASN::defineFields() { // list of all fields provided by this plugin - FieldDefinition allFields = {{"ASN", DataType::UINT16}, {"ASO", DataType::STRING}}; + FieldDefinition allFields = {{"ASN", DataType::UINT32}, {"ASO", DataType::STRING}}; return allFields; } @@ -53,7 +53,7 @@ bool ASN::getData(DataMap& dataMap, std::string& ipAddr) } if (dataMap.find("ASN") != dataMap.end()) { err = MMDB_get_value(&result.entry, &entryData, "autonomous_system_number", NULL); - dataMap.at("ASN") = checkEntryData() ? entryData.uint16 : EMPTY_UINT16; + dataMap.at("ASN") = checkEntryData() ? entryData.uint32 : EMPTY_UINT16; } if (dataMap.find("ASO") != dataMap.end()) { err = MMDB_get_value(&result.entry, &entryData, "autonomous_system_organization", NULL);