diff options
| author | gram <gram@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-04-14 05:39:43 +0000 |
|---|---|---|
| committer | gram <gram@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-04-14 05:39:43 +0000 |
| commit | 725a21f8d857921c3175bacc0038d209dc6049ce (patch) | |
| tree | 939261d5f15a73a162f634864c4c25a5deb23a5b /dfilter.c | |
| parent | 274af765c9641f406644522f4e2cf2b755464e29 (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
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1854 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'dfilter.c')
| -rw-r--r-- | dfilter.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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; } } |