![Guy Harris](/assets/img/avatar_default.png)
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of sizeof. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of strtol() and strtoul(). Change some data types to avoid those implicit conversion warnings. When assigning a constant to a float, make sure the constant isn't a double, by appending "f" to the constant. Constify a bunch of variables, parameters, and return values to eliminate warnings due to strings being given const qualifiers. Cast away those warnings in some cases where an API we don't control forces us to do so. Enable a bunch of additional warnings by default. Note why at least some of the other warnings aren't enabled. randpkt.c and text2pcap.c are used to build programs, so they don't need to be in EXTRA_DIST. If the user specifies --enable-warnings-as-errors, add -Werror *even if the user specified --enable-extra-gcc-flags; assume they know what they're doing and are willing to have the compile fail due to the extra GCC warnings being treated as errors. svn path=/trunk/; revision=46748
209 lines
4.7 KiB
C
209 lines
4.7 KiB
C
/*
|
|
* $Id$
|
|
*
|
|
* Wireshark - Network traffic analyzer
|
|
* By Gerald Combs <gerald@wireshark.org>
|
|
* Copyright 2001 Gerald Combs
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <string.h>
|
|
|
|
#include <ftypes-int.h>
|
|
#include <epan/ipv4.h>
|
|
#include <epan/addr_resolv.h>
|
|
#include <epan/emem.h>
|
|
|
|
|
|
static void
|
|
set_uinteger(fvalue_t *fv, guint32 value)
|
|
{
|
|
ipv4_addr_set_net_order_addr(&(fv->value.ipv4), value);
|
|
ipv4_addr_set_netmask_bits(&(fv->value.ipv4), 32);
|
|
}
|
|
|
|
static gpointer
|
|
value_get(fvalue_t *fv)
|
|
{
|
|
return &(fv->value.ipv4);
|
|
}
|
|
|
|
static gboolean
|
|
val_from_unparsed(fvalue_t *fv, char *s, gboolean allow_partial_value _U_, LogFunc logfunc)
|
|
{
|
|
guint32 addr;
|
|
unsigned int nmask_bits;
|
|
|
|
char *has_slash;
|
|
char *net_str, *addr_str;
|
|
fvalue_t *nmask_fvalue;
|
|
|
|
/* Look for CIDR: Is there a single slash in the string? */
|
|
has_slash = strchr(s, '/');
|
|
if (has_slash) {
|
|
/* Make a copy of the string up to but not including the
|
|
* slash; that's the address portion. */
|
|
addr_str = ep_strndup(s, has_slash - s);
|
|
}
|
|
else {
|
|
addr_str = s;
|
|
}
|
|
|
|
if (!get_host_ipaddr(addr_str, &addr)) {
|
|
logfunc("\"%s\" is not a valid hostname or IPv4 address.",
|
|
addr_str);
|
|
return FALSE;
|
|
}
|
|
|
|
ipv4_addr_set_net_order_addr(&(fv->value.ipv4), addr);
|
|
|
|
/* If CIDR, get netmask bits. */
|
|
if (has_slash) {
|
|
/* Skip past the slash */
|
|
net_str = has_slash + 1;
|
|
|
|
/* XXX - this is inefficient */
|
|
nmask_fvalue = fvalue_from_unparsed(FT_UINT32, net_str, FALSE, logfunc);
|
|
if (!nmask_fvalue) {
|
|
return FALSE;
|
|
}
|
|
nmask_bits = fvalue_get_uinteger(nmask_fvalue);
|
|
FVALUE_FREE(nmask_fvalue);
|
|
|
|
if (nmask_bits > 32) {
|
|
logfunc("Netmask bits in a CIDR IPv4 address should be <= 32, not %u",
|
|
nmask_bits);
|
|
return FALSE;
|
|
}
|
|
ipv4_addr_set_netmask_bits(&fv->value.ipv4, nmask_bits);
|
|
}
|
|
else {
|
|
/* Not CIDR; mask covers entire address. */
|
|
ipv4_addr_set_netmask_bits(&(fv->value.ipv4), 32);
|
|
}
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
static int
|
|
val_repr_len(fvalue_t *fv _U_, ftrepr_t rtype _U_)
|
|
{
|
|
/*
|
|
* 15 characters for "XXX.XXX.XXX.XXX".
|
|
*/
|
|
return 15;
|
|
}
|
|
|
|
static void
|
|
val_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, char *buf)
|
|
{
|
|
ipv4_addr_str_buf(&fv->value.ipv4, buf);
|
|
}
|
|
|
|
static gboolean
|
|
cmp_eq(const fvalue_t *a, const fvalue_t *b)
|
|
{
|
|
return ipv4_addr_eq(&a->value.ipv4, &b->value.ipv4);
|
|
}
|
|
|
|
static gboolean
|
|
cmp_ne(const fvalue_t *a, const fvalue_t *b)
|
|
{
|
|
return ipv4_addr_ne(&a->value.ipv4, &b->value.ipv4);
|
|
}
|
|
|
|
static gboolean
|
|
cmp_gt(const fvalue_t *a, const fvalue_t *b)
|
|
{
|
|
return ipv4_addr_gt(&a->value.ipv4, &b->value.ipv4);
|
|
}
|
|
|
|
static gboolean
|
|
cmp_ge(const fvalue_t *a, const fvalue_t *b)
|
|
{
|
|
return ipv4_addr_ge(&a->value.ipv4, &b->value.ipv4);
|
|
}
|
|
|
|
static gboolean
|
|
cmp_lt(const fvalue_t *a, const fvalue_t *b)
|
|
{
|
|
return ipv4_addr_lt(&a->value.ipv4, &b->value.ipv4);
|
|
}
|
|
|
|
static gboolean
|
|
cmp_le(const fvalue_t *a, const fvalue_t *b)
|
|
{
|
|
return ipv4_addr_le(&a->value.ipv4, &b->value.ipv4);
|
|
}
|
|
|
|
static gboolean
|
|
cmp_bitwise_and(const fvalue_t *fv_a, const fvalue_t *fv_b)
|
|
{
|
|
guint32 addr_a;
|
|
guint32 addr_b;
|
|
|
|
addr_a = fv_a->value.ipv4.addr & fv_a->value.ipv4.nmask;
|
|
addr_b = fv_b->value.ipv4.addr & fv_b->value.ipv4.nmask;
|
|
return ((addr_a & addr_b) != 0);
|
|
}
|
|
|
|
void
|
|
ftype_register_ipv4(void)
|
|
{
|
|
|
|
static ftype_t ipv4_type = {
|
|
FT_IPv4, /* ftype */
|
|
"FT_IPv4", /* name */
|
|
"IPv4 address", /* pretty_name */
|
|
4, /* wire_size */
|
|
NULL, /* new_value */
|
|
NULL, /* free_value */
|
|
val_from_unparsed, /* val_from_unparsed */
|
|
NULL, /* val_from_string */
|
|
val_to_repr, /* val_to_string_repr */
|
|
val_repr_len, /* len_string_repr */
|
|
|
|
NULL, /* set_value */
|
|
set_uinteger, /* set_value_uinteger */
|
|
NULL, /* set_value_sinteger */
|
|
NULL, /* set_value_integer64 */
|
|
NULL, /* set_value_floating */
|
|
|
|
value_get, /* get_value */
|
|
NULL, /* get_value_uinteger */
|
|
NULL, /* get_value_sinteger */
|
|
NULL, /* get_value_integer64 */
|
|
NULL, /* get_value_floating */
|
|
|
|
cmp_eq,
|
|
cmp_ne,
|
|
cmp_gt,
|
|
cmp_ge,
|
|
cmp_lt,
|
|
cmp_le,
|
|
cmp_bitwise_and,
|
|
NULL, /* cmp_contains */
|
|
NULL, /* cmp_matches */
|
|
|
|
NULL,
|
|
NULL,
|
|
};
|
|
|
|
ftype_register(FT_IPv4, &ipv4_type);
|
|
}
|