osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

If you want struct e_in6_addr, include <epan/ipv6-utils.h>. 

Don't just define it yourself.

(And especially don't define it yourself if you're already including
epan/ipv6-utils.h.)

Change-Id: I9970d0edecef0c820b2a7fdce34509b54e7b3106
Reviewed-on: https://code.wireshark.org/review/13020
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2016-01-02 20:01:12 -08:00
parent d4f7f21b51
commit 8363733e30
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
epan/addr_resolv.h
View File

@ -180,7 +180,6 @@ WS_DLL_PUBLIC gboolean host_name_lookup_process(void);
WS_DLL_PUBLIC const gchar *get_hostname(const guint addr);
/* get_hostname6 returns the host name, or numeric addr if not found */
struct e_in6_addr;
WS_DLL_PUBLIC const gchar* get_hostname6(const struct e_in6_addr *ad);
/* get_ether_name returns the logical name if found in ethers files else

3
epan/to_str.h
View File

@ -28,6 +28,7 @@
#include "wsutil/nstime.h"
#include "time_fmt.h"
#include <epan/packet_info.h>
#include <epan/ipv6-utils.h>
#include "ws_symbol_export.h"
#include "wmem/wmem.h"
@ -49,8 +50,6 @@ extern "C" {
* but for which no more specific module applies.
*/
struct e_in6_addr;
WS_DLL_PUBLIC gchar* address_to_str(wmem_allocator_t *scope, const address *addr);
WS_DLL_PUBLIC gchar* address_with_resolution_to_str(wmem_allocator_t *scope, const address *addr);
WS_DLL_PUBLIC gchar* tvb_address_with_resolution_to_str(wmem_allocator_t *scope, tvbuff_t *tvb, int type, const gint offset);

2
epan/tvbuff.h
View File

@ -36,6 +36,7 @@
#include <glib.h>
#include <epan/guid-utils.h>
#include <epan/wmem/wmem.h>
#include <epan/ipv6-utils.h>
#include "wsutil/ws_mempbrk.h"
#ifdef __cplusplus
@ -55,7 +56,6 @@ extern "C" {
struct tvbuff;
typedef struct tvbuff tvbuff_t;
struct e_in6_addr; /* ipv6-utils.h */
struct nstime_t; /* nstime.h */
/** @defgroup tvbuff Testy, Virtual(-izable) Buffers