Commit Graph

936 Commits

Author SHA1 Message Date
Luis Ontanon 7432291121 From: Kriang Lerdsuwanakij
In the attached patch, the K12 wiretap now saves the content of record
after captured packet data. The K12 dissector then could extract them and provide
useful information to properly dissect FP frames (user plane of UTRAN Iub
interface).



svn path=/trunk/; revision=20749
2007-02-08 17:35:03 +00:00
Luis Ontanon a84df38651 from:
Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> 	

I discovered that Wireshark K12xx detects the type of input (E1 timeslot or ATM)
based on the extra information. My previous patch to enable Wireshark to open
K12xx files with no extra information (extra_len equals 0 in SRCDEST record)
failed to give later dissectors the input type.

Attached is the patch to correct this for ATM PVC. It adds VPI/VCI/CID information
for display in the dissected tree (in k12_open function). k12_read and k12_seek_read
are also made more robust. These are reverse engineered based on hexeditor
and constants found in tektronix configuration file. Please apply the patch.


svn path=/trunk/; revision=20705
2007-02-04 02:13:12 +00:00
Ulf Lamping cd5aae8116 instead of putting the MSC_VER_REQUIRED test into the root Makefile (which would require to change ALL makefiles - the buildbot revealed it), simply put it in the wiretap generation. As wiretap is mandatory and one of the first things to be build this doesn't even sound like a bad idea anyway ...
svn path=/trunk/; revision=20646
2007-01-31 05:26:41 +00:00
Guy Harris 9633ac8fee From Paolo Abeni: update to support the new DLT_USB_LINUX format header.
Modified to support the header as a pseudo_header rather than as part of
the packet data.

Fixed some calls that fetch data from the USB packet to fetch it in
little-endian byte order.

Got rid of redundant code to get conversation-specific data (the
get_usb_conv_info() call already does that).

For control packets, only parse the setup information if setup_flag is
0.

Don't interpret a control packet as a standard request unless the setup
type is "Standard".

