@@ -464,10 +464,11 @@ header_size = ip_header_length * 4; /* We're not handling IPV6 packets yet. I'll probably rewrite * this whole damned thing in C++ first. */ if (version != 4) { + DEBUG(2, "IPV6 packet received and ignored."); return -1; } /* IP Address Bytes 13 - 16 of IP header */ ip->b1 = payload[12]; @@ -592,23 +593,23 @@ fprintf(stderr, "queueno negative - using default"); } config_setting = config_lookup(config, "blacklistbl"); if (config_setting != NULL) { - parse_config_bl_list(config_setting, 1); + parse_config_bl_list(config_setting, TYPE_BLACKLISTBL); } config_setting = config_lookup(config, "whitelistbl"); if (config_setting != NULL) { - parse_config_bl_list(config_setting, 2); + parse_config_bl_list(config_setting, TYPE_WHITELISTBL); } config_setting = config_lookup(config, "blacklist"); if (config_setting != NULL) { - parse_config_bl_list(config_setting, 3); + parse_config_bl_list(config_setting, TYPE_BLACKLIST); } config_setting = config_lookup(config, "whitelist"); if (config_setting != NULL) { - parse_config_bl_list(config_setting, 4); + parse_config_bl_list(config_setting, TYPE_WHITELIST); } } parse_config_bl_list(config_setting_t *c, int type) { @@ -643,26 +644,26 @@ #endif i++; switch (type) { - case 1: + case TYPE_BLACKLISTBL: if (conf.blacklistbl == NULL) { conf.blacklistbl = ce; continue; } else { tmp = conf.blacklistbl; } break; - case 2: + case TYPE_WHITELISTBL: if (conf.whitelistbl == NULL) { conf.whitelistbl = ce; continue; } else { tmp = conf.whitelistbl; } - case 3: + case TYPE_BLACKLIST: fprintf(stderr, "got %s for blacklist\n", ce->string); if (parse_cidr(ce) == -1) { fprintf(stderr, "Error parsing CIDR in %s, ignoring\n", ce->string); free(ce->string); free(ce); @@ -673,11 +674,11 @@ continue; } else { tmp = conf.blacklist; } break; - case 4: + case TYPE_WHITELIST: if (parse_cidr(ce) == -1) { fprintf(stderr, "Error parsing CIDR in %s, ignoring\n", ce->string); free(ce->string); free(ce); continue;