Commit Graph

48869 Commits

Author SHA1 Message Date
Jörg Mayer f93f3e241e No need to include gtk/gtk.h
svn path=/trunk/; revision=51889
2013-09-09 20:25:26 +00:00
Chris Maynard cc39b0898c Remove a leftover #if 0 block.
svn path=/trunk/; revision=51888
2013-09-09 19:46:02 +00:00
Chris Maynard fe4fc3cf51 Fix typo.
svn path=/trunk/; revision=51887
2013-09-09 19:43:37 +00:00
Chris Maynard 51ccb61256 Fix the "crossed chopping region" problem. Also, move chopping to its own function for both clarity and correctness since we need to compute chop offsets and lengths on a per-packet basis whereas previously this was not being done.
Lastly, try to improve the documentation a bit concerning chopping and provide another example depicting 2 separate chopping regions.  *Maybe* this is clearer?

One more example here for posterity:  Given the following 75 byte packet, there
are 8 different ways to chop the 2 regions marked as 10 and 20 in a single pass:

    <--------------------------- 75 ---------------------------->
 
    +---+-------+-----------+---------------+-------------------+
    | 5 |   10  |     15    |       20      |         25        |
    +---+-------+-----------+---------------+-------------------+

1) editcap -C 5:10 -C -25:-20 in.pcap out.pcap
2) editcap -C 5:10 -C 50:-20 in.pcap out.pcap
3) editcap -C -70:10 -C -25:-20 in.pcap out.pcap
4) editcap -C -70:10 -C 50:-20 in.pcap out.pcap
5) editcap -C 30:20 -C -60:-10 in.pcap out.pcap
6) editcap -C 30:20 -C 15:-10 in.pcap out.pcap
7) editcap -C -45:20 -C -60:-10 in.pcap out.pcap
8) editcap -C -45:20 -C 15:-10 in.pcap out.pcap


svn path=/trunk/; revision=51886
2013-09-09 19:39:45 +00:00
Alexis La Goutte 2632e16985 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51885
2013-09-09 19:30:47 +00:00
Alexis La Goutte 45b9f5964b Add my pre-commit git script (with checkAPI/hf/encoding args...) Need to copy in .git/hooks folder and will be launch all check when make local commit (if there is some false-positive add --no-verify to disable check)
Should be enhance to be better (check trailing/whitespace...)

svn path=/trunk/; revision=51884
2013-09-09 19:30:39 +00:00
Alexis La Goutte 80f9326b2f From Thomas ERSFELD (GSoC13)
Add TCP/UDP/SSL Follow feature to QtShark

Known issue :
* Duplicate code with GTK (function need follow_info_t struct but in GTK there is some GWidget variable in struct)
* Sometimes TCP Follow fail...

svn path=/trunk/; revision=51883
2013-09-09 19:30:30 +00:00
Alexis La Goutte 41174fa490 if display_filter is NULL, qtshark crash...
svn path=/trunk/; revision=51882
2013-09-09 19:30:19 +00:00
Alexis La Goutte fef81954ab add qtshark /path/mycap.pcapng support (from GTK code...)
svn path=/trunk/; revision=51881
2013-09-09 19:30:10 +00:00
Alexis La Goutte 37260a4e09 Use the same variable name than GTK (cf_name)
svn path=/trunk/; revision=51880
2013-09-09 19:30:02 +00:00
Alexis La Goutte 346ff86c0c Update README.qt after last change in QtShark translations (Add Preferences to select language)
svn path=/trunk/; revision=51879
2013-09-09 19:29:48 +00:00
Jörg Mayer a34dd7e13f The previous commit contained some WIP: Check which files
still generate warnings. Finish that.
Only qcustomplot.cpp does. Move the rest to clean.


svn path=/trunk/; revision=51878
2013-09-09 19:23:17 +00:00
Jörg Mayer 8e5006a03f Commit 51871 did not update CMakeLists.txt
svn path=/trunk/; revision=51877
2013-09-09 19:16:40 +00:00
Evan Huus 771668d630 Register a wmem callback to free the glib hash tables used in SMB2 conversation
structs. Fixes the most egregious of the memory leaks (around 300KB) from
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9120

svn path=/trunk/; revision=51873
2013-09-09 17:51:30 +00:00
Stig Bjørlykke f74bd06ecf Removed return value from ByteArray append and prepend, as this did push
the same ByteArray twice (and thus calling the GC twice).
This should fix bug 4461.

Changed ByteArray concat to create a new array to be returned.

