Commit Graph

19588 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
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
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
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 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
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
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
Martin Kaiser 0b4e3b9936 fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7869
make tpiLen a guint such that it can store 2 + tvb_get_guint8(...)
without overflow

svn path=/trunk/; revision=45614
2012-10-17 07:44:33 +00:00
Martin Mathieson bfdfd004cb Fix some UM sequence analysis issues.
svn path=/trunk/; revision=45613
2012-10-17 04:01:01 +00:00
Guy Harris a060ba4973 The first 4 bytes of the Prism header are, apparently, a "message code",
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-17 01:23:13 +00:00
Jakub Zawadzki e0fea3a34c Second try to fix wslua building.
svn path=/trunk/; revision=45603
2012-10-16 22:31:42 +00:00
Jakub Zawadzki a734f16e5b Try to fix building wslua.
svn path=/trunk/; revision=45602
2012-10-16 22:13:51 +00:00
Jakub Zawadzki 78631020b8 Add wtap_pseudo_header union to wtap_pkthdr structure.
Use pkthdr instead of pseudo_header as argument for dissecting.

svn path=/trunk/; revision=45601
2012-10-16 21:50:57 +00:00
Pascal Quantin d7ae273d7a Add dissection of ENVELOPE event download and timer expiration
svn path=/trunk/; revision=45600
2012-10-16 21:30:24 +00:00
Martin Kaiser 304639682f fix some more cases where tvb_length_remaining() is assigned
to an unsigned int

svn path=/trunk/; revision=45599
2012-10-16 21:19:58 +00:00
Martin Kaiser 4cd75a3ce9 make the variable that holds tvb_length_remaining() a signed integer
svn path=/trunk/; revision=45598
2012-10-16 21:07:59 +00:00
Pascal Quantin 442e486442 Dissect a few more command qualifiers
svn path=/trunk/; revision=45597
2012-10-16 20:44:02 +00:00
Pascal Quantin 16bb2a67ba Fix dissection of BER-TLV and COMPREHENSION-TLV length and COMPREHENSION-TLV tag
svn path=/trunk/; revision=45595
2012-10-16 20:25:46 +00:00
Bill Meier 52b516cfa9 General cleanup:
- Calls to expert...() and col_...() should not be under 'if (tree)'
- Move proto_reg_handoff...() to the end of the file as per convention;
- Localize a few variables
- Fix some whitespace (e.g., convert what appear to be '4 space tabs' to spaces)

svn path=/trunk/; revision=45591
2012-10-16 19:05:49 +00:00
Pascal Quantin 5bcb56b21c Fix a copy/paste error
svn path=/trunk/; revision=45588
2012-10-16 17:36:22 +00:00
Pascal Quantin 8edaf50408 Add value_string for PDP Type
svn path=/trunk/; revision=45587
2012-10-16 14:54:08 +00:00
Anders Broman 13c9bcad82 From "msp":
'*' wildcard in the 'Src IP' or 'Dest IP' field of the ESP SA dialog does not work

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7866

svn path=/trunk/; revision=45585
2012-10-16 14:31:14 +00:00
Michael Mann 0d5d45cf9f Enhancements to DNP3.0 Control Code Dissection (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7865)
minor updates to checked in patch (from rev 45583)

svn path=/trunk/; revision=45584
2012-10-16 14:21:05 +00:00
Anders Broman 3134b7d7f8 From Benjamin Stocks:
Enhancements to DNP3.0 Control Code Dissection.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7865

svn path=/trunk/; revision=45583
2012-10-16 14:15:11 +00:00
Pascal Quantin 5e93cf566b Fix dissection of Text String data object
svn path=/trunk/; revision=45577
2012-10-16 08:43:39 +00:00
Anders Broman 3a5c028a0b Remove spurious trailing '%' in format [-Werror=format]
svn path=/trunk/; revision=45573
2012-10-16 05:14:25 +00:00
Michael Mann 7fb78ec5b9 replace proto_tree_add_text with filterable items and expert info to get a few dissectors off of the checkAPIs.pl "naughty" list
svn path=/trunk/; revision=45572
2012-10-16 03:07:06 +00:00
Martin Kaiser be4c14ff77 (try to) fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7862
tvb_length_remaining() may return -1
if that happens in dissect_rdp_fields(), return an error
the caller that calls dissect_rdp_fields() from a for loop detects the error
 and exits (others should handle the error as well, this is missing for now)

svn path=/trunk/; revision=45566
2012-10-15 22:34:41 +00:00
Martin Kaiser c44fadc3a8 From Alexander Koeppe
use inet_pton() for address parsing in FTP's EPRT command
support IPv6 addresses

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7729

svn path=/trunk/; revision=45565
2012-10-15 20:48:22 +00:00
Pascal Quantin 4ee129c341 Dissect more Application Toolkit commands
svn path=/trunk/; revision=45563
2012-10-15 18:13:20 +00:00