Ticket #239: ip_filter_no_boost-ip_filter_no_boost-fast.patch

src/core/ip_filter.cc

@@ -60 +60 @@
 }
 
 int IpFilter::add_from_file( const std::string& fileName, range_map* rs, str_list* files ) {
-        std::ifstream in( fileName.c_str() );
-        std::string line;
+        FILE *f = fopen(fileName.c_str(),"r");
         int mergeCount = 0;
-
-        if( in.fail() || !in.is_open() )
-                return -1;
-
-        while( in.good() ) {
-                std::getline( in, line );
-                utils::trim( line );
-
-                if( (line[0] == '#') || (line.length() == 0) || (line[0] == 0) )
+        if (f==0) return -1;
+        char *line = (char *)malloc(64);
+        size_t sz=64;
+        int charsread = 0;
+        int linesread=0;
+        while( (charsread=getline(&line,&sz,f)) >=0 ) {
+                if( (line[0] == '#' ) || ( charsread <= 1 ) ) 
                         continue;
-
-                IpRange* ir = IpRange::parse( line );
+                
+                IpRange* ir = IpRange::parse( line, charsread );
                 if( !ir || !ir->get_from() || !ir->get_to() )
                         continue;
 
                 mergeCount += merge_and_insert( rs, ir );
         }
+        free(line);
         files->push_back( std::string(fileName) );
-        in.close();
-
+        fclose(f);
         m_merges += mergeCount;
         return mergeCount;
 }

src/core/ip_range.cc

@@ -48 +48 @@
         return r;
 }
 
+//fast version
+IpRange* IpRange::parse( const char *s, const int size ){
+        static char description[256];
+        static char ip1[24], ip2[24];
+        int pos=0, post=0, enddesc=size-1;
+        while (enddesc>0 && s[enddesc]!=':') enddesc--; //find last ':' in the line
+        while((pos<enddesc) && (unsigned char)s[pos]<=' ') pos++; // strip from start
+        while ((pos<enddesc)){
+          if (post<255) description[post++]=s[pos];
+          pos++;
+        } 
+        description[post]=0;
+        if (s[pos]==':') pos++;
+          post=0;
+          while ((pos<size) && s[pos]!='-'){
+            if (post<23) ip1[post++]=s[pos];
+            pos++;
+          } 
+          ip1[post]=0;
+          if (s[pos]=='-'){
+            pos++;
+            post=0;
+                while ((pos<size) && s[pos]>' '){
+              if (post<23) ip2[post++]=s[pos];
+              pos++;
+                }
+                ip2[post]=0;
+          } else ip2[0]=0;
+
+        IpAddress*      from            = IpAddress::parse(ip1);
+        IpAddress*      to            = IpAddress::parse(ip2);
+
+        if( !from ) {
+                std::cout << "!! from is invalid: description='" << description << ", ip1=" << ip1 << ", ip2=" << ip2 << std::endl;
+                return NULL;
+        }
+        if( !to ) {
+                std::cout << "!! to is invalid: description='" << description << ", ip1=" << ip1 << ", ip2=" << ip2 << std::endl;
+                return NULL;
+        }
+
+        IpRange* r = new IpRange();
+        r->m_description        = description;
+        r->m_from               = from;
+        r->m_to                 = to;
+
+        if( (*to < *from) ) {
+                std::cout << "!! to < from: " << r->to_string() << std::endl;
+                delete r;
+                return NULL;
+        }
+        
+        return r;
+}
+
 std::string IpRange::to_string() const {
         std::stringstream result;
         result << m_description << ": [" << m_from->to_string() << " - " << m_to->to_string() << ']';

src/core/ip_range.h

@@ -30 +30 @@
         public: // static methods
                 typedef IpRange* ptr;
                 static IpRange* parse( const std::string& s );
+                static IpRange* parse( const char *s, const int size );
         
         public: // dynamic methods
                 IpRange( IpRange& rng ) { copy(rng); }