ba1ef0ec3d
This feature was removed in v2.5.1rc0-427-gf529ab5d0a, anticipating that MaxMind would remove support for it in 2019. They have however changed their mind and maintained latitude and longitude information. They recommend displaying an accuracy radius, but the reported values are 50, 100, 200 and 1000km. When implemented literally, a marker in Ireland would cover the whole island plus mainland, so I have instead opted to use a fixed radius of 1km at deeper zoom levels. The old ipmap.html file was outdated and had broken tiles, I rewrote a new one from scratch using the light-weight Leaflet library combined with tiles from OpenStreetMap. This is more mobile-friendly and secure (https, SRI). To improve handling of nearby or overlapping nodes, clustering is used (individual nodes can still be inspected). Browser compatibility results: IE8 is unusable, IE9 partially works (tooltips sometimes disappear and the cluster radius control is gone), IE11 works. Of course Firefox 65 and Chromium 72 have no issues. The map popup description in the generated GeoJSON structure is now split in several properties, allowing presentation to be handled by the HTML page instead of the C code. Bug: 14693 Change-Id: If2ec9c518f7723ac0ab27b6272463356875a0ff2 Reviewed-on: https://code.wireshark.org/review/31952 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
109 lines
2.7 KiB
C
109 lines
2.7 KiB
C
/* traffic_table_ui.h
|
|
* Helper routines common to conversation/endpoint tables.
|
|
*
|
|
* Wireshark - Network traffic analyzer
|
|
* By Gerald Combs <gerald@wireshark.org>
|
|
* Copyright 1998 Gerald Combs
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later
|
|
*/
|
|
|
|
#ifndef __TRAFFIC_TABLE_UI_H__
|
|
#define __TRAFFIC_TABLE_UI_H__
|
|
|
|
#ifdef HAVE_MAXMINDDB
|
|
#include <stdio.h>
|
|
|
|
#include "epan/maxmind_db.h"
|
|
#include <epan/conversation_table.h>
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif /* __cplusplus */
|
|
|
|
/** @file
|
|
* Conversation and endpoint lists.
|
|
*/
|
|
|
|
typedef enum {
|
|
CONV_COLUMN_SRC_ADDR,
|
|
CONV_COLUMN_SRC_PORT,
|
|
CONV_COLUMN_DST_ADDR,
|
|
CONV_COLUMN_DST_PORT,
|
|
CONV_COLUMN_PACKETS,
|
|
CONV_COLUMN_BYTES,
|
|
CONV_COLUMN_PKT_AB,
|
|
CONV_COLUMN_BYTES_AB,
|
|
CONV_COLUMN_PKT_BA,
|
|
CONV_COLUMN_BYTES_BA,
|
|
CONV_COLUMN_START,
|
|
CONV_COLUMN_DURATION,
|
|
CONV_COLUMN_BPS_AB,
|
|
CONV_COLUMN_BPS_BA,
|
|
CONV_NUM_COLUMNS,
|
|
CONV_INDEX_COLUMN = CONV_NUM_COLUMNS
|
|
} conversation_column_type_e;
|
|
|
|
extern const char *conv_column_titles[CONV_NUM_COLUMNS];
|
|
extern const char *conv_conn_a_title;
|
|
extern const char *conv_conn_b_title;
|
|
extern const char *conv_abs_start_title;
|
|
|
|
typedef enum
|
|
{
|
|
ENDP_COLUMN_ADDR,
|
|
ENDP_COLUMN_PORT,
|
|
ENDP_COLUMN_PACKETS,
|
|
ENDP_COLUMN_BYTES,
|
|
ENDP_COLUMN_PKT_AB,
|
|
ENDP_COLUMN_BYTES_AB,
|
|
ENDP_COLUMN_PKT_BA,
|
|
ENDP_COLUMN_BYTES_BA,
|
|
ENDP_NUM_COLUMNS,
|
|
ENDP_COLUMN_GEO_COUNTRY = ENDP_NUM_COLUMNS,
|
|
ENDP_COLUMN_GEO_CITY,
|
|
ENDP_COLUMN_GEO_AS_NUM,
|
|
ENDP_COLUMN_GEO_AS_ORG,
|
|
ENDP_NUM_GEO_COLUMNS
|
|
} endpoint_column_type_e;
|
|
|
|
extern const char *endp_column_titles[ENDP_NUM_GEO_COLUMNS];
|
|
|
|
extern const char *endp_conn_title;
|
|
|
|
#ifdef HAVE_MAXMINDDB
|
|
/**
|
|
* Writes an HTML file containing a map showing the geographical locations
|
|
* of IPv4 and IPv6 addresses.
|
|
*
|
|
* @param [in] fp File handle for writing the HTML file.
|
|
* @param [in] json_only Write GeoJSON data only.
|
|
* @param [in] hosts A NULL-terminated array of 'hostlist_talker_t'. A MMDB
|
|
* lookup should have been completed before for these addresses.
|
|
* @param [in,out] err_str Set to error string on failure. Error string must
|
|
* be g_freed. May be NULL.
|
|
* @return Whether the map file was successfully written with non-empty data.
|
|
*/
|
|
gboolean write_endpoint_geoip_map(FILE *fp, gboolean json_only, hostlist_talker_t *const *hosts, gchar **err_str);
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif /* __cplusplus */
|
|
|
|
#endif /* __TRAFFIC_TABLE_UI_H__ */
|
|
|
|
/*
|
|
* Editor modelines - https://www.wireshark.org/tools/modelines.html
|
|
*
|
|
* Local variables:
|
|
* c-basic-offset: 4
|
|
* tab-width: 8
|
|
* indent-tabs-mode: nil
|
|
* End:
|
|
*
|
|
* vi: set shiftwidth=4 tabstop=8 expandtab:
|
|
* :indentSize=4:tabSize=8:noTabs=true:
|
|
*/
|