constcast
/
vermont
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Provide errors on invalid values for protocolIdentifier in aggregators

master
Lothar Braun 2020-04-25 15:40:07 +02:00
parent c947c7c8e1
commit b9d6ea35d9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/ipfix/aggregator/Rules.cpp
View File

@ -111,7 +111,7 @@ int parseModifier(const char* s, Rule::Field::Modifier* modifier) {
* parses the given string
* @return 0 if successful
*/
int parseProtoPattern(char* s, IpfixRecord::Data** fdata, InformationElement::IeLength* length) {
int parseProtoPattern(const char* s, IpfixRecord::Data** fdata, InformationElement::IeLength* length) {
int proto = -1;
if (strcmp(s, "ICMP") == 0) proto = IPFIX_protocolIdentifier_ICMP;
if (strcmp(s, "TCP") == 0) proto = IPFIX_protocolIdentifier_TCP;
@ -121,8 +121,10 @@ int parseProtoPattern(char* s, IpfixRecord::Data** fdata, InformationElement::Ie
if (proto == -1)
{
proto = atoi(s);
if((proto < 0) || (proto > 255)) return -1;
char* end;
errno = 0;
proto = strtol(s, &end, 10);
if(end == s || *end != 0 || errno != 0 || (proto < 0) || (proto > 255)) return -1;
}
*length = 1;

2
src/modules/ipfix/aggregator/Rules.hpp
View File

@ -45,7 +45,7 @@ class Rules {
};
int parseModifier(const char* s, Rule::Field::Modifier* modifier);
int parseProtoPattern(char* s, IpfixRecord::Data** fdata, InformationElement::IeLength* length);
int parseProtoPattern(const char* s, IpfixRecord::Data** fdata, InformationElement::IeLength* length);
int parseIPv4Pattern(char* s, IpfixRecord::Data** fdata, InformationElement::IeLength* length);
int parsePortPattern(char* s, IpfixRecord::Data** fdata, InformationElement::IeLength* length);
int parseTcpFlags(char* s, IpfixRecord::Data** fdata, InformationElement::IeLength* length);