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
Michael Mann
306a110ed6
Add filterable expert info to NCP dissector.
...
svn path=/trunk/; revision=51833
2013-09-08 13:35:57 +00:00
Gerald Combs
abdac5bfac
Add the TCP RTT graph.
...
Show the time values in ms instead of s. Add a button and keyboard
shortcut to switch the connection direction. Move more code to
tap-tcp-stream.c. Update our axis labels.
svn path=/trunk/; revision=51832
2013-09-08 01:25:27 +00:00
Michael Mann
cc26962f96
Batch of filterable expert info
...
svn path=/trunk/; revision=51831
2013-09-08 00:47:15 +00:00
Evan Huus
57c28aeffd
Fix the FSF address in the license header for the new ASN.1 dissectors.
...
svn path=/trunk/; revision=51830
2013-09-07 22:12:24 +00:00
Evan Huus
2fd0b974f7
Ignore licensing in the macosx packaging - it's all copied from Inkscape (GPL)
...
as far as I can tell, so it doesn't have our headers.
svn path=/trunk/; revision=51829
2013-09-07 22:06:19 +00:00
Evan Huus
9507f56495
Fix lua docstring causing the buildbot's documentation step to fail.
...
svn path=/trunk/; revision=51828
2013-09-07 22:00:02 +00:00
Evan Huus
9fd46c37a8
- no need for a doubly-linked list of TVBs, single is simpler
...
- support merging chains in tvb_add_to_chain
- when we have an old reassembled TVB, just merge the chains rather than
freeing it (we may still need it as it may already be a data source)
- modelines
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9027
#BACKPORT, but it's gonna be messy...
svn path=/trunk/; revision=51825
2013-09-07 18:20:52 +00:00
Stig Bjørlykke
6a4364bb40
Added pinfo.can_desegment to lua script.
...
This fixes bug 5205.
svn path=/trunk/; revision=51824
2013-09-07 18:04:35 +00:00
Michael Mann
17fbd9028a
Batch of filterable expert info
...
svn path=/trunk/; revision=51823
2013-09-07 16:07:02 +00:00
Evan Huus
e746a01ce8
Display GTPv2 Area Code fields (which show up in some DIAMETER AVPs) as
...
BASE_HEX_DEC instead of just BASE_DEC.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9118
svn path=/trunk/; revision=51822
2013-09-07 13:56:25 +00:00
Evan Huus
e69ec10794
Callers of tvb_per_bit_string expect that the returned value_tvb is non-NULL.
...
Ensure that is the case even in certain peculiar error conditions, by filling it
with a 0-length subset TVB. Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9117
Also add modelines.
svn path=/trunk/; revision=51821
2013-09-07 13:48:13 +00:00
Evan Huus
a1d88c4620
Fix a few more places that didn't have a semicolon after the address-macro use.
...
svn path=/trunk/; revision=51820
2013-09-07 13:22:58 +00:00
Evan Huus
2e299ec910
Add modelines, use consistent indentation in address.h
...
Use the "do { } while (0)" trick to make the macros behave like regular function
calls syntatically.
Fix one dissector that wasn't using semicolons after the macro calls.
svn path=/trunk/; revision=51819
2013-09-07 12:51:29 +00:00
Stig Bjørlykke
7d3d67407c
Added support for a "prefs_change" function in Lua scripts, which is called
...
when the preferences for the dissector are changed.
This is not a 100% correct implementation at the time because the
prefs_changed function in all Lua plugins will be called whenever
a preference in a single Lua plugin is changed.
svn path=/trunk/; revision=51818
2013-09-07 11:27:38 +00:00
Stig Bjørlykke
a8638eec90
Added support for integer range in DissectorTable_add and DissectorTable_remove.
...
This was requested in bug 6762.
svn path=/trunk/; revision=51817
2013-09-07 11:07:18 +00:00
Stig Bjørlykke
452bfe4ce0
A small documentation fix for DissectorTable_remove.
...
svn path=/trunk/; revision=51816
2013-09-07 11:01:52 +00:00
Stig Bjørlykke
6b93b0e1dc
Added syntax and range checks for Lua Prefs.range default values.
...
Fixed some small memory leakages.
svn path=/trunk/; revision=51815
2013-09-07 10:56:52 +00:00
Martin Kaiser
071f89e3b3
coverity 1047692: check return value of inet_pton()
...
svn path=/trunk/; revision=51814
2013-09-07 10:02:46 +00:00
Martin Kaiser
c4f5a942d7
trivial: fix a typo
...
svn path=/trunk/; revision=51813
2013-09-07 09:03:21 +00:00
Pascal Quantin
f974c74fd8
From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9105 :
...
Add additional PN532 opcodes, and update USB CCID dissector to skip status word in PN532 responses
svn path=/trunk/; revision=51812
2013-09-07 08:03:32 +00:00
Gerald Combs
2dca89e7a3
Only add data points to the throughput graph if our time window has
...
advanced. Add a reset button.
svn path=/trunk/; revision=51811
2013-09-07 03:51:27 +00:00
Gerald Combs
f9a9753d01
Fix PacketList::goToPacket work correctly. Minor screen graph
...
improvements.
svn path=/trunk/; revision=51808
2013-09-07 00:33:41 +00:00
Gerald Combs
ac93afc00b
Use "recode" to convert HTML entities to UTF-8 if it's available.
...
svn path=/trunk/; revision=51806
2013-09-07 00:18:10 +00:00
Stig Bjørlykke
f9f29d0307
Make the Lua dissector "init" routine work again.
...
svn path=/trunk/; revision=51805
2013-09-06 22:22:27 +00:00
Chris Maynard
51b613e485
Whitespace cleanup, sort options, add modelines.
...
svn path=/trunk/; revision=51804
2013-09-06 21:57:04 +00:00
Chris Maynard
faad753c65
The 'a' option doesn't take an argument. Fix bug introduced by r49964.
...
svn path=/trunk/; revision=51803
2013-09-06 20:40:54 +00:00
Gerald Combs
297d1994f8
Switch from a 20 segment moving average to a 1 second MA. Add a #define
...
to allow switching back to the old behavior.
Note that goToPacket can jump to the wrong packet if we have a display
filter applied.
svn path=/trunk/; revision=51801
2013-09-06 19:07:57 +00:00
Gerald Combs
52c9e57474
Deduplicate some type and field names.
...
svn path=/trunk/; revision=51800
2013-09-06 17:39:03 +00:00
Evan Huus
1c46818354
Convert to wmem, and as per Michael's suggestion in
...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9107 , use zeroed memory for
ntlmssp_info structs.
svn path=/trunk/; revision=51799
2013-09-06 15:59:45 +00:00
Evan Huus
0e885e8089
Set length and contents to 0/NULL if the blob is empty. Fixes
...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9107
svn path=/trunk/; revision=51798
2013-09-06 15:29:18 +00:00
Gerald Combs
df6f3412dd
Adjust titles and labels.
...
svn path=/trunk/; revision=51797
2013-09-06 02:00:14 +00:00
Gerald Combs
29e03fe9d6
Make graph movement pixel-based to match the GTK+ version.
...
svn path=/trunk/; revision=51796
2013-09-06 00:48:21 +00:00
Gerald Combs
6003d3b2f6
Throughput graph usability updates.
...
Make the stream graph dialog modeless and let the user open multiple
instances. The dangling dialog behaves similar to the GTK+ version. Add
a setDissectedCaptureFile signal to MainWindow (currently unused).
Properly transform yAxis2 and simplify resetAxes while we're at it.
Other bug fixes.
svn path=/trunk/; revision=51795
2013-09-06 00:41:07 +00:00
Anders Broman
96d29a5d50
Get rid of a duplicated filter name.
...
svn path=/trunk/; revision=51792
2013-09-05 20:55:59 +00:00
Pascal Quantin
0cf459a6cc
Try to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9106 :
...
Intialize phdr structure to avoid an invalid access to phdr->opt_comment
svn path=/trunk/; revision=51791
2013-09-05 20:35:03 +00:00
Martin Kaiser
2d1b7d1e32
add casts to make my compiler (gcc 4.6.3) happy
...
svn path=/trunk/; revision=51790
2013-09-05 20:18:13 +00:00
Chris Maynard
f6eb619d87
Display "TEID/GRE Key" field consistently as hexadecimal since 3GPP TS 36.444 says this field is of type, "octet string".
...
Ref: http://ask.wireshark.org/questions/24221/decode-gtpv2-teid-as-decimal-or-hex
#BACKPORT(1.10,1.8)
svn path=/trunk/; revision=51789
2013-09-05 18:51:46 +00:00
Chris Maynard
f13c30d2c4
Per http://nsis.sourceforge.net/Docs/Chapter4.html#4.2.4 , we need to use $\n for a newline in strings. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9103 .
...
#BACKPORT(1.10,1.8)
svn path=/trunk/; revision=51788
2013-09-05 17:51:17 +00:00
Michael Mann
b3f4084c4e
Make "content blob" dynamically sized so it doesn't take up 20k of memory per conversation.
...
Add filterable expert info while we're at it.
svn path=/trunk/; revision=51787
2013-09-05 16:29:08 +00:00
Evan Huus
808d594087
Add an expert info if we see content-length header and chunked encoding
...
together.
The other part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9101
Also fix modelines.
svn path=/trunk/; revision=51786
2013-09-05 16:05:32 +00:00
Evan Huus
40a83d1e2c
As per the HTTP spec, prefer chunked transfer-encoding to content-length if we
...
get both. Fixes reassembly for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9101
svn path=/trunk/; revision=51785
2013-09-05 15:48:50 +00:00