aboutsummaryrefslogtreecommitdiffstats
path: root/dfilter.c
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>2000-04-14 05:39:43 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>2000-04-14 05:39:43 +0000
commit61167a3c28f1413cfe0f3a3fb0f9454815a02b16 (patch)
tree939261d5f15a73a162f634864c4c25a5deb23a5b /dfilter.c
parentd716875317fdf7597ece0639082efe943598bccd (diff)
Change dfilter_apply() to 4-argument function. 4th argument is not yet used,
but will be in the future, and it's easier for me to keep my local branch in sync with the source with the calls to dfilter_apply() already modified tothe 4-arg format. Add a CPP macro to ipv4.h to define ipv4_addr_ne(). Use it in dfilter.c svn path=/trunk/; revision=1854
Diffstat (limited to 'dfilter.c')
-rw-r--r--dfilter.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/dfilter.c b/dfilter.c
index 4a792c1fa4..c07827cc86 100644
--- a/dfilter.c
+++ b/dfilter.c
@@ -1,7 +1,7 @@
/* dfilter.c
* Routines for display filters
*
- * $Id: dfilter.c,v 1.33 2000/03/20 22:52:41 gram Exp $
+ * $Id: dfilter.c,v 1.34 2000/04/14 05:39:36 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -314,7 +314,7 @@ g_strcmp(gconstpointer a, gconstpointer b)
gboolean
-dfilter_apply(dfilter *dfcode, proto_tree *ptree, const guint8* pd)
+dfilter_apply(dfilter *dfcode, proto_tree *ptree, const guint8* pd, guint pd_len)
{
gboolean retval;
if (dfcode == NULL)
@@ -828,7 +828,7 @@ gboolean check_relation_ipv4(gint operand, GArray *a, GArray *b)
ptr_a = (ipv4_addr*) g_array_index_ptr(a, sizeof(ipv4_addr), i);
for (j = 0; j < len_b; j++) {
ptr_b = (ipv4_addr*) g_array_index_ptr(b, sizeof(ipv4_addr), j);
- if (!ipv4_addr_eq(ptr_a, ptr_b))
+ if (ipv4_addr_ne(ptr_a, ptr_b))
return TRUE;
}
}