Commit Graph

43145 Commits

Author SHA1 Message Date
Jakub Zawadzki ef72e0eed3 - Free root node and tree data outside proto_tree_free_node,
- remove #if 0 code.

svn path=/trunk/; revision=45668
2012-10-20 16:38:55 +00:00
Evan Huus eb4e26e1b7 Make a few variables volatile to fix longjmp warnings.
svn path=/trunk/; revision=45667
2012-10-20 13:16:10 +00:00
Jakub Zawadzki 88ac0dbea2 Pass create_proto_tree, cinfo directly to add_packet_to_packet_list
svn path=/trunk/; revision=45666
2012-10-20 12:51:34 +00:00
Jakub Zawadzki ea31ff66a0 Remove always TRUE refilter argument from rescan_packets, add_packet_to_packet_list
svn path=/trunk/; revision=45665
2012-10-20 12:51:05 +00:00
Evan Huus 99ddfe913c Remove unused variable.
svn path=/trunk/; revision=45664
2012-10-19 22:04:44 +00:00
Guy Harris 6bcb25c6cb Pass parse_vms_hex_dump() a pointer to a wtap_pkthdr structure and have
it always fill it in.  Have the seek-read routine pass its phdr argument
in.  Have it just return a success/failure indication; do the check for
the packet size in the seek-read routine by looking at the caplen field
of the wtap_pkthdr structure.

svn path=/trunk/; revision=45663
2012-10-19 21:05:03 +00:00
Gerald Combs d16be272c9 Fix columns.
svn path=/trunk/; revision=45662
2012-10-19 20:56:22 +00:00
Gerald Combs b369a09cd2 The file set and export object trees are lists. Make them act like
it. Show human-readable sizes in the file set dialog. Move the
format_size_flags_e operator to qt_ui_utils.cpp for lack of a better
place.

svn path=/trunk/; revision=45661
2012-10-19 19:04:21 +00:00
Chris Maynard ebaf451a4e Add back the "%!" removed in r33773; otherwise, for some unknown reason, only 1 page will be viewable. (Tested w/gsview 5.0 and ghostscript 9.06)
#BACKPORT(1.8, 1.6)

svn path=/trunk/; revision=45660
2012-10-19 18:05:02 +00:00
Gerald Combs b924cfed2b The U3 and PortableApps packaging processes depend on simple
defined/undefined checks. Create a bunch of them corresponding to the
various components that GTK2 and GTK3 need and plumb the packaging files
accordingly. Tested only with GTK2 but GTK3 *should* work.

svn path=/trunk/; revision=45659
2012-10-19 17:47:34 +00:00
Gerald Combs 17f959dc74 Revert the background color for TCP and lighten it for UDP. Change the
ARP background to differntiate it from UDP.

svn path=/trunk/; revision=45658
2012-10-19 15:25:06 +00:00
Chris Maynard 43ebecad9a 1) Use tvb_reported_length_remaining instead of tvb_reported_length_remaining.
2) Use proto_item_append_text instead of proto_item_set_text, since this is
   called within a loop.
3) Increment the offset correctly using blocklen-4 instead of
   tvb_length_remaining, which makes no sense.

svn path=/trunk/; revision=45657
2012-10-19 13:50:23 +00:00
Jakub Zawadzki 6f50f7bf50 Mark unused variable with _U_
svn path=/trunk/; revision=45656
2012-10-19 07:29:56 +00:00
Guy Harris fe22586b79 Hoist the code to set the wtap_pkthdr into a routine, and call it in
both the read and the seek-read routine, now that a pointer to the
wtap_pkthdr is passed to the seek-read routine.

svn path=/trunk/; revision=45655
2012-10-19 00:34:28 +00:00
Guy Harris 9f5431f1d9 Wrap lines a little differently.
svn path=/trunk/; revision=45654
2012-10-18 23:18:23 +00:00
Guy Harris e0e8d220b7 Get rid of unnecessary block braces, clean up white space.
svn path=/trunk/; revision=45653
2012-10-18 23:11:40 +00:00
Bill Meier 8f8775800b Minor Updates:
- #if 0 unused typedef (found by cppcheck);
- create/use extended value strings as appropriate;
- reformat hf[] entries;
- whitespace.

svn path=/trunk/; revision=45652
2012-10-18 23:01:47 +00:00
Bill Meier 8e9db03197 Minor cleanup:
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN
  done a while back;
  [The incorrect use of ENC_BIG_ENDIAN was benign since
   ENC_BIG_ENDIAN is currently defined as 0x0000000];

svn path=/trunk/; revision=45651
2012-10-18 22:22:25 +00:00
Evan Huus 97f5e101d9 Fix CMake build:
- add some new files to CMakeLists
- we do need _U_ for C++ now that we're sharing some headers between
  C and C++.