svn path=/trunk/; revision=51872
2013-09-09 17:49:22 +00:00
Alexis La Goutte f99f7bf17e From Dean Lee via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8597 Qtshark: Chinese Simp translation
From me :
Add to the (new) Qtshark Language selector

svn path=/trunk/; revision=51871
2013-09-09 17:49:15 +00:00
Alexis La Goutte fe4407ebc7 Add Preference to change Language (in QtShark)
Need restart application to change language

svn path=/trunk/; revision=51869
2013-09-09 16:20:45 +00:00
Bill Meier aa0e020324 Use a bunch of #includes only when needed. (2nd try; hat tip to Guy).
svn path=/trunk/; revision=51868
2013-09-09 14:26:41 +00:00
Martin Kaiser 955c89812d coverity 996921: add missing break
svn path=/trunk/; revision=51867
2013-09-09 13:07:08 +00:00
Martin Kaiser 9c023c0265 we don't need brackets around SET_ADDRESS() any more
svn path=/trunk/; revision=51866
2013-09-09 12:53:14 +00:00
Evan Huus e3eb3456ff In SMB2 dissector, make sure pinfo->private_data is pointing to an SMB struct
before calling an SMB helper function which expects it. Fixes the primary error
in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9120

svn path=/trunk/; revision=51865
2013-09-09 12:16:18 +00:00
Stig Bjørlykke a78abca4dd Yet another cast fix.
svn path=/trunk/; revision=51864
2013-09-09 06:41:03 +00:00
Chris Maynard 4b4aaf35ff The file was a weird mix of 2 and 4 indent so use a consistent 4-space indent scheme and add modelines to match. Also, declare a few variables static.
(A fix for crossed chopping regions should be coming in the near future ...)

svn path=/trunk/; revision=51863
2013-09-09 06:26:42 +00:00
Stig Bjørlykke 6263037e75 One small step towards fixing the broken python support.
Support Python 3.

svn path=/trunk/; revision=51862
2013-09-09 06:04:46 +00:00
Stig Bjørlykke 8175865785 Added casts in dissector_delete_all_check().
svn path=/trunk/; revision=51861
2013-09-09 05:51:35 +00:00
Stig Bjørlykke 9c3487a569 Added DissectorTable_set and DissectorTable_remove_all to simplify changing
registered port numbers in PROTO.prefs_changed.

Now we only need this code in Lua plugins having port numbers prefs:

PROTO.prefs.ports = Pref.range ("Ports", 0, "Port numbers", 65535)

PROTO.prefs_changed()
  local udp_table = DissectorTable.get ("udp.port")
  udp_table:set (PROTO.prefs.ports, PROTO)
end

svn path=/trunk/; revision=51860
2013-09-09 05:45:24 +00:00
Stig Bjørlykke 2b698e5c5f Added dissector_delete_all() to remove all entries from a dissector table.
svn path=/trunk/; revision=51859
2013-09-09 05:36:45 +00:00
Michael Mann e4025f4aba Add an example of filterable expert info.
Also cleanup references to README.developer that are now README.dissector.

svn path=/trunk/; revision=51858
2013-09-09 03:43:45 +00:00
Michael Mann 25bb947bdb Have conversion tools use the "new" expert_add_info_format.
svn path=/trunk/; revision=51857
2013-09-09 02:19:27 +00:00
Gerald Combs 829c1ed25e Add the TCP window scaling graph. Add zoom selections.
Rename some methods. Add the ability to toggle time and sequence number
origins. Add more keyboard shortcuts. Comment out abs_secs abs_usecs in
the segment struct since it looks like we aren't using them. Make sure
we stay in the same TCP stream.

svn path=/trunk/; revision=51856
2013-09-09 01:40:06 +00:00
Bill Meier 077d252fd9 Revert #51843: Build fails on OSX-10.5-x8
svn path=/trunk/; revision=51855
2013-09-09 01:23:06 +00:00
Chris Maynard eeba21136c OK, allow either positive or negative offsets no matter if we're chopping from the beginning or the end.
Given the following example, it's now possible to chop the 10 bytes depicted from the 100 byte packet 4 different ways and achieve the exact same results:

    <-------- 100 -------->       Methods:
                                  1) editcap -C 20:10 in.pcap out.pcap
    +------+----+---------+       2) editcap -C -80:10 in.pcap out.pcap
    |  20  | 10 |   70    |       3) editcap -C -70:-10 in.pcap out.pcap
    +------+----+---------+       4) editcap -C 30:-10 in.pcap out.pcap


