18887f7b72
Resume work on CMake for Wireshark. Finally found and fixed a
...
few mistakes that I made earlier.
Current status: dumpcap still doesn't build
Next step: Add a ylwrap like workaround for flex misbehaviour.
svn path=/trunk/; revision=28518
2009-05-29 10:57:47 +00:00
dbc67fc367
Fix for bug 3469:
...
In Juniper NetScreen snoop output files, the encapsulation type of
traffic on ADSL interfaces can be ethernet or PPP. Check whether the
first 6 bytes of the data are the same as the destination mac-address
in the packet header. If they are, assume ethernet. If not, assume PPP.
svn path=/trunk/; revision=28471
2009-05-25 19:59:17 +00:00
f39d677ef9
Added missing daintree-sna.h to Makefile.
...
svn path=/trunk/; revision=28469
2009-05-25 06:57:12 +00:00
5fa6b90f6b
From Fred Fierling (bug 3486):
...
Added support for Daintree's Sensor Network Analyzer capture files.
svn path=/trunk/; revision=28463
2009-05-24 22:49:36 +00:00
83aa6f473f
From Aaron Turner: Use wtap_wtap_encap_to_pcap_encap() instead of
...
fixed mapping for ethernet only.
svn path=/trunk/; revision=28443
2009-05-22 07:33:58 +00:00
3c6b6dc1a3
From Kovarththanan Rajaratnam via bug 2680:
...
Currently Wireshark doesn't support saving
WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR files as btsnoop files.
svn path=/trunk/; revision=28442
2009-05-22 00:05:19 +00:00
a37191cb07
From Kovarththanan Rajaratnam via bug 2676:
...
If a PCAP file containing WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR packets is saved,
it gets corrupted because the direction pseudo header isn't included.
svn path=/trunk/; revision=28441
2009-05-21 23:16:49 +00:00
21fcdad106
One more debug output.
...
svn path=/trunk/; revision=28274
2009-05-05 05:58:21 +00:00
cd369fcbf8
Use a dynamic glib array instead of a static C array for
...
storing the interface specific data.
svn path=/trunk/; revision=28264
2009-05-03 17:43:41 +00:00
9366841f60
Add support for multiple IDBs. They can used different encapsulations.
...
svn path=/trunk/; revision=28262
2009-05-03 15:47:41 +00:00
2d894fdd24
Improve handling of if_tsresol option.
...
svn path=/trunk/; revision=28261
2009-05-03 15:09:23 +00:00
6d0211be52
Use WTAP_FILE_TSPREC_NSEC as tsprecision. This makes it independent from the
...
interfaces. Convert other times appropriately.
svn path=/trunk/; revision=28257
2009-05-03 11:46:40 +00:00
9447c434e9
Remove code that should have been removed by my last commit.
...
svn path=/trunk/; revision=28256
2009-05-03 10:38:41 +00:00
b9d34749e6
Use WTAP_ENCAP_PER_PACKET. This is an intermediate step towards supporting
...
multiple IDBs.
svn path=/trunk/; revision=28255
2009-05-03 09:56:53 +00:00
3b23d3dbd5
Whitespace change.
...
svn path=/trunk/; revision=28252
2009-05-02 18:24:44 +00:00
accb3a9207
Fix the handling of non PB/EPB blocks after the initial SDB/IDB.
...
svn path=/trunk/; revision=28251
2009-05-02 17:10:01 +00:00
e637af376a
pcap_to_wtap_map is not used outside wiretap/pcap-common.c, so make it
...
static.
svn path=/trunk/; revision=28186
2009-04-27 22:07:11 +00:00
7876fb4ead
Nettl format != libpcap format && nettl format != pcap-NG format.
...
Remove the stuff for nettl from the LINKTYPE_ <-> WTAP_ENCAP_ mapping
table.
svn path=/trunk/; revision=28185
2009-04-27 21:28:53 +00:00
a60cae6935
Move pseudo-header routines from libpcap.c to pcap-common.c, for use
...
with pcap-NG files.
svn path=/trunk/; revision=28184
2009-04-27 19:39:06 +00:00
fa8bb35715
Use named constant.
...
svn path=/trunk/; revision=28176
2009-04-27 11:52:14 +00:00
18a3b0659c
Have the libpcap and pcap-NG code share the LINKTYPE_-to-WTAP_ENCAP_
...
mapping table - they should be using the same values. Share the mapping
routines as well.
svn path=/trunk/; revision=28173
2009-04-27 09:28:28 +00:00
c68e344284
Clean up some comments I forgot to remove.
...
svn path=/trunk/; revision=28154
2009-04-26 07:46:03 +00:00
a043d8482f
Don't do pointer casting - some version of GCC complain about that.
...
svn path=/trunk/; revision=28153
2009-04-26 02:59:16 +00:00
f71921252e
There's no guarantee that "ll" is the right modifier to use for
...
gint64/guint64 with GLib's formatting routines; use G_GINT64_MODIFIER
instead.
svn path=/trunk/; revision=28152
2009-04-25 21:06:09 +00:00
94fc2641e7
- add support for interface statistic block
...
- distinguish between packet block and enhanced packet block
- fix a bug regarding the handling of unknown blocks
svn path=/trunk/; revision=28151
2009-04-25 19:11:35 +00:00
fa6acc7d55
vms.c: undo an incorrect const committed in SVN #28144 .
...
svn path=/trunk/; revision=28146
2009-04-24 12:52:02 +00:00
72ef03e60a
[Trivial] Constify a few things
...
svn path=/trunk/; revision=28144
2009-04-24 12:16:01 +00:00
98f592713c
Improved reading Apple's PacketLogger files:
...
- Send last byte of header (type) and data to a packetlogger dissector
- Rewrite type to ACI channel in the dissector
- Direction is indirectly given from the PL type
- Dissect PacketLogger NewC and Info as text
svn path=/trunk/; revision=28141
2009-04-24 08:14:36 +00:00
3fd6fbb69e
Added PacketLogger to dump_open_table_base to be able to open pklg files
...
(and avoid crash).
svn path=/trunk/; revision=28137
2009-04-23 09:13:56 +00:00
bea4b58ec5
More file-offset fixes.
...
svn path=/trunk/; revision=28122
2009-04-22 04:33:49 +00:00
c7d09027df
ssize_t is UN*X-only; don't use it.
...
The header length, as processed by airopeekv9_process_header(), is never
0, so use 0, not -1, as the error return.
svn path=/trunk/; revision=28121
2009-04-22 03:57:37 +00:00
0293e07437
LLP64 fix.
...
svn path=/trunk/; revision=28120
2009-04-22 03:50:13 +00:00
5c224bdd74
Signed vs. unsigned fix.
...
svn path=/trunk/; revision=28119
2009-04-22 03:49:45 +00:00
ad33ca6c2f
Clean up some 64-bit issues.
...
svn path=/trunk/; revision=28117
2009-04-22 03:07:37 +00:00
15f33eecbf
Disable warnings-as-errors for Flex-generated output. Add a couple of gsize
...
casts.
svn path=/trunk/; revision=28002
2009-04-08 18:08:25 +00:00
db3e983b04
Add a check to make sure we don't try to allocate a huge buffer. If
...
we get an improper buffer length, throw an error instead of
aborting. Clean up the debugging code.
svn path=/trunk/; revision=27918
2009-03-31 22:51:59 +00:00
0258be0b05
From Jakub Zawadzki:
...
More remove checking for NULL before g_free().
svn path=/trunk/; revision=27728
2009-03-15 18:08:46 +00:00
0df88c651e
Flex doesn't generate LLP64-compilable output. For the time being don't
...
use -WX when compiling ascend-scanner.c and k12text.c.
svn path=/trunk/; revision=27703
2009-03-11 18:48:34 +00:00
51cf696142
Another iteration of 64-bit-support-by-successive-approximation.
...
svn path=/trunk/; revision=27690
2009-03-10 17:38:24 +00:00
0b7885e04d
ng_file_read and SnifferDecompress need to be able to return negative
...
values, so adjust accordingly.
svn path=/trunk/; revision=27688
2009-03-10 16:33:38 +00:00
2236109a82
More 64-bit fixes.
...
svn path=/trunk/; revision=27685
2009-03-09 22:37:55 +00:00
40f5a17d46
Convert a bunch of ints to size_t in ngsniffer.c, and make sure file_read
...
can accept size_t's.
svn path=/trunk/; revision=27684
2009-03-09 22:28:05 +00:00
cc739fecb0
P64 fixes.
...
svn path=/trunk/; revision=27683
2009-03-09 21:18:55 +00:00
df62772320
Change a a remaining eth_fopen to ws_fopen (used only under an #if debug).
...
svn path=/trunk/; revision=27659
2009-03-08 16:28:20 +00:00
4a5e0ba2bc
More P64 changes.
...
svn path=/trunk/; revision=27641
2009-03-07 05:18:59 +00:00
6552d5d5bd
More P64 changes.
...
svn path=/trunk/; revision=27640
2009-03-07 05:13:44 +00:00
849186ae59
More P64 changes.
...
svn path=/trunk/; revision=27639
2009-03-07 05:13:12 +00:00
07addfdcea
More P64 changes.
...
svn path=/trunk/; revision=27638
2009-03-07 05:11:56 +00:00
b2408ca1a3
Squelch warnings - none of those strings will be so long that the
...
difference between an int and a gsize/size_t matters.
svn path=/trunk/; revision=27637
2009-03-07 05:11:15 +00:00
e6ccfc6944
More P64 stuff.
...
svn path=/trunk/; revision=27636
2009-03-07 04:47:06 +00:00
Jörg Mayer