Merge pull request #2839 from martinhsv/v3/master

Support comments in ipMatchFromFile file via '#' token

Author: martinhsv

Diff for: CHANGES

@@ -1,6 +1,8 @@
 v3.x.y - YYYY-MMM-DD (to be released)
 -------------------------------------
 
+  - Support comments in ipMatchFromFile file via '#' token
+    [Issue #2554 - @tomsommer, @martinhsv]
   - Use name package name libmaxminddb with pkg-config
     [Issue #2595, #2596 - @frankvanbever, @ffontaine, @arnout]
   - Fix: FILES_TMP_CONTENT collection key should use part name

Diff for: src/utils/ip_tree.cc

@@ -88,6 +88,10 @@ IpTree::~IpTree() {
 bool IpTree::addFromBuffer(std::istream *ss, std::string *error) {
     char *error_msg = NULL;
     for (std::string line; std::getline(*ss, line); ) {
+        size_t comment_start = line.find('#');
+        if (comment_start != std::string::npos) {
+            line = line.substr(0, comment_start);
+        }
         int res = add_ip_from_param(line.c_str(), &m_tree, &error_msg);
         if (res != 0) {
             if (error_msg != NULL) {

Diff for: test/test-cases/data/ipMatchFromFile.txt

@@ -1,4 +1,5 @@
 127.0.0.1
+# Comment line
 10.10.10.1
 ::1
 200.249.12.31