-const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.76 2013/11/24 14:22:51 fabiankeil Exp $";
+const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.79 2013/11/24 14:25:55 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/urlmatch.c,v $
*regex = zalloc(sizeof(**regex));
if (NULL == *regex)
{
- free_url_spec(url);
+ free_pattern_spec(url);
return JB_ERR_MEMORY;
}
rebuf[errlen] = '\0';
log_error(LOG_LEVEL_ERROR, "error compiling %s from %s: %s",
pattern, url->spec, rebuf);
- free_url_spec(url);
+ free_pattern_spec(url);
return JB_ERR_PARSE;
}
*/
if (host_pattern[strlen(host_pattern) - 1] == '.')
{
- url->unanchored |= ANCHOR_RIGHT;
+ url->pattern.url_spec.unanchored |= ANCHOR_RIGHT;
}
if (host_pattern[0] == '.')
{
- url->unanchored |= ANCHOR_LEFT;
+ url->pattern.url_spec.unanchored |= ANCHOR_LEFT;
}
/*
* Split domain into components
*/
- url->dbuffer = strdup_or_die(host_pattern);
+ url->pattern.url_spec.dbuffer = strdup_or_die(host_pattern);
/*
* Map to lower case
*/
- for (p = url->dbuffer; *p ; p++)
+ for (p = url->pattern.url_spec.dbuffer; *p ; p++)
{
*p = (char)privoxy_tolower(*p);
}
/*
* Split the domain name into components
*/
- url->dcount = ssplit(url->dbuffer, ".", v, SZ(v));
+ url->pattern.url_spec.dcount = ssplit(url->pattern.url_spec.dbuffer, ".", v, SZ(v));
- if (url->dcount < 0)
+ if (url->pattern.url_spec.dcount < 0)
{
- free_url_spec(url);
+ free_pattern_spec(url);
return JB_ERR_PARSE;
}
- else if (url->dcount != 0)
+ else if (url->pattern.url_spec.dcount != 0)
{
/*
* Save a copy of the pointers in dvec
*/
- size = (size_t)url->dcount * sizeof(*url->dvec);
+ size = (size_t)url->pattern.url_spec.dcount * sizeof(*url->pattern.url_spec.dvec);
- url->dvec = malloc_or_die(size);
+ url->pattern.url_spec.dvec = malloc_or_die(size);
- memcpy(url->dvec, v, size);
+ memcpy(url->pattern.url_spec.dvec, v, size);
}
/*
* else dcount == 0 in which case we needn't do anything,
* Function : domain_match
*
* Description : Domain-wise Compare fqdn's. Governed by the bimap in
- * pattern->unachored, the comparison is un-, left-,
+ * p.pattern->unachored, the comparison is un-, left-,
* right-anchored, or both.
* The individual domain names are compared with
* simplematch().
*
* Parameters :
- * 1 : pattern = a domain that may contain a '*' as a wildcard.
+ * 1 : p = a domain that may contain a '*' as a wildcard.
* 2 : fqdn = domain name against which the patterns are compared.
*
* Returns : 0 => domains are equivalent, else no match.
*
*********************************************************************/
-static int domain_match(const struct pattern_spec *pattern, const struct http_request *fqdn)
+static int domain_match(const struct pattern_spec *p, const struct http_request *fqdn)
{
char **pv, **fv; /* vectors */
int plen, flen;
- int unanchored = pattern->unanchored & (ANCHOR_RIGHT | ANCHOR_LEFT);
+ int unanchored = p->pattern.url_spec.unanchored & (ANCHOR_RIGHT | ANCHOR_LEFT);
- plen = pattern->dcount;
+ plen = p->pattern.url_spec.dcount;
flen = fqdn->dcount;
if (flen < plen)
return 1;
}
- pv = pattern->dvec;
+ pv = p->pattern.url_spec.dvec;
fv = fqdn->dvec;
if (unanchored == ANCHOR_LEFT)
/*********************************************************************
*
- * Function : create_url_spec
+ * Function : create_pattern_spec
*
- * Description : Creates a "url_spec" structure from a string.
- * When finished, free with free_url_spec().
+ * Description : Creates a "pattern_spec" structure from a string.
+ * When finished, free with free_pattern_spec().
*
* Parameters :
- * 1 : url = Target url_spec to be filled in. Will be
- * zeroed before use.
+ * 1 : pattern = Target pattern_spec to be filled in.
+ * Will be zeroed before use.
* 2 : buf = Source pattern, null terminated. NOTE: The
* contents of this buffer are destroyed by this
* function. If this function succeeds, the
- * buffer is copied to url->spec. If this
+ * buffer is copied to pattern->spec. If this
* function fails, the contents of the buffer
* are lost forever.
*
* written to system log)
*
*********************************************************************/
-jb_err create_url_spec(struct pattern_spec *url, char *buf)
+jb_err create_pattern_spec(struct pattern_spec *pattern, char *buf)
{
- assert(url);
+ static const struct
+ {
+ /** The tag pattern prefix to match */
+ const char *prefix;
+
+ /** The length of the prefix to match */
+ const size_t prefix_length;
+
+ /** The pattern flag */
+ const unsigned flag;
+ } tag_pattern[] = {
+ { "TAG:", 4, PATTERN_SPEC_TAG_PATTERN},
+ { "NO-REQUEST-TAG:", 15, PATTERN_SPEC_NO_REQUEST_TAG_PATTERN},
+ { "NO-RESPONSE-TAG:", 16, PATTERN_SPEC_NO_RESPONSE_TAG_PATTERN}
+ };
+ int i;
+
+ assert(pattern);
assert(buf);
- memset(url, '\0', sizeof(*url));
+ memset(pattern, '\0', sizeof(*pattern));
/* Remember the original specification for the CGI pages. */
- url->spec = strdup_or_die(buf);
+ pattern->spec = strdup_or_die(buf);
- /* Is it a positive tag pattern? */
- if (0 == strncmpic(url->spec, "TAG:", 4))
- {
- /* The pattern starts with the first character after "TAG:" */
- const char *tag_pattern = buf + 4;
- url->flags |= PATTERN_SPEC_TAG_PATTERN;
- return compile_pattern(tag_pattern, NO_ANCHORING, url, &url->pattern.tag_regex);
- }
- /* Is it a negative tag pattern? */
- if (0 == strncmpic(url->spec, "NO-REQUEST-TAG:", 15))
- {
- /* The pattern starts with the first character after "NO-REQUEST-TAG:" */
- const char *tag_pattern = buf + 15;
- url->flags |= PATTERN_SPEC_NO_REQUEST_TAG_PATTERN;
- return compile_pattern(tag_pattern, NO_ANCHORING, url, &url->pattern.tag_regex);
- }
- if (0 == strncmpic(url->spec, "NO-RESPONSE-TAG:", 16))
+ /* Check if it's a tag pattern */
+ for (i = 0; i < SZ(tag_pattern); i++)
{
- /* The pattern starts with the first character after "NO-RESPONSE-TAG:" */
- const char *tag_pattern = buf + 16;
- url->flags |= PATTERN_SPEC_NO_RESPONSE_TAG_PATTERN;
- return compile_pattern(tag_pattern, NO_ANCHORING, url, &url->pattern.tag_regex);
- }
+ if (0 == strncmpic(pattern->spec, tag_pattern[i].prefix, tag_pattern[i].prefix_length))
+ {
+ /* The regex starts after the prefix */
+ const char *tag_regex = buf + tag_pattern[i].prefix_length;
+
+ pattern->flags |= tag_pattern[i].flag;
- url->flags |= PATTERN_SPEC_URL_PATTERN;
+ return compile_pattern(tag_regex, NO_ANCHORING, pattern,
+ &pattern->pattern.tag_regex);
+ }
+ }
/* If it isn't a tag pattern it must be an URL pattern. */
- return compile_url_pattern(url, buf);
+ pattern->flags |= PATTERN_SPEC_URL_PATTERN;
+
+ return compile_url_pattern(pattern, buf);
+
}
/*********************************************************************
*
- * Function : free_url_spec
+ * Function : free_pattern_spec
*
- * Description : Called from the "unloaders". Freez the url
+ * Description : Called from the "unloaders". Freez the pattern
* structure elements.
*
* Parameters :
- * 1 : url = pointer to a pattern_spec structure.
+ * 1 : pattern = pointer to a pattern_spec structure.
*
* Returns : N/A
*
*********************************************************************/
-void free_url_spec(struct pattern_spec *url)
+void free_pattern_spec(struct pattern_spec *pattern)
{
- if (url == NULL) return;
+ if (pattern == NULL) return;
- freez(url->spec);
+ freez(pattern->spec);
#ifdef FEATURE_EXTENDED_HOST_PATTERNS
- if (url->pattern.url_spec.host_regex)
+ if (pattern->pattern.url_spec.host_regex)
{
- regfree(url->pattern.url_spec.host_regex);
- freez(url->pattern.url_spec.host_regex);
+ regfree(pattern->pattern.url_spec.host_regex);
+ freez(pattern->pattern.url_spec.host_regex);
}
#else
- freez(url->pattern.url_spec.dbuffer);
- freez(url->pattern.url_spec.dvec);
- url->pattern.url_spec.dcount = 0;
+ freez(pattern->pattern.url_spec.dbuffer);
+ freez(pattern->pattern.url_spec.dvec);
+ pattern->pattern.url_spec.dcount = 0;
#endif /* ndef FEATURE_EXTENDED_HOST_PATTERNS */
- freez(url->pattern.url_spec.port_list);
- if (url->pattern.url_spec.preg)
+ freez(pattern->pattern.url_spec.port_list);
+ if (pattern->pattern.url_spec.preg)
{
- regfree(url->pattern.url_spec.preg);
- freez(url->pattern.url_spec.preg);
+ regfree(pattern->pattern.url_spec.preg);
+ freez(pattern->pattern.url_spec.preg);
}
- if (url->pattern.tag_regex)
+ if (pattern->pattern.tag_regex)
{
- regfree(url->pattern.tag_regex);
- freez(url->pattern.tag_regex);
+ regfree(pattern->pattern.tag_regex);
+ freez(pattern->pattern.tag_regex);
}
}
projects / privoxy.git / blobdiff