aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
AgeCommit message (Collapse)AuthorFilesLines
2010-03-25Update a comment to discuss how zlib and z_off_t has gotten messier lately.Guy Harris1-0/+8
svn path=/trunk/; revision=32280
2010-03-18cmake changes:Jörg Mayer1-0/+1
- Add checking for linker flags - Install plugins with the name including the Wireshark version. This will make it easier to find matching plugin versions if files get just copied over. svn path=/trunk/; revision=32231
2010-02-27Fix some types, to squelch compiler warnings (this should introduceGuy Harris1-2/+2
another valid warning, if you've turned the warnings up high enough; we need to generate a zlib version of stdout). svn path=/trunk/; revision=32027
2010-02-26Move the definitions of all the private data structures out ofGuy Harris26-623/+536
wtap-int.h, and change the unions of pointers to those private data structures into just void *'s. Have the generic wtap close routine free up the private data, rather than the type-specific close routine, just as the wtap_dumper close routine does for its private data. Get rid of close routines that don't do anything any more. svn path=/trunk/; revision=32015
2010-02-25Have parse_ascend() return:Guy Harris3-10/+21
PARSED_RECORD if we got a packet; PARSED_NONRECORD if the parser succeeded but didn't see a packet; PARSE_FAILED if the parser failed. Treat anything other than PARSED_RECORD as a failure, for now; I'm not sure why we were treating "parser succeeded but didn't see a packet" as success, as that was causing us to recognize some non-Ascend-output text files as Ascend files and to return "records" with bogus caplen and len values. svn path=/trunk/; revision=32009
2010-02-24Move the definition of the private data structure from wtap-int.h to theGuy Harris2-32/+33
iSeries capture processor. Parse the start date into year/month/day at the time we see it, rather than for every packet; that means we don't need to allocate a buffer to hold the date as a string (a buffer which we weren't ever freeing). svn path=/trunk/; revision=31981
2010-02-24Define the private data structures for some particular capture fileGuy Harris4-138/+164
types in the modules for those capture file types, not in wtap-int.h, so wtap-int.h doesn't have to change when the code to handle that particular capture type changes, or a new capture file type is added. (Ultimately, we should do this for all the private data structures.) svn path=/trunk/; revision=31974
2010-02-23Move the declarations of wtap_pcap_encap_to_wtap_encap() andGuy Harris7-6/+43
wtap_wtap_encap_to_pcap_encap() to wiretap/pcap-encap.h. Include it where it's needed; don't include other Wiretap headers where they're not needed. Include pcapng.h in pcapng.c, to declare the functions defined in pcapng.c. Add some casts to squelch some warnings, and add to a comment to indicate one of the problems. svn path=/trunk/; revision=31960
2010-02-23Squelch some compiler warnings (some of which indicate potentialGuy Harris2-14/+14
problems, and some of which are, at least, incorrect casts). svn path=/trunk/; revision=31957
2010-02-23Don't use C++ keywords as variable names - prepend "ber_" in front ofGuy Harris1-11/+11
variables with BER metadata. svn path=/trunk/; revision=31956
2010-02-23Squelch some (valid) warnings.Guy Harris1-2/+2
svn path=/trunk/; revision=31955
2010-02-23Fix cast.Guy Harris1-1/+1
svn path=/trunk/; revision=31954
2010-02-23Attempt to squelch some compiler warnings.Guy Harris1-2/+2
svn path=/trunk/; revision=31953
2010-02-02From Stephen Donnelly:Anders Broman2-2/+5
Endace ATM and AAL2 enhancements. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4447 svn path=/trunk/; revision=31766
2010-02-01From Tobias Witek:Anders Broman1-0/+1
Replace ERF dissector with ATM dissector for protocols 'FP Hint' and 'META' https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4384 svn path=/trunk/; revision=31761
2010-01-27Fix a comment.Guy Harris1-4/+6
svn path=/trunk/; revision=31693
2010-01-23Fix for bug 4408:Jaap Keuter1-2/+14
Make further encapsulation determination between "VC-multiplexed PPP" and "LLC encapsulated PPP". See RFC 2364. svn path=/trunk/; revision=31634
2010-01-18Fix gcc -Wshadow warnings ....Bill Meier1-33/+33
svn path=/trunk/; revision=31558
2009-12-23The maker of *Peek is WildPackets, InterCap and all, not Wildpacket.Guy Harris1-3/+3
svn path=/trunk/; revision=31358
2009-12-17From Petr Sumbera:Stig Bjørlykke1-1/+1
Small comment fix. svn path=/trunk/; revision=31293
2009-12-09When reading NetMon capture files version 2.1 and higher (the latest is 2.2 ↵Stephen Fisher1-1/+10
right now), the capture file's header encapsulation type is set to 1 for Ethernet for backwards compability only. These files use per-packet encapsulation types instead. For now, set it to Unknown file encapsulation until we can find a way to set it to WTAP_ENCAP_PER_PACKET without having to assert in wtap_read() so the user can see that it is a per-packet encapulation in places such as the capinfos program. svn path=/trunk/; revision=31213
2009-12-08From Felix Obenhuber via bug #4299: SocketCAN dissector patchStephen Fisher2-0/+4
From me: Remove changes related to the ARP protocol because it doesn't appear to be necessary for SocketCAN. Will add later if Felix says it is needed. svn path=/trunk/; revision=31196
2009-12-04Revise #31172 slightly to clarify #define dependenciesBill Meier1-4/+6
svn path=/trunk/; revision=31173
2009-12-04From: babiBill Meier1-2/+6
[Fix] potential memory problem (crash?) in daintree-sna. See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4294 (A parameterized version of the patch supplied in the above) svn path=/trunk/; revision=31172
2009-12-04From: Ravi Kondamuru:Bill Meier1-64/+64
"... a patch to make the netscaler wiretap code independent of the host system endian-ness. I have taken care of (1) reading and writing nstrace files (netscaler.c) and (2) reading in dissector code (packet-nstrace.c) also." See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3540#c26 svn path=/trunk/; revision=31171
2009-12-03Renamed some wtap defines:Stig Bjørlykke2-4/+4
WTAP_GCOM_TIE1 => WTAP_ENCAP_GCOM_TIE1 WTAP_GCOM_SERIAL => WTAP_ENCAP_GCOM_SERIAL svn path=/trunk/; revision=31161
2009-12-03Added missing WTAP_ENCAP_DPNSS and WTAP_ENCAP_PACKETLOGGER to encap_table_base[]Stig Bjørlykke1-2/+8
Fixed some comments. svn path=/trunk/; revision=31160
2009-12-03From Petr Sumbera via bug 4284:Stig Bjørlykke4-1/+31
Added support for Solaris IPNET layer From me: Some code cleanup in packet-ipnet.c Added packet-ipnet.c to CMakeFiles.txt Added WTAP_ENCAP_IPNET to encap_table_base[] svn path=/trunk/; revision=31159
2009-11-18Switch HighHdr and LowHdr to build correct absolute time.Stig Bjørlykke1-2/+2
svn path=/trunk/; revision=31005
2009-11-18Another try to treat the two 32bit time values (low, high) in v23 formatStig Bjørlykke1-1/+1
as a 64bit value. svn path=/trunk/; revision=31002
2009-11-18If no error is returned by a Wiretap routine, err_info is presumed notGuy Harris1-2/+2
to have been set. Do not set it to something g_mallocated in that case, as that will cause a memory leak - the error string will not be freed by the caller, as it's presumed not to have been set. svn path=/trunk/; revision=31001
2009-11-17From Ravi Kondamuru via bug 3540:Stig Bjørlykke1-1/+2
Treat the two 32bit time values (low, high) in v23 format as a 64bit value. svn path=/trunk/; revision=30994
2009-11-17Beginnings of enabling static builds. Still to do:Jörg Mayer1-6/+8
* Add -static * Registration may need different handling * Add plugins * Build error in wslua svn path=/trunk/; revision=30987
2009-11-09Removed an unused assignment.Stig Bjørlykke1-2/+1
svn path=/trunk/; revision=30892
2009-11-09Removed an unused variable.Stig Bjørlykke1-2/+1
svn path=/trunk/; revision=30891
2009-11-07cmake will now honor -Werror if configured (default: on)Jörg Mayer1-0/+12
svn path=/trunk/; revision=30852
2009-10-26Note in comments that the dct2000_file_externals_t structure is used forGuy Harris1-6/+13
more than just dumping, indicate what stuff is used for dumping, and note that it probably shouldn't be used for that (one should not have to have a Catapult 2000 input file in order to write a Catapult 2000 output file). svn path=/trunk/; revision=30719
2009-10-26Update URL for LANalyzer file format.Guy Harris1-1/+1
svn path=/trunk/; revision=30717
2009-10-26Try to fix win64 buildbot. Both fgets() and gzgets() take an int for the ↵Martin Mathieson1-1/+1
length. svn path=/trunk/; revision=30709
2009-10-26Get rid of capture.catapult_dct2000, move start time of capture into ↵Martin Mathieson2-40/+31
file_externals instead. Thanks Guy for helping to simplify this file! svn path=/trunk/; revision=30708
2009-10-26Global variables considered harmful - we don't want to rule out twoGuy Harris1-98/+101
threads reading from two different wtap_t's in different threads. file_externals_table considered unnecessary - a wtap_t has a member specifically intended to point to private data. Clean up indentation. svn path=/trunk/; revision=30707
2009-10-26Formatting changes only.Martin Mathieson1-240/+135
svn path=/trunk/; revision=30704
2009-10-26Fix:Anders Broman1-4/+4
Error: Found prohibited APIs in catapult_dct2000.c: sprintf,strcpy svn path=/trunk/; revision=30701
2009-10-26Add support for showing/filtering/resaving logged LTE strings.Martin Mathieson1-140/+218
svn path=/trunk/; revision=30700
2009-10-18Fixed data type for a buffer.Stig Bjørlykke1-2/+2
svn path=/trunk/; revision=30609
2009-10-18Fixed data type for asciibuf.Stig Bjørlykke1-2/+2
svn path=/trunk/; revision=30608
2009-10-18Removed non-ASCII characters.Stig Bjørlykke2-4/+4
svn path=/trunk/; revision=30590
2009-10-17From Marton Nemeth:Stig Bjørlykke7-1/+211
Add the ability to open JPEG/JFIF files directly. From me: Some code cleanup + add new file to cmake. svn path=/trunk/; revision=30588
2009-10-01(minor) Indent fix.Stig Bjørlykke1-3/+3
svn path=/trunk/; revision=30228
2009-09-30Removed an unneeded assignment.Stig Bjørlykke1-1/+0
svn path=/trunk/; revision=30215