summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-04-03Remove garbage character inadvertantly introduced in the previous commit.Bill Meier1-1/+1
Change-Id: I6338fdb4506973ea5ed991512bbefa6b855640e9 Reviewed-on: https://code.wireshark.org/review/944 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-03Create/use an extended value-string; Do other minor changes;Bill Meier1-542/+538
Minor changes: - Remove a few unneeded initializers; - Convert "4 space tab" indentation to spaces; - Fix some indentation; - Remove some boilerplate comments; - Adjust exitor modelines. Change-Id: Ie314a2d91bf89f8612dec9e9f161d987ea107dd5 Reviewed-on: https://code.wireshark.org/review/942 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-03(Pedantic): set editor modelines tab-width & etc to 8; Also: fix some ↵Bill Meier10-518/+524
indentation in packet-sip.c Change-Id: I623fc5e4c1247dbe5e15f0f33270f4f0994268ab Reviewed-on: https://code.wireshark.org/review/943 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-03please checkAPIEvan Huus1-5/+2
Change-Id: I2dbd1fcb47b75300e753b5ef2dc60e68ca1b5fa5 Reviewed-on: https://code.wireshark.org/review/941 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-03Use ENC_UTF_8 for strings, it's faster and *should* be OK.AndersBroman1-15/+15
Change-Id: I7615f407a017454d3fb11ec0b45b584bfa5d79b5 Reviewed-on: https://code.wireshark.org/review/940 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-03Make payload type arguments guint rather than guint8.Guy Harris2-10/+10
That should suppress some "cast to pointer from integer of different size" warnings. Change-Id: I2ef38e16ce866e244cb7c0a2275dfb5975980fc4 Reviewed-on: https://code.wireshark.org/review/938 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-03Handle DLT_USER2 as PKTAP, to handle Mavericks.Guy Harris1-0/+5
Change-Id: Ic58c3584994f822d5d5a1434050aaa61f86ba17c Reviewed-on: https://code.wireshark.org/review/937 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-03Add a capture_pktap() routine and use it.Guy Harris4-0/+36
That way, the packet counts are will be valid when capturing. Change-Id: I0a21cc817d918e7f849620db5ca6dfd84bd2cd87 Reviewed-on: https://code.wireshark.org/review/936 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-03Fix Bug 9920 Buildbot crash due to SDP/RTP mismatchHadriel Kaplan8-196/+395
For details see comments in Bug 9920. The executive summary: Bug 9920 is a crash caused by a couple of issues: 1) The memory ownership model for the rtp_dyn_payload hashtable is split: SDP creates the rtp_dyn_payload hashtable, but RTP can free it. Since there isn't *one* pointer to the hashtable, RTP freeing it means SDP has a dangling pointer. 2) Either the SDP dissector shouldn't be creating two separate, unique hashtables for multiple media channels of the same addr:port, or RTP shouldn't be free'ing the previous one. Change-Id: I436e67de6882f84aa82dcbdfe60bf313fe4fd99c Reviewed-on: https://code.wireshark.org/review/918 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-03Fix a typoAndersBroman1-1/+1
Change-Id: Ie32a140e49140a92c69cb6fa84cdc55402516830 Reviewed-on: https://code.wireshark.org/review/935 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-03Don't use external function internaly to avoid multiple checks.AndersBroman1-11/+48
tvb_captured_length() -> tvb->length tvb_captured_length_remaining(tvb, offset) -> (Inline) _tvb_captured_length_remaining() tvb_get_ptr() -> ensure_contiguous() Change-Id: I3540854c9b51ca9c3319b030c7d91b4aff976a26 Reviewed-on: https://code.wireshark.org/review/922 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-03In the string handling routines don't call tvb_get_...() inside the loops ↵AndersBroman1-28/+70
insted get the ptr and read directly avoiding the overhead of calling fast_ensure_contiguous() repeatibly. Change-Id: Ib5eee87ef9d49cb4e46b3b9c3d3db0134d3c4a32 Reviewed-on: https://code.wireshark.org/review/889 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-03For single-precision calculations, use single-precision constants.Guy Harris1-1/+1
Otherwise the calculation is done in double precision, and some compilers complain of a double-precision value being assigned to a single-precision variable. Change-Id: I78317a0e9b625ae4f34df3597fdb5eba711bcae2 Reviewed-on: https://code.wireshark.org/review/934 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-03For single-precision calculations, use single-precision constants.Guy Harris1-8/+8
Otherwise the calculation is done in double precision, and some compilers complain of a double-precision value being assigned to a single-precision variable. Change-Id: I41699fa69e21a2c42d54867765f9fa35a9ab7414 Reviewed-on: https://code.wireshark.org/review/933 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-03Add PKTAP to release notesPascal Quantin1-0/+1
Change-Id: Ibec2b400493b0936505e467d1ae9bc6551e6cc03 Reviewed-on: https://code.wireshark.org/review/931 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-02Add a backporting chapter.Gerald Combs1-28/+49
Change-Id: Id0e017b18e95d6703e166fa09f767200d8ed1f8d Reviewed-on: https://code.wireshark.org/review/925 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-02dissect gama chunkMartin Kaiser1-1/+18
Change-Id: I4fcdb926db9d2f23f5901586b5d97b727237db3d Reviewed-on: https://code.wireshark.org/review/930 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-02Remove extra parenthesis in EQ_SEQ.Gerald Combs1-1/+1
Fixes the following clang warning: epan/follow.c:397:20: error: equality comparison with extraneous parentheses [-Werror,-Wparentheses-equality] if ( ((sequence) == (seq[src_index])) ) { ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~ epan/follow.c:397:20: note: remove extraneous parentheses around the comparison to silence this warning if ( ((sequence) == (seq[src_index])) ) { ~ ^ ~ epan/follow.c:397:20: note: use '=' to turn this equality comparison into an assignment if ( ((sequence) == (seq[src_index])) ) { ^~ = Change-Id: Ic257bbc598e17f854b671056887ca1a13dcea850 Reviewed-on: https://code.wireshark.org/review/928 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-02dissect the chrm chunkMartin Kaiser1-0/+89
Change-Id: I922169d4e246470e018d3db53964ae3f794642f6 Reviewed-on: https://code.wireshark.org/review/927 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-02redefine proto_tree_add_float_format_value() if we're using the newMartin Kaiser1-0/+5
proto tree api, similar to other proto_tree_add_...() functions Change-Id: Iaef0711b8221a7bbb24f1004c81a1438f5674e42 Reviewed-on: https://code.wireshark.org/review/926 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-02Scrap wmem splay trees for now.Evan Huus6-719/+0
There is confusion about API usage, and problems on my part concerning whether keys should be compared signed or unsigned, and how to do that efficiently. Unsigned keys in particular were behaving oddly. Change-Id: I075693bbd04c15f79f24f9a24006003a914cc572 Reviewed-on: https://code.wireshark.org/review/924 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-02Add a cople of missing pcap.extension IE:sAndersBroman2-5/+18
Change-Id: I7086349f3fb9e3fd8c1ea902ef08b54c27b0a8c5 Reviewed-on: https://code.wireshark.org/review/923 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-02Have Infiniband dissector show payload. Bug 9929.Michael Mann1-100/+47
The trees in the infiniband dissectors were incorrectly setup causing the data dissector to always have a NULL tree (so it wouldn't appear in packet view). Also cleaned up some other unnecessary global variables. Change-Id: I778073bdca864dfc5087cdcfc7ef0018f9bd704c Reviewed-on: https://code.wireshark.org/review/915 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-02Fix packet-bootp.c:5368:18: error: 'ti' may be used uninitialized in thisAndersBroman1-1/+1
function Change-Id: I15f32e7b5c9ce23e1ddc00792b2d5c37945ae081 Reviewed-on: https://code.wireshark.org/review/920 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-02Revert Remove check and inverse code to display a error if there is a $Id$Alexis La Goutte1-1/+4
Change-Id: I7061ad312df5079924c927ca95a8fa111c756012 Reviewed-on: https://code.wireshark.org/review/498 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-02From Martin Mathieson:AndersBroman1-8/+18
Show the message type name in option 53, as well as in the bootp protocol root. Change-Id: I5864a2024d3e64fa8eeee40b465dcd3459b8472e Reviewed-on: https://code.wireshark.org/review/910 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-02Fix InfiniBand dissector. Bug 9719Bart Van Assche1-5/+5
Change-Id: I7b9df14b4d9aa520c3fe28c86014665461b758f2 Reviewed-on: https://code.wireshark.org/review/917 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-02packet-pdc.c: Add asterix protocol layer to base tree (not to PDC tree).Bill Meier1-9/+9
PDC capture file: See attachment to Bug #9746 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9746 Change-Id: I815779f4213d1caec3e1c8dc46506bcc8647bcbb Reviewed-on: https://code.wireshark.org/review/914 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-01use tvb_find_guint8() to find the 0 termination in a text chunkMartin Kaiser1-12/+11
keyword and text are latin1 strings Change-Id: I01637efa2ebf4d1e1a83f6001737066dc1258e6c Reviewed-on: https://code.wireshark.org/review/913 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-01Add a dissector for Apple's PKTAP headers.Guy Harris7-0/+335
It automatically works for LINKTYPE_PKTAP and, by default, for LINKTYPE_USER2; if any other dissector is specified for LINKTYPE_USER2, that dissector overrides PKTAP. Change-Id: Ic00ac8a81c6101e45d638d337aef42df3920da12 Reviewed-on: https://code.wireshark.org/review/903 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-01replace comparing sequence numbers of TCP segments with wrap-firendly XX_SEQ ↵Pavel Karneliuk1-37/+37
macros; replace tabs with 2 whitespace indentations Change-Id: I8af522cc34863501195d0a79db5c0ab4135246a8 Reviewed-on: https://code.wireshark.org/review/907 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-01fix comparing a sequence number of TCP fragment when its value wraps over ↵Pavel Karneliuk1-1/+1
uint32_t limit Change-Id: I0ff939e2d1265a2d9380c83f8f538bb43b0dadf9 Reviewed-on: https://code.wireshark.org/review/875 Reviewed-by: Pavel Karneliuk <pavel_karneliuk@epam.com> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-01Inlining some tvb function gives a 6% performance gain according toAndersBroman1-9/+9
valgrind. Change-Id: I7881f8c1407d422a3f1ad5bc17e975b45703db74 Reviewed-on: https://code.wireshark.org/review/909 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-01Fixed display of IIN during reads and writes of IIN object.Graham Bloice1-17/+28
Added (hidden) dnp3.addr field set by both source and destination dnp3 addresses to allow easier filtering. Change-Id: I04980c24c1b9f30a2ee5a0d5ea4ac32ae877504e Reviewed-on: https://code.wireshark.org/review/908 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2014-04-01For now use UTF-8 for all strings for performance reasons.AndersBroman1-78/+78
Change-Id: If47ffbee58d534ce3d44f00e1e5b966bc42a2ea8 Reviewed-on: https://code.wireshark.org/review/906 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-01Fix checkApis perl script false positive proto_tree_add with ENC_*Hadriel Kaplan1-1/+2
In epan/proto.c in function proto_tree_add_split_bits_crumb, the proto_tree_add_text function is called with one of its arguments using ENC_BIG_ENDIAN, but it's not an argument for proto_tree_add_text itself but instead a function being called inside it. checkAPIs.pl tries to avoid this in check_proto_tree_add_XXX_encoding, by removing parenthesis arguments, but in this acse there are newlines between the arguments, causing the regex to not catch them. This commit fixes the regex. Change-Id: I70ef79d5436ba2ec04ffdc3d9939c7aa2cdf6a1f Reviewed-on: https://code.wireshark.org/review/902 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-01Fix tshark.c to pass checkAPIs scriptHadriel Kaplan1-3/+3
Since tshark.c was using strdup, perror, and g_main_quit, changes to the file won't pass checkAPIs; so this commit replaces those with the approved functions; except strdup, which was unecessary. Change-Id: I031aa44594f2b96960a45f48537ab4e9a10d34b1 Reviewed-on: https://code.wireshark.org/review/898 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-01Fix proto.c to pass checkAPIs scriptHadriel Kaplan1-7/+7
Since proto.c was using strcat(), changes to the file won't pass checkAPIs. So this commit replaces it with the appropriate function, and also replaces the deprecated tvb_length_remaining and tvb_ensure_length_remaining function calls with the new versions, since checkAPIs was warning about that too. This commit does not change the ep_* memorry calls to the new wmem-based ones though, as that's a bigger deal than this trivial commit I think. Change-Id: I51e6d5b3a6e03233f2695c890ff4c10d02fdb0c0 Reviewed-on: https://code.wireshark.org/review/905 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-01Update encap_table_base.Guy Harris1-0/+24
As the comment after the WTAP_ENCAP_ list says, "After adding new item here, please also add new item to encap_table_base array". Change-Id: I918603fa271978b3a81525466c5f4067efc7a783 Reviewed-on: https://code.wireshark.org/review/897 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-01Copy randpkt.exe & randpkt.pdb to install directory during windows build.Bill Meier1-0/+2
Change-Id: I6ef6b181897bd3d35dc94ebb2d04aaa209d8df6e Reviewed-on: https://code.wireshark.org/review/904 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-01Fix two bugs and do misc other minor changes;Bill Meier1-168/+240
Bugs fixed: - col_...() should not be called under 'if (tree)'; - proto_reg_handoff_pdc(): pdc tcp.port preference change was handled incorrectly; Minor changes: - Move proto_reg_handoff...() to the end of the file as per convention; - new_register_dissector...() call not needed; - Remove some unneeded initializers; - 'xxx++' ==> 'xxx += 1' in a few instances; - widen a few variables (guint? ==> guint); - Add XXX comment about possible simplification of the code; - Remove unneeded #include <epan/reassemble.h>; - Reformat hf[] entries for readability; - Do whitespace changes; Change-Id: Ib9224f0c6392a45c19656a63bbac97fbaf3acc08 Reviewed-on: https://code.wireshark.org/review/900 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-01Fix expert_...() calls to not be under 'if (tree)';Do other minor changes;Bill Meier1-117/+122
Minor changes; - Remove #include <epan/etypes.h>; It's not needed; - Do some whitespace changes; - Use tab-width=8 in editor modelines Change-Id: I84a1c9bc814fae384c4d5a434c2f9aed865c76ae Reviewed-on: https://code.wireshark.org/review/899 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-31Remove 3 dups from .gitignoreBill Meier1-3/+0
Change-Id: I81434f311568d42dd897461365a5c345dd9ff1bc Reviewed-on: https://code.wireshark.org/review/893 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte24-47/+0
(Using sed : sed -i '/^\*\* \$Id\$/,+1 d') (2 star and space) Change-Id: I48505ffb8bfa103cd7db0117e18cdb1925a7034d Reviewed-on: https://code.wireshark.org/review/884 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte7-14/+5
Last one $Id$ (remove by hand) to make checkAPI haapy ! Change-Id: I5adfdcac0629a36e08c5fe3ea7960bdbc251364f Reviewed-on: https://code.wireshark.org/review/887 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte15-17/+0
(Using sed :sed -i '/^\/\* \$Id\$ \*\//,+0 d') ( /* $Id */ ) Change-Id: I46e928d7f2a307c35876ed5d34cb6b7cccfcd6e9 Reviewed-on: https://code.wireshark.org/review/886 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte339-634/+6
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte11-22/+0
(Using sed :sed -i '/^ \* \$Id\$/,+1 d') (2 spaces before star) Change-Id: I7060f198b4ae4dd271ecc454f6c6dd8bd4cfd8d4 Reviewed-on: https://code.wireshark.org/review/885 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte17-33/+0
(Using sed : sed -i '/^ \$Id\$/,+1 d') (No star only 2 spaces before) Change-Id: Id7b254031769a9dca2941304e4d3a0f4bdbc3f54 Reviewed-on: https://code.wireshark.org/review/883 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte47-47/+0
(Using sed : sed -i '/^<!-- \$Id\$ -->/,+0 d') (XML Comments) Change-Id: Ifd03f70ae84dfbbbe04d91f10fd30857fd197014 Reviewed-on: https://code.wireshark.org/review/882 Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-04 23:00:22 +0000