svn path=/trunk/; revision=51854
2013-09-09 01:04:13 +00:00
Michael Mann bffe25fdc2 Complete the conversion of expert_add_info_format_text -> expert_add_info_format.
svn path=/trunk/; revision=51853
2013-09-09 01:02:44 +00:00
Michael Mann 9e3f9b449f expert_add_info_format_text -> expert_add_info_format
svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
Michael Mann 00dd0adc0d expert_add_info_format_text -> expert_add_info_format
svn path=/trunk/; revision=51851
2013-09-09 00:28:48 +00:00
Michael Mann 7ec34a52c5 expert_add_info_format_text -> expert_add_info_format
svn path=/trunk/; revision=51850
2013-09-09 00:11:19 +00:00
Michael Mann a50c42821d expert_add_info_format_text -> expert_add_info_text
svn path=/trunk/; revision=51849
2013-09-08 23:47:06 +00:00
Chris Maynard ba3a77bb9a Specify the optional offset as a positive value, regardless of chopping from packet beginning or packet end. I *think* this will be easier syntax to remember.
svn path=/trunk/; revision=51848
2013-09-08 21:35:24 +00:00
Pascal Quantin f54441c125 Add a chunk forgotten in r51846
svn path=/trunk/; revision=51847
2013-09-08 21:22:11 +00:00
Pascal Quantin a6ae13dee9 Slightly different fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9117 :
Check that tvb returned by dissect_per_bit_string is not null before trying to use it

svn path=/trunk/; revision=51846
2013-09-08 21:10:36 +00:00
Chris Maynard 54adc0d2ff Allow an optional offset to be specified when chopping bytes from packets.
svn path=/trunk/; revision=51845
2013-09-08 20:29:26 +00:00
Michael Mann 1b009df749 Couldn't quite figure out how to make the expert items in proto.c and the LUA API filterable (suggestions welcome!), but I wanted to start forcing dissectors to use the filterable expert API (nothing like compile errors to force change!). I created expert_add_info_format_internal (original expert_add_info_format) and used it as a placeholder for proto.c/LUA API until a solution is created. The "new" expert_add_info_format will be the "old" expert_add_info_format_text, and I'll slowly do the search/replace.
For those with dissectors outside the source tree, please see tools/convert_expert_add_info_format.pl for help with the conversion.  Please do not use expert_add_info_format_internal, as it's support time will be very short lived.

svn path=/trunk/; revision=51844
2013-09-08 19:32:10 +00:00
Bill Meier fb75b6867e Use a bunch of #includes only when apparently needed.
svn path=/trunk/; revision=51843
2013-09-08 19:25:36 +00:00
Michael Mann 15f1dd9b90 Convert malformed ("protocol") expert infos into something filterable. Not sure if "malformed.expert" is more confusing than helpful, but I didn't want it to share with the "malformed" display filter because their underlying types are different (FT_PROTOCOL vs FT_NONE). The ".expert" has been my convention when a condition already has a well-named hf_ display filter, but also has expert info associated with it.
Also removed the commented out calls to expert_add_info_format to avoid confusion, but left the comments noting the reason it's absent.

svn path=/trunk/; revision=51842
2013-09-08 18:35:36 +00:00
Michael Mann f746c09862 Convert profinet dissector to use filterable expert info.
NOTE: Some of the expert group values may need to be checked, PI_UNDECODED doesn't always seem like the right choice.  I thought PI_PROTOCOL should be used more.


This concludes the conversion expert_add_info_format for all dissectors (where the function isn't commented or #defined out).  Onto the "internal" (epan/lua) uses of the call.

svn path=/trunk/; revision=51841
2013-09-08 16:23:33 +00:00
Evan Huus 5f7187c658 Cycle the recycler in realloc() and free() as well, reducing memory usage of the
stress-test by another ~10%.

svn path=/trunk/; revision=51840
2013-09-08 15:18:55 +00:00
Evan Huus 720935ca04 Fix "seq_base could be used unitialized" warning. We should probably enable
-Werror for the qt code...

svn path=/trunk/; revision=51839
2013-09-08 15:05:08 +00:00
Evan Huus 2210020704 Restore some format arguments that were accidentally dropped.
svn path=/trunk/; revision=51838
2013-09-08 14:55:36 +00:00
Gerald Combs ea42adeb46 [Automatic manuf, services and enterprise-numbers update for 2013-09-08]
svn path=/trunk/; revision=51835
2013-09-08 14:03:41 +00:00
Michael Mann da96b71c95 Add filterable expert info to generated X11 dissector. I didn't regenerate the dissector files, but did manually update the source (tools/process-x11-xcb.pl) so any future regeneration won't lose the changes.
svn path=/trunk/; revision=51834
2013-09-08 13:54:07 +00:00