svn path=/trunk/; revision=45650
2012-10-18 22:20:36 +00:00
Guy Harris 11aa25f668 Move some arguments up a line.
svn path=/trunk/; revision=45649
2012-10-18 21:54:47 +00:00
Gerald Combs 97fa2f2a5f Show the object export dialog in accordance with the Qt
documentation. Remove our tap listener and clean up after ourselves.

svn path=/trunk/; revision=45648
2012-10-18 21:51:38 +00:00
Gerald Combs 576b24c96e Move ui-independent object export routines to the common ui directory.
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 21:14:43 +00:00
Martin Kaiser 05c1e47f68 (try to) fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7871
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-18 20:57:02 +00:00
Martin Kaiser 8bf29e8efe minor cleanup of packet-wtp.c
- replace TABs with spaces
- add modelines
- reformat some parts
- use glib data types

svn path=/trunk/; revision=45645
2012-10-18 20:37:10 +00:00
Bill Meier 2c0019b9b5 (Trivial)
-  1 --> TRUE;
-  whitespace and formatting changes.

svn path=/trunk/; revision=45644
2012-10-18 20:27:53 +00:00
Martin Kaiser 93343248cb add CC datatype IDs for the SRM protocol
svn path=/trunk/; revision=45643
2012-10-18 20:12:46 +00:00
Bill Meier 727844442e Minor cleanup:
- 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-18 20:10:53 +00:00
Bill Meier e7ccdde01e Minor cleanup:
- 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-18 19:05:45 +00:00
Bill Meier 2b1f1e611d Minor cleanup:
- 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-18 18:11:56 +00:00
Chris Maynard bbfa21cc02 Don't mark used arguments with _U_. Whitespace: tabs -> spaces.
svn path=/trunk/; revision=45639
2012-10-18 18:03:04 +00:00
Bill Meier 93d3fa2257 Minor cleanup:
- 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-18 17:39:45 +00:00
Chris Maynard b66cc7ed48 str_util.c:format_size() uses 0xff00 for the mask, so left-shift 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-18 17:29:37 +00:00
Chris Maynard b29f57e4e0 Fix Coverity CID 739070: Unused pointer value.
svn path=/trunk/; revision=45636
2012-10-18 16:50:49 +00:00
Bill Meier 3da84159eb Minor cleanup:
- 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-18 16:32:56 +00:00
Bill Meier 9193e7a8b1 Minor cleanup:
- create/use extended value strings as appropriate;
- unsigned --> guint;
- whitespace;

svn path=/trunk/; revision=45634
2012-10-18 16:27:11 +00:00
Pascal Quantin 83c9334e37 Dissect additional information parameters for Result object
svn path=/trunk/; revision=45633
2012-10-18 16:14:13 +00:00
Chris Maynard 559c54ea37 tvb_reported_length_remaining() can return -1, so don't assign the return value to a guint16. Fixes Coverity CID 728017: Negative loop bound.
svn path=/trunk/; revision=45632
2012-10-18 15:55:52 +00:00
Bill Meier ed11d058a1 General cleanup:
- 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-18 15:17:25 +00:00
Anders Broman 5b80615885 From Matthias St. Pierre:
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-18 14:43:42 +00:00
Pascal Quantin 19f194813f Add a few EUTRAN related elementary files and reorder some value_string arrays
svn path=/trunk/; revision=45629
2012-10-18 11:01:44 +00:00
Guy Harris 70d39d2dcc Handle the fractions-of-a-second part of the time stamp correctly.
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-18 05:20:09 +00:00
Guy Harris 25b493fbcb Redo the processing of lines in iSeries text packet dumps.
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-18 04:52:33 +00:00
Bill Meier f498c3a172 Reformat for readability:
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-18 02:33:11 +00:00
Jakub Zawadzki 98e6481be8 Only cap_len (not pkt_len) bytes of buffer are valid.
svn path=/trunk/; revision=45621
2012-10-17 21:14:14 +00:00
Jakub Zawadzki 59e2c7fd96 Fix a copy/paste error
svn path=/trunk/; revision=45620
2012-10-17 21:11:58 +00:00
Jakub Zawadzki 6b5045dd7b Fill some phdr values also when doing random read
svn path=/trunk/; revision=45619
2012-10-17 20:28:22 +00:00
Guy Harris 016a518728 "Wireshark", in this context, mainly means "libwireshark"; preferences
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-17 18:10:16 +00:00
Bill Meier e2956a39a2 Cleanup:
- 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 17:16:56 +00:00
Bill Meier 31f32d5e43 (Trivial) remove trailing whitespace.
svn path=/trunk/; revision=45616
2012-10-17 16:57:02 +00:00
Anders Broman edfbd7053b Read the program name rather than hardcoding it.
svn path=/trunk/; revision=45615
2012-10-17 11:42:43 +00:00