aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-10-18Move ui-independent object export routines to the common ui directory.Gerald Combs22-209/+894
Implement DICOM, HTTP, and SMB object exports. Rename the GTK+ export files. C++-ize epan/tap.h. Fix an apparent memory leak in eo_save_all_clicked_cb. The Qt dialog has an indeterminate progress bar. I tried adding something similar to the GTK+ dialog but event processing led down a rabbit hole. svn path=/trunk/; revision=45647
2012-10-18(try to) fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7871Martin Kaiser1-1/+1
increment offset to point to the first byte after the options (the code used to set an absolute position, if that was 0, we were stuck in an endless loop) svn path=/trunk/; revision=45646
2012-10-18minor cleanup of packet-wtp.cMartin Kaiser1-758/+731
- replace TABs with spaces - add modelines - reformat some parts - use glib data types svn path=/trunk/; revision=45645
2012-10-18(Trivial)Bill Meier1-21/+25
- 1 --> TRUE; - whitespace and formatting changes. svn path=/trunk/; revision=45644
2012-10-18add CC datatype IDs for the SRM protocolMartin Kaiser1-0/+4
svn path=/trunk/; revision=45643
2012-10-18Minor cleanup:Bill Meier1-1300/+1299
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back (9 instances); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined as 0x0000000]; - remove some unneeded initializers; - unsigned --> guint; - remove unneeded #includes. - whitespace changes. svn path=/trunk/; revision=45642
2012-10-18Minor cleanup:Bill Meier1-159/+154
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back (10 instances); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined as 0x0000000]; - Remove unneeded #includes; - whitespace (e.g., use consistent indentation). svn path=/trunk/; revision=45641
2012-10-18Minor cleanup:Bill Meier1-6/+5
- Fix incorrect use of ENC_BIG_ENDIAN instead of FALSE (3 instances); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined as 0x0000000]; - use proper ENC arg for a proto_tree_add_item(); - whitespace. svn path=/trunk/; revision=45640
2012-10-18Don't mark used arguments with _U_. Whitespace: tabs -> spaces.Chris Maynard1-245/+245
svn path=/trunk/; revision=45639
2012-10-18Minor cleanup:Bill Meier1-442/+512
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back (10 instances); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined ad 0x0000000]; - create/use extended value strings as appropriate; - remove unneeded initializers; - reformat hf[] entries; - whitespace. svn path=/trunk/; revision=45638
2012-10-18str_util.c:format_size() uses 0xff00 for the mask, so left-shift ↵Chris Maynard1-2/+2
format_size_prefix_[si|iec] by 8, not 16. Fixes Coverity CID 733852: Operands don't affect result. svn path=/trunk/; revision=45637
2012-10-18Fix Coverity CID 739070: Unused pointer value.Chris Maynard1-1/+1
svn path=/trunk/; revision=45636
2012-10-18Minor cleanup:Bill Meier1-73/+70
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back (3 cases); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined ad 0x0000000]; - Remove 'if(tree)' around calls to subdissector; - whitespace & formatting. svn path=/trunk/; revision=45635
2012-10-18Minor cleanup:Bill Meier1-480/+479
- create/use extended value strings as appropriate; - unsigned --> guint; - whitespace; svn path=/trunk/; revision=45634
2012-10-18Dissect additional information parameters for Result objectPascal Quantin1-3/+132
svn path=/trunk/; revision=45633
2012-10-18tvb_reported_length_remaining() can return -1, so don't assign the return ↵Chris Maynard1-2/+2
value to a guint16. Fixes Coverity CID 728017: Negative loop bound. svn path=/trunk/; revision=45632
2012-10-18General cleanup:Bill Meier1-338/+253
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back (2 cases); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined ad 0x0000000]; - use proto_tree_add_item() instead of proto_tree_add_uint() when appropriate; - move proto_register...() to just before proto_reg_handoff..() as per convention; - proto_reg_handoff...() doesn't need 'if (!initialized)' - remove unneeded #includes; - remove some "boilerplate" comments; - remove unneeded forward declaration; - whitespace. svn path=/trunk/; revision=45631
2012-10-18From Matthias St. Pierre:Anders Broman1-5/+11
Add authentication methods HMAC-SHA2-256-96 and HMAC-SHA2-256-128 to isakmp dissector https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7873 svn path=/trunk/; revision=45630
2012-10-18Add a few EUTRAN related elementary files and reorder some value_string arraysPascal Quantin1-26/+34
svn path=/trunk/; revision=45629
2012-10-18Handle the fractions-of-a-second part of the time stamp correctly. Guy Harris1-17/+39
Extract it as a string, not a number, and determine the resolution based on the length of the string, i.e. on the number of digits presented. (If you base it on the numerical value, leading zeroes will not be taken into account, but they aren't any different from other digits when determining the resolution.) The resolution is 1/10^ndigits seconds, so we have to multiply it by 10^(9-ndigits) to convert the number to nanoseconds. svn path=/trunk/; revision=45627
2012-10-18Redo the processing of lines in iSeries text packet dumps.Guy Harris1-311/+208
Process several different flavors of header lines the same: "IP Header", "IPv6 Header", "ARP Header", "TCP Header", "UDP Header", "ICMP Header", "ICMPv6 Hdr", "Option Hdr" - the hex data for all of them should be included in the packet data. Process continuation lines if those headers wrap over more than one line. Do not assume, or require, that *any* of those be present; there is no guarantee that "IP Header" or "IPv6 Header" will be present (there's at least one IBM page showing a packet with "ARP Header" in a trace), and there is no guarantee that "TCP Header" will be present (there are traces with "UDP Header" and "ICMPv6 Hdr"). Do not impose limits, other than the overall line limit, on the amount of hex data in header or data lines; there is no guarantee that, for example, a TCP header is 20 bytes long (if there are TCP options, it *will* have more than 20 bytes). Make sure we have an even number of hex digits. Set "caplen" to the actual number of bytes we've read, even if that's less than the purported packet length. svn path=/trunk/; revision=45626
2012-10-18Reformat for readability:Bill Meier1-1400/+1798
indentation, whitespace, long-lines, etc. Also; - replace two usages of fprintf(stderr,...) by g_warning(); - revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back (2 cases); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined ad 0x0000000] svn path=/trunk/; revision=45625
2012-10-17Only cap_len (not pkt_len) bytes of buffer are valid.Jakub Zawadzki1-4/+4
svn path=/trunk/; revision=45621
2012-10-17Fix a copy/paste errorJakub Zawadzki1-1/+1
svn path=/trunk/; revision=45620
2012-10-17Fill some phdr values also when doing random readJakub Zawadzki9-161/+133
svn path=/trunk/; revision=45619
2012-10-17"Wireshark", in this context, mainly means "libwireshark"; preferencesGuy Harris1-8/+1
should be shared by TShark and Wireshark, so the preference directory path should be independent of the program name. Program-specific or GUI-toolkit-specific preferences should be kept in separate files, or ignored but preserved by programs to which they don't apply. svn path=/trunk/; revision=45618
2012-10-17Cleanup:Bill Meier1-119/+105
- Revmove 'if (tree...)'; col_...() shouldn't be called under same; - Add an XXX comment; - Remove not req'd #include <epan/prefs.h>; - Address cppcheck msg: "Clarify calculation precedence for >> and ?"; - Localize certain variables & remove unneeded initializers; - Do some whitespace changes. svn path=/trunk/; revision=45617
2012-10-17(Trivial) remove trailing whitespace.Bill Meier1-9/+9
svn path=/trunk/; revision=45616
2012-10-17Read the program name rather than hardcoding it.Anders Broman1-1/+8
svn path=/trunk/; revision=45615
2012-10-17fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7869Martin Kaiser1-1/+1
make tpiLen a guint such that it can store 2 + tvb_get_guint8(...) without overflow svn path=/trunk/; revision=45614
2012-10-17Fix some UM sequence analysis issues.Martin Mathieson1-22/+22
svn path=/trunk/; revision=45613
2012-10-17#include <gtk/gtk.h> not req'd; Fixes compile errorsBill Meier2-2/+0
svn path=/trunk/; revision=45612
2012-10-17The first 4 bytes of the Prism header are, apparently, a "message code",Guy Harris1-66/+89
and it apparently either has the value 0x00000044 or 0x00000041. If those bytes aren't the magic number for an AVS header and aren't one of those "message code" values, assume there's no Prism header, just an 802.11 frame - that fixes at least one capture where some packets have AVS radio headers and other packets have no radio header. Note that this might also let us handle big-endian Prism headers (see which byte order the message code is in, and assume everything else is in the same byte order). Display the message code in hex, not decimal. svn path=/trunk/; revision=45609
2012-10-16Change the "Bytes" column to "Size" and make its values human readable.Gerald Combs1-4/+8
svn path=/trunk/; revision=45608
2012-10-16Set svn:eol-style property to LF.Bill Meier0-0/+0
It seems that cppcheck requires the includes file have *nix stle line-endings. (It also appears that this is *not* required for the suppressions list file). svn path=/trunk/; revision=45607
2012-10-16Move the DICOM, HTTP, and SMB object export code to the ui directory.Gerald Combs11-89/+147
svn path=/trunk/; revision=45606
2012-10-16Use local variable, local one is also used later by epan_dissect_run().Jakub Zawadzki1-1/+1
svn path=/trunk/; revision=45605
2012-10-16Don't try to use a non-existant pseudo_header variable.Evan Huus1-1/+1
svn path=/trunk/; revision=45604
2012-10-16Second try to fix wslua building.Jakub Zawadzki1-2/+3
svn path=/trunk/; revision=45603
2012-10-16Try to fix building wslua.Jakub Zawadzki1-1/+2
svn path=/trunk/; revision=45602
2012-10-16Add wtap_pseudo_header union to wtap_pkthdr structure.Jakub Zawadzki77-360/+369
Use pkthdr instead of pseudo_header as argument for dissecting. svn path=/trunk/; revision=45601
2012-10-16Add dissection of ENVELOPE event download and timer expirationPascal Quantin1-1/+8
svn path=/trunk/; revision=45600
2012-10-16fix some more cases where tvb_length_remaining() is assignedMartin Kaiser1-3/+3
to an unsigned int svn path=/trunk/; revision=45599
2012-10-16make the variable that holds tvb_length_remaining() a signed integerMartin Kaiser1-1/+1
svn path=/trunk/; revision=45598
2012-10-16Dissect a few more command qualifiersPascal Quantin1-0/+26
svn path=/trunk/; revision=45597
2012-10-16Add an include.Gerald Combs1-0/+2
svn path=/trunk/; revision=45596
2012-10-16Fix dissection of BER-TLV and COMPREHENSION-TLV length and COMPREHENSION-TLV tagPascal Quantin2-8/+45
svn path=/trunk/; revision=45595
2012-10-16Use topic_action instead of topic_cb for the Windows file dialogs. MoveGerald Combs10-87/+63
the common Qt help code to wireshark_application.cpp. svn path=/trunk/; revision=45594
2012-10-16Remove svn:executable propertyBill Meier2-0/+0
svn path=/trunk/; revision=45593
2012-10-16Change svn:mime-type to image/pngBill Meier0-0/+0
svn path=/trunk/; revision=45592