diff options
| author | Michael Tüxen <tuexen@fh-muenster.de> | 2009-06-18 18:43:36 +0000 |
|---|---|---|
| committer | Michael Tüxen <tuexen@fh-muenster.de> | 2009-06-18 18:43:36 +0000 |
| commit | 98a46967739237e8a5f350515d49c343937fb04a (patch) | |
| tree | 83691da5fcc73b72c4698f36e96f3e16d7198654 /wiretap | |
| parent | 89162943b036ae57f2ffcad004cdab2a1f3d9d36 (diff) | |
Fix for bug 3539: Address as signess issue for fcs_len.
Bugfix scheduled for 1.2.1.
svn path=/trunk/; revision=28768
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcapng.c | 4 | ||||
| -rw-r--r-- | wiretap/wtap-int.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index b808c3a9a8..6ba80a760f 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -178,7 +178,7 @@ typedef struct wtapng_if_descr_s { guint8 if_tsresol; /* default is 6 for microsecond resolution */ gchar *if_filter; /* NULL if not available */ gchar *if_os; /* NULL if not available */ - gchar if_fcslen; /* -1 if unknown or changes between packets */ + gint8 if_fcslen; /* -1 if unknown or changes between packets */ /* XXX: guint64 if_tsoffset; */ } wtapng_if_descr_t; @@ -526,7 +526,7 @@ pcapng_read_if_descr_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn, wblock->data.if_descr.if_tsresol = 6; /* default is 6 for microsecond resolution */ wblock->data.if_descr.if_filter = NULL; wblock->data.if_descr.if_os = NULL; - wblock->data.if_descr.if_fcslen = (gchar) -1; /* unknown or changes between packets */ + wblock->data.if_descr.if_fcslen = -1; /* unknown or changes between packets */ /* XXX: guint64 if_tsoffset; */ diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h index 1081df2a8d..0dc5269659 100644 --- a/wiretap/wtap-int.h +++ b/wiretap/wtap-int.h @@ -101,7 +101,7 @@ typedef struct { gboolean byte_swapped; guint16 version_major; guint16 version_minor; - guint8 if_fcslen; + gint8 if_fcslen; GArray *interface_data; guint number_of_interfaces; } pcapng_t; |