aboutsummaryrefslogtreecommitdiffstats
path: root/epan/ftypes/ftype-double.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/ftypes/ftype-double.c')
-rw-r--r--epan/ftypes/ftype-double.c220
1 files changed, 160 insertions, 60 deletions
diff --git a/epan/ftypes/ftype-double.c b/epan/ftypes/ftype-double.c
index bf3ce30418..79369affe2 100644
--- a/epan/ftypes/ftype-double.c
+++ b/epan/ftypes/ftype-double.c
@@ -23,7 +23,7 @@ double_fvalue_new(fvalue_t *fv)
}
static void
-double_fvalue_set_floating(fvalue_t *fv, gdouble value)
+double_fvalue_set_floating(fvalue_t *fv, double value)
{
fv->value.floating = value;
}
@@ -34,71 +34,119 @@ value_get_floating(fvalue_t *fv)
return fv->value.floating;
}
-static gboolean
-val_from_unparsed(fvalue_t *fv, const char *s, gboolean allow_partial_value _U_, gchar **err_msg)
+static bool
+val_from_uinteger64(fvalue_t *fv, const char *s _U_, uint64_t value, char **err_msg _U_)
{
- char *endptr = NULL;
+ fv->value.floating = (double)value;
+ return true;
+}
- fv->value.floating = g_ascii_strtod(s, &endptr);
+static bool
+val_from_sinteger64(fvalue_t *fv, const char *s _U_, int64_t value, char **err_msg _U_)
+{
+ fv->value.floating = (double)value;
+ return true;
+}
- if (endptr == s || *endptr != '\0') {
- /* This isn't a valid number. */
- if (err_msg != NULL)
- *err_msg = g_strdup_printf("\"%s\" is not a valid number.", s);
- return FALSE;
- }
- if (errno == ERANGE) {
- if (fv->value.floating == 0) {
- if (err_msg != NULL)
- *err_msg = g_strdup_printf("\"%s\" causes floating-point underflow.", s);
- }
- else if (fv->value.floating == HUGE_VAL) {
- if (err_msg != NULL)
- *err_msg = g_strdup_printf("\"%s\" causes floating-point overflow.", s);
- }
- else {
- if (err_msg != NULL)
- *err_msg = g_strdup_printf("\"%s\" is not a valid floating-point number.",
- s);
- }
- return FALSE;
- }
+static bool
+val_from_double(fvalue_t *fv, const char *s _U_, double floating, char **err_msg _U_)
+{
+ fv->value.floating = floating;
+ return true;
+}
- return TRUE;
+static char *
+float_val_to_repr(wmem_allocator_t *scope, const fvalue_t *fv, ftrepr_t rtype, int field_display _U_)
+{
+ char *buf = wmem_alloc(scope, G_ASCII_DTOSTR_BUF_SIZE);
+ if (rtype == FTREPR_DFILTER)
+ g_ascii_dtostr(buf, G_ASCII_DTOSTR_BUF_SIZE, fv->value.floating);
+ else
+ g_ascii_formatd(buf, G_ASCII_DTOSTR_BUF_SIZE, "%." G_STRINGIFY(FLT_DIG) "g", fv->value.floating);
+ return buf;
}
-static int
-float_val_repr_len(fvalue_t *fv _U_, ftrepr_t rtype _U_, int field_display _U_)
+static char *
+double_val_to_repr(wmem_allocator_t *scope, const fvalue_t *fv, ftrepr_t rtype, int field_display _U_)
{
- return G_ASCII_DTOSTR_BUF_SIZE;
+ char *buf = wmem_alloc(scope, G_ASCII_DTOSTR_BUF_SIZE);
+ if (rtype == FTREPR_DFILTER)
+ g_ascii_dtostr(buf, G_ASCII_DTOSTR_BUF_SIZE, fv->value.floating);
+ else
+ g_ascii_formatd(buf, G_ASCII_DTOSTR_BUF_SIZE, "%." G_STRINGIFY(DBL_DIG) "g", fv->value.floating);
+ return buf;
}
-static void
-float_val_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, int field_display _U_, char *buf, unsigned int size)
+enum ft_result
+double_val_to_double(const fvalue_t *fv, double *repr)
{
- g_ascii_formatd(buf, size, "%." G_STRINGIFY(FLT_DIG) "g", fv->value.floating);
+ *repr = fv->value.floating;
+ return FT_OK;
}
-static int
-double_val_repr_len(fvalue_t *fv _U_, ftrepr_t rtype _U_, int field_display _U_)
+static enum ft_result
+val_unary_minus(fvalue_t * dst, const fvalue_t *src, char **err_ptr _U_)
{
- return G_ASCII_DTOSTR_BUF_SIZE;
+ dst->value.floating = -src->value.floating;
+ return FT_OK;
}
-static void
-double_val_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, int field_display _U_, char *buf, unsigned int size)
+static enum ft_result
+val_add(fvalue_t * dst, const fvalue_t *a, const fvalue_t *b, char **err_ptr _U_)
+{
+ dst->value.floating = a->value.floating + b->value.floating;
+ return FT_OK;
+}
+
+static enum ft_result
+val_subtract(fvalue_t * dst, const fvalue_t *a, const fvalue_t *b, char **err_ptr _U_)
+{
+ dst->value.floating = a->value.floating - b->value.floating;
+ return FT_OK;
+}
+
+static enum ft_result
+val_multiply(fvalue_t * dst, const fvalue_t *a, const fvalue_t *b, char **err_ptr _U_)
{
- g_ascii_formatd(buf, size, "%." G_STRINGIFY(DBL_DIG) "g", fv->value.floating);
+ dst->value.floating = a->value.floating * b->value.floating;
+ return FT_OK;
}
-static int
-cmp_order(const fvalue_t *a, const fvalue_t *b)
+static enum ft_result
+val_divide(fvalue_t * dst, const fvalue_t *a, const fvalue_t *b, char **err_ptr _U_)
+{
+ dst->value.floating = a->value.floating / b->value.floating;
+ return FT_OK;
+}
+
+static enum ft_result
+cmp_order(const fvalue_t *a, const fvalue_t *b, int *cmp)
{
if (a->value.floating < b->value.floating)
- return -1;
- if (a->value.floating > b->value.floating)
- return 1;
- return 0;
+ *cmp = -1;
+ else if (a->value.floating > b->value.floating)
+ *cmp = 1;
+ else
+ *cmp = 0;
+ return FT_OK;
+}
+
+static bool
+val_is_zero(const fvalue_t *fv_a)
+{
+ return fv_a->value.floating == 0;
+}
+
+static bool
+val_is_negative(const fvalue_t *fv_a)
+{
+ return fv_a->value.floating < 0;
+}
+
+static unsigned
+val_hash(const fvalue_t *fv)
+{
+ return g_double_hash(&fv->value.floating);
}
void
@@ -107,56 +155,108 @@ ftype_register_double(void)
static ftype_t float_type = {
FT_FLOAT, /* ftype */
- "FT_FLOAT", /* name */
- "Floating point (single-precision)", /* pretty_name */
0, /* wire_size */
double_fvalue_new, /* new_value */
+ NULL, /* copy_value */
NULL, /* free_value */
- val_from_unparsed, /* val_from_unparsed */
+ NULL, /* val_from_literal */
NULL, /* val_from_string */
+ NULL, /* val_from_charconst */
+ val_from_uinteger64, /* val_from_uinteger64 */
+ val_from_sinteger64, /* val_from_sinteger64 */
+ val_from_double, /* val_from_double */
float_val_to_repr, /* val_to_string_repr */
- float_val_repr_len, /* len_string_repr */
+
+ NULL, /* val_to_uinteger64 */
+ NULL, /* val_to_sinteger64 */
+ double_val_to_double, /* val_to_double */
{ .set_value_floating = double_fvalue_set_floating }, /* union set_value */
{ .get_value_floating = value_get_floating }, /* union get_value */
cmp_order,
- NULL, /* cmp_bitwise_and */
NULL, /* cmp_contains */
NULL, /* cmp_matches */
- NULL,
- NULL,
+ val_hash, /* hash */
+ val_is_zero, /* is_zero */
+ val_is_negative, /* is_negative */
+ NULL, /* len */
+ NULL, /* slice */
+ NULL, /* bitwise_and */
+ val_unary_minus, /* unary_minus */
+ val_add, /* add */
+ val_subtract, /* subtract */
+ val_multiply, /* multiply */
+ val_divide, /* divide */
+ NULL, /* modulo */
};
static ftype_t double_type = {
FT_DOUBLE, /* ftype */
- "FT_DOUBLE", /* name */
- "Floating point (double-precision)", /* pretty_name */
0, /* wire_size */
double_fvalue_new, /* new_value */
+ NULL, /* copy_value */
NULL, /* free_value */
- val_from_unparsed, /* val_from_unparsed */
+ NULL, /* val_from_literal */
NULL, /* val_from_string */
+ NULL, /* val_from_charconst */
+ val_from_uinteger64, /* val_from_uinteger64 */
+ val_from_sinteger64, /* val_from_sinteger64 */
+ val_from_double, /* val_from_double */
double_val_to_repr, /* val_to_string_repr */
- double_val_repr_len, /* len_string_repr */
+
+ NULL, /* val_to_uinteger64 */
+ NULL, /* val_to_sinteger64 */
+ double_val_to_double, /* val_to_double */
{ .set_value_floating = double_fvalue_set_floating }, /* union set_value */
{ .get_value_floating = value_get_floating }, /* union get_value */
cmp_order,
- NULL, /* cmp_bitwise_and */
NULL, /* cmp_contains */
NULL, /* cmp_matches */
- NULL,
- NULL,
+ val_hash, /* hash */
+ val_is_zero, /* is_zero */
+ val_is_negative, /* is_negative */
+ NULL, /* len */
+ NULL, /* slice */
+ NULL, /* bitwise_and */
+ val_unary_minus, /* unary_minus */
+ val_add, /* add */
+ val_subtract, /* subtract */
+ val_multiply, /* multiply */
+ val_divide, /* divide */
+ NULL, /* modulo */
};
ftype_register(FT_FLOAT, &float_type);
ftype_register(FT_DOUBLE, &double_type);
}
+void
+ftype_register_pseudofields_double(int proto)
+{
+ static int hf_ft_float;
+ static int hf_ft_double;
+
+ static hf_register_info hf_ftypes[] = {
+ { &hf_ft_float,
+ { "FT_FLOAT", "_ws.ftypes.float",
+ FT_FLOAT, BASE_NONE, NULL, 0x00,
+ NULL, HFILL }
+ },
+ { &hf_ft_double,
+ { "FT_DOUBLE", "_ws.ftypes.double",
+ FT_DOUBLE, BASE_NONE, NULL, 0x00,
+ NULL, HFILL }
+ },
+ };
+
+ proto_register_field_array(proto, hf_ftypes, array_length(hf_ftypes));
+}
+
/*
* Editor modelines - https://www.wireshark.org/tools/modelines.html
*
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 17:52:52 +0000