(filter_domain): Removed code which stripped of a port number from the host name. The "host" variable will _always_ be just the name by the time filter_domain() is called.

This commit is contained in:
Robert James Kaes 2002-06-06 20:30:04 +00:00
parent 06d38ce529
commit 0242d89877

View File

@ -1,4 +1,4 @@
/* $Id: filter.c,v 1.11 2002-05-27 01:56:22 rjkaes Exp $ /* $Id: filter.c,v 1.12 2002-06-06 20:30:04 rjkaes Exp $
* *
* Copyright (c) 1999 George Talusan (gstalusan@uwaterloo.ca) * Copyright (c) 1999 George Talusan (gstalusan@uwaterloo.ca)
* Copyright (c) 2002 James E. Flemer (jflemer@acm.jhu.edu) * Copyright (c) 2002 James E. Flemer (jflemer@acm.jhu.edu)
@ -21,6 +21,7 @@
#include "filter.h" #include "filter.h"
#include "heap.h" #include "heap.h"
#include "log.h"
#include "regexp.h" #include "regexp.h"
#include "reqs.h" #include "reqs.h"
@ -133,27 +134,18 @@ int
filter_domain(const char *host) filter_domain(const char *host)
{ {
struct filter_list *p; struct filter_list *p;
char *s, *port;
int result; int result;
if (!fl || !already_init) if (!fl || !already_init)
return (0); return (0);
/* strip off the port number */
s = safestrdup(host);
port = strchr(s, ':');
if (port)
*port = '\0';
result = 0; result = 0;
for (p = fl; p; p = p->next) { for (p = fl; p; p = p->next) {
result = !regexec(p->cpat, s, (size_t) 0, (regmatch_t *) 0, 0); result = !regexec(p->cpat, host, (size_t) 0, (regmatch_t *) 0, 0);
if (result) if (result)
break; break;
} }
safefree(s);
return (result); return (result);
} }