svn path=/trunk/; revision=20632
2007-01-30 20:07:55 +00:00
Luis Ontanon 6a2d87516a from Kriang Lerdsuwanakij
I found out the reason Wireshark refuses to read some .rf file I have.
Those files have zero extra_len in SRCDEST header structure. See the
attached file for example. It was created by selecting some frames from
a larger .rf5 file (within Tektronix's own reader) and save as a
separate file.


svn path=/trunk/; revision=20579
2007-01-28 01:24:20 +00:00
Guy Harris dd54b08eda Put in some information about RSSI.
svn path=/trunk/; revision=20498
2007-01-19 05:22:43 +00:00
Guy Harris 0fb0fa8794 Put
#ifdef __cplusplus
	extern "C" {
	#endif /* __cplusplus */

		...

	#ifdef __cplusplus
	}
	#endif /* __cplusplus */

wrappers into some header files, for the benefit of C++ plugins.  Also,
add multiple-include protections.

svn path=/trunk/; revision=20485
2007-01-18 18:43:30 +00:00
Guy Harris 0f44dcb15c From Clay Jones: Shomiti wireless packet support.
svn path=/trunk/; revision=20475
2007-01-18 12:19:17 +00:00
Martin Mathieson 997e5415f9 Add separate union entries to fvalue.value for signed and unsigned
32-bit numbers.  Separate signed and unsigned accessors have been
added and used where appropriate.

Definitely not for 0.99.5.

svn path=/trunk/; revision=20472
2007-01-18 11:02:26 +00:00
Luis Ontanon e648b5c77b fix Bug 1301
do not let the ascend_open() read more than 256K without finding the first packet.


svn path=/trunk/; revision=20424
2007-01-14 06:13:07 +00:00
Guy Harris bbdb2dd733 Automake variables ending with _LDFLAGS are special:
http://sources.redhat.com/ml/automake/2001-08/msg00046.html

so call it LDFLAGS_SHAREDLIB rather than SHAREDLIB_LDFLAGS.

svn path=/trunk/; revision=20410
2007-01-12 21:04:33 +00:00
Ulf Lamping f3235a259f second try for file_util.c ... (at least OS X didn't liked it)
svn path=/trunk/; revision=20403
2007-01-12 05:47:12 +00:00
Ulf Lamping 2cbce84d41 Win32: MSVC > 6 doesn't work well with Unicode filenames!
fix this, by providing required functions in the new file file_util.c - it's mostly copied from GLib (g_open alike - that take UTF8 as filename format but don't use msvcrt.dll V6 for this as the glib files do) 

"link" to these functions in file_util.h: #define eth_open eth_stdio_open

revert changes (from SVN 20282) throughout the code related to these file functions which were introduced with the first tries of MSVC 2005 ...

Hopefully I've done everything right with the new file_util.c ...

svn path=/trunk/; revision=20402
2007-01-12 03:05:28 +00:00
Guy Harris 0e89a5617f We support nanosecond resolution in Wiretap; use that with AIX libpcap
files.

svn path=/trunk/; revision=20338
2007-01-08 02:55:41 +00:00
Guy Harris 4189374651 When Mr. Genius added the SHAREDLIB_LDFLAGS stuff, he forgot that
Wiretap has its own configuration file.  Do to its configuration file
what was done to the top-level configuration file.

svn path=/trunk/; revision=20326
2007-01-05 07:36:30 +00:00
Guy Harris 405b7189a4 On Darwin, build shared libraries with -Wl,-single_module to the LDFLAGS
used with shared libraries, to fix some error that shows up in some
cases; some Apple documentation recommends it for most shared libraries.

svn path=/trunk/; revision=20312
2007-01-04 20:47:43 +00:00
Martin Mathieson b9f69234ad Check in trivial changes before generating a big diff...
svn path=/trunk/; revision=20304
2007-01-04 13:25:25 +00:00
Ulf Lamping 59cebb950f remove the PDB_FILE setting from config.nmake - there's no real need for this info
add some missing files to the clean targets

svn path=/trunk/; revision=20290
2007-01-03 05:41:11 +00:00
Ulf Lamping 894f6cd603 from Laurent Rabret:
I posted a patch about 1.5 years ago for the formerly Ethereal to successfully compiled with Visual > 6. I have always successfully used this patched Ethereal/Wireshark compiled with VS 2003 and have just checked when compiled with Visual C++ 2005 Express

svn path=/trunk/; revision=20282
2007-01-03 02:50:22 +00:00
Jaap Keuter 224a21ecfe From Mark C. Brown:
HP-UX 11.31 will add a new nettl trace subsystem, NS_LS_TELNET (ID=267).
NS_LS_TELNET is just raw telnet data.  There is no layer 2/3/4 headers, so
there's just the HP-UX nettl record header followed directly by the TCP payload
for a telnet connection.  Thus the need for a new wiretap encapsulation type...

svn path=/trunk/; revision=20253
2007-01-01 14:48:18 +00:00
Jaap Keuter 33310e87b6 From Mark C. Brown:
Fix some nettl encap types and size checks

svn path=/trunk/; revision=20252
2007-01-01 14:43:15 +00:00
Guy Harris 979195c122 Fix indentation.
svn path=/trunk/; revision=20213
2006-12-25 21:34:11 +00:00
Anders Broman 6c9ce8acf8 Froim Rene Pilz:
This patch consists also the last issues. Additionally it solves:
- For the SSCOP frames the AAL5 decoding was not performed due to an earlier patch. This caused that no SSCOP message was properly decoded.
- As the detection between a LANE frame and a SSCOP frame is rather hard a switch within the atm dissector is included which enforce SSCOP dissecting over a LANE frame. At the moment I do not see a better solution for that.

svn path=/trunk/; revision=20013
2006-11-29 06:44:07 +00:00
Guy Harris 8d8a1cb32a Map a DLT_ value of 188 to WTAP_ENCAP_IEEE802_16_MAC_CPS, and clarify
what a DLT_ value of 187 is.

svn path=/trunk/; revision=20004
2006-11-27 18:41:45 +00:00
Guy Harris 252230934a Add Wiretap encapsulation type for IEEE 802.16 MAC Common Part Sublayer,
for which a DLT_ value and LINKTYPE_ value have just been assigned.

svn path=/trunk/; revision=20003
2006-11-27 18:10:12 +00:00
Ulf Lamping a339636b85 both recent fixes of warnings don't compile on Win32, inttypes.h is not available and PRId64 is not defined in the config.h.win32.
As discussed in a seperate thread the PRId64 should not be required.

svn path=/trunk/; revision=19925
2006-11-18 03:37:34 +00:00
Martin Mathieson 7712c21de5 Try to squash 2 more warnings seen on buildot
svn path=/trunk/; revision=19921
2006-11-17 16:33:43 +00:00
Martin Mathieson 2d58914f77 Fix possible build error + warnings seen on buildbot
svn path=/trunk/; revision=19892
2006-11-14 13:45:35 +00:00
Martin Mathieson 8e9a8430d8 - Use 64-bit indexes into file for packet locations (was previously casting index to and from void*) - this should allow very large files to be used
- The characters between the timestamp and start of data are almost always " l ", optimise memory usage in this case
- Rename hash table for clarity

svn path=/trunk/; revision=19891
2006-11-14 12:06:11 +00:00
Gerald Combs d20f77d3ec Add a plain "radiotap.channel" field to the radiotap dissector.
Check for an invalid channel frequency.  Pass the channel, data rate,
and quality to the 802.11 dissector, so that they show up there
as well.  Clean up whitespace.

svn path=/trunk/; revision=19878
2006-11-12 00:52:05 +00:00
Guy Harris ad3c10a20a Update to describe all that the read routine needs to return, and to
indicate what the seek_read routine needs to do and that you *have* to
have a seek_read routine.

svn path=/trunk/; revision=19860
2006-11-07 19:25:32 +00:00
Ulf Lamping ecfa9c3d2b fix the return value of file_seek, as noted by Steve
svn path=/trunk/; revision=19816
2006-11-06 00:24:24 +00:00
Ulf Lamping 59d6c8ea33 change all file offsets from long to gint64 so we can - theoretically - handle files > 2GB correct.
Please distclean Win32 builds!

svn path=/trunk/; revision=19814
2006-11-05 22:46:44 +00:00
Jörg Mayer e8a5a41045 Parts of http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1179
Frederic Heem:
* More cmake system checks. It compiles dumpcap without running configure,

svn path=/trunk/; revision=19672
2006-10-24 17:39:32 +00:00
Martin Mathieson d55c609c55 - Fix problems with parsing sctpprim headers
- Add dissection of nbap (as encap or inside sctp primitive)

svn path=/trunk/; revision=19664
2006-10-23 17:22:20 +00:00
Michael Tüxen 3ce4a70412 Use G_GINT64_CONSTANT to handle 64-bit constants in the code.
svn path=/trunk/; revision=19663
2006-10-23 17:12:48 +00:00
Bill Meier 798a4b8c77 fix 'save' to store hi-order 32 bits of time offset for each pkt; fixes bug 1168
svn path=/trunk/; revision=19622
2006-10-20 01:17:17 +00:00
Guy Harris e773247138 If we have to use Lex or Flex, check whether we found it, first, and if
we didn't, report an error and fail, rather than blithely executing
commands with the command a blank string.

svn path=/trunk/; revision=19602
2006-10-19 07:45:10 +00:00
Jörg Mayer e8869dffb9 Paolo Abeni:
the attached patch add support for the recently introduced pcap
bluetooth data link type. Yes, pcap is going to support also bluetooth
devices (at least on Linux) :-)


