X-Git-Url: http://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=parsehosts.c;h=8c9eca159c6d1b3304f8e45342c1c04d2eeaced9;hp=47b06bd5c28925d6495e7ddf20ca6065311a98e4;hb=dba7666bdacf8846560e5414b6c9535434e98f8b;hpb=bf59a20b46290db34e1761926a39ee68164d636b;ds=sidebyside

diff --git a/parsehosts.c b/parsehosts.c
index 47b06bd..8c9eca1 100644
--- a/parsehosts.c
+++ b/parsehosts.c
@@ -11,7 +11,9 @@ extern struct IP *ips, *ip, *sharedip, *networks;
 extern struct Group *groups, *group;
 extern struct Keyword *keyword, *defaultkeyword, *keywords;
 extern struct Macro *macro, *macros;
+extern struct Textfile *previous_classmap, *textline;
 extern int class_count;
+extern int mix_new_hosts;
 extern int ip_count;
 extern int found_lmsid;
 extern int free_min;
@@ -342,7 +344,23 @@ void parse_hosts(char *hosts)
       }
      }
 
-     ip->mark = FIRSTIPCLASS+1+class_count++;     
+     if(mix_new_hosts)
+      for_each(textline, previous_classmap)
+      {
+       ptr = strchr(textline->str, ' ');
+       if(ptr)
+       {
+        if(!strncmp(ip->addr, textline->str, ptr-textline->str))
+        {
+         ip->mark = atoi(ptr+1);
+         printf("Match class: %s %d\n", ip->addr, ip->mark);
+        }
+       }      
+      }
+     
+     if(!mix_new_hosts || !ip->mark)
+      ip->mark = FIRSTIPCLASS+1+class_count++;
+          
      update_network(ip->addr, ip);
 
      if_exists(group,groups,(group->min == ip->min))