svn path=/trunk/; revision=19513
2006-10-13 15:18:10 +00:00
Ronnie Sahlberg 26f642778f From Paolo Abeni
USB dissector


svn path=/trunk/; revision=19480
2006-10-10 21:00:35 +00:00
Anders Broman ca8bc2b83a From Martin Warnes:
The patch addresses issues with higher precision packet
timings on top end iSeries hardware and should enable the iseries wiretap to handle timings in both micro and nano seconds.

svn path=/trunk/; revision=19428
2006-10-04 17:36:40 +00:00
Martin Mathieson 3474ea868c - Add special case for reading strange encoding of ATM CID field
- Indicate direction of DCH Data in info column
- Assume EDCH payload CRC if 2 bytes are left over (previous test was broken)

svn path=/trunk/; revision=19405
2006-10-03 14:21:07 +00:00
Jaap Keuter 72cf2186d3 From: Rolf Fiedler
So far Wireshark complained about channel 129, now it gets a little further 
and then complains about channel 128. 

Solution: Open up all channel from 128 up. 

svn path=/trunk/; revision=19358
2006-09-29 08:47:51 +00:00
Jaap Keuter 81d8db9705 From Rolf Fiedler:
I am the author of the eyesdn wiretap module. Recently we added ATM
support to our trace format. We used channel id 129 for that, so far
only 0 for D channel and 1-30 for bearer channels had been in use.

svn path=/trunk/; revision=19353
2006-09-28 20:28:26 +00:00
Gerald Combs 3edaa624c5 Get rid of a compiler warning.
svn path=/trunk/; revision=19224
2006-09-12 21:59:54 +00:00
Martin Mathieson 2e1177c328 For DCT2000, show better transport info:
- for FP over AAL2, add CID to AAL tree
- for IPPRIM protocols, show IPV4 addresses in src & dst columns

svn path=/trunk/; revision=19156
2006-09-05 16:05:23 +00:00
Jörg Mayer 9f4f88e84e propset, add $Id: $ and copyright headers
svn path=/trunk/; revision=19150
2006-09-05 09:50:45 +00:00
Jörg Mayer 57656db02e OK, as I haven't had any negative feedback, I'm adding my work
to use cmake as a build system. It's in no way complete, I'd
just like others to be able to participate in playing with cmake
and to document what I'm doing.

Please read the README.cmake for what can be done right now.

svn path=/trunk/; revision=19149
2006-09-05 09:27:22 +00:00
Martin Mathieson 76192b1c6c Partial implementation of UMTS FP. Currently only works with Catapult DCT2000 format files, as need extra information about packet when decoding. There are a few TODOs (notably E-DCH channels), but the current version gives OK coverage.
svn path=/trunk/; revision=19130
2006-09-04 11:04:14 +00:00
Guy Harris a6eda1060e Rework some of the header processing, to handle some additional nettl
files, and to clean the code up a bit - and incorporate some fixes to
the rework, and other fixes, from Mark C. Brown.

svn path=/trunk/; revision=18945
2006-08-18 09:01:20 +00:00