Commit Graph

22310 Commits

Author SHA1 Message Date
Michael Mann 30c5457f71 Convert proto_item_set_expert_flags into something filterable.
svn path=/trunk/; revision=51135
2013-08-04 13:08:59 +00:00
Martin Kaiser 0133cb60b5 dissect selector byte in the transport protocol descriptor
svn path=/trunk/; revision=51134
2013-08-04 11:35:54 +00:00
Michael Mann 14dd5e8e34 Ensure eth_hashtable exists when doing a lookup. Not sure I'm running into the same situation as Jeff (http://www.wireshark.org/lists/wireshark-dev/201308/msg00012.html), but tshark is complaining so I can't do fuzz-testing.
Also corrected copy/pasteo when cleaning up eth_hashtable.

svn path=/trunk/; revision=51133
2013-08-04 10:22:10 +00:00
Evan Huus d3470e7d2a Add a cast. Use g_snprintf instead of plain snprintf.
Should fix the buildbots.

svn path=/trunk/; revision=51132
2013-08-03 13:05:07 +00:00
Evan Huus de0d7c7f70 From Linas Vepstas via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8961
Dissector for Stanag 4607 protocol.

From me:
- don't add expert info under if (tree)
- simplify loop and overflow checking

svn path=/trunk/; revision=51131
2013-08-03 12:35:31 +00:00
Gerald Combs 09bfd96c5f Switch back to seasonal memory for the address UAT data since r50073
indicates that that's the correct thing to do for now.

svn path=/trunk/; revision=51127
2013-08-02 22:05:36 +00:00
Jeff Morriss 1c0960e4a9 From Роман Донченко via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9006 :
Currently, Wireshark only dissects one side's Key Exchange Init message,
which, in particular, means that the encryption, MAC and compression
algorithms it infers are bogus.

This patch fixes that.

From me:

Don't use a macro which confused checkhf (it only saved a small amount of
visible code).  Fix up some more white space.

Use macros for a couple array indexes.

svn path=/trunk/; revision=51126
2013-08-02 21:56:28 +00:00
Gerald Combs 57e5534e5e Move the 802.15.4 address table hash entries to epan scope. Otherwise we
crash if we have an 802154_addresses UAT.

svn path=/trunk/; revision=51125
2013-08-02 21:45:56 +00:00
Jeff Morriss b06ebbb17b Add some casts to keep C++ happy.
Mark an unused parameter as such.

#if out a currently unused function.

svn path=/trunk/; revision=51121
2013-08-02 15:27:19 +00:00
Jeff Morriss 228fa705d8 g_int64_equal() and g_int64_hash() exist *after* glib 2.22, not before.
svn path=/trunk/; revision=51120
2013-08-02 15:19:05 +00:00
Anders Broman bcb5ff7532 - Use a hashtable for eth lookup.
Currently broken get_ether_addr().
- Show hastable content in address dlg.(temp solution).

svn path=/trunk/; revision=51119
2013-08-02 15:05:00 +00:00
Anders Broman 7891191c57 g_int64_hash() and g_int64_equal() first appear in GLib 2.22, make a local copy.
svn path=/trunk/; revision=51118
2013-08-02 14:53:12 +00:00
Jeff Morriss cbcd704280 From ?\208?\160?\208?\190?\208?\188?\208?\176?\208?\189 ?\208?\148?\208?\190?\208?\189?\209?\135?\208?\181?\208?\189?\208?\186?\208?\190 via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9004 :
This patch makes the SSH dissector able to display multiple messages in the
Info column. As a side effect, it changes the formatting of some messages to
be more uniform.

I've also removed a dubious chunk of code that hardcodes a 16-byte MAC after
a SSH_MSG_KEX_DH_GEX_REPLY message. There can't be a MAC before key exchange
is over, and in my sample capture, this actually eats the second message that
follows.

From me: some white space cleanup.

svn path=/trunk/; revision=51117
2013-08-02 14:28:29 +00:00
Evan Huus c4e966b880 Combine two ternary ?: into a single if. Shaves about 1.5% off the fast timing
test.

svn path=/trunk/; revision=51112
2013-08-02 01:58:52 +00:00
Evan Huus a7b30a2a2c Small simplification
svn path=/trunk/; revision=51111
2013-08-02 01:51:06 +00:00
Evan Huus c85ec68e58 Remove unnecessary null check.
svn path=/trunk/; revision=51110
2013-08-02 01:36:52 +00:00
Jeff Morriss 95b4443aeb LIBGCRYPT_CFLAGS is not set in Windows builds, use GNUTLS_CFLAGS instead.
svn path=/trunk/; revision=51108
2013-08-02 00:52:13 +00:00
Evan Huus 64ed83d793 Rewrite the merge_free routine to keep the merged chunk on the master free list
if the right-hand merge target was there originally. This brings memory usage
down another ~40% when running the heavy test suite.

This also lets us extract the master-list check out of unfree() since it is now
only relevant at a single caller, and turns unfree into the more understandable
remove_from_recycler().

svn path=/trunk/; revision=51104
2013-08-02 00:12:12 +00:00
Jeff Morriss 9d0bcc9d09 Include LIBGCRYPT_CFLAGS in wsutil (but not in epan/crypt).
svn path=/trunk/; revision=51103
2013-08-01 23:56:09 +00:00
Jeff Morriss f7843da692 md5.h is in wsutil now.
svn path=/trunk/; revision=51102
2013-08-01 23:53:35 +00:00
Jeff Morriss 2df54da6e2 Move a bunch of the crypt modules and pint.h into wsutil.
This means wsutil now links against libcrypt.

Protect a bunch of the crypt header files from multiple inclusion.

svn path=/trunk/; revision=51100
2013-08-01 23:34:47 +00:00
Jeff Morriss b05d5554ed As suggested in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8816 :
Enable TSN analysis by default.

svn path=/trunk/; revision=51098
2013-08-01 21:46:38 +00:00
Jakub Zawadzki b5c43d0cf9 Use opt_comment only when has_phdr_comment is set.
svn path=/trunk/; revision=51097
2013-08-01 21:24:54 +00:00
Jeff Morriss 7cbe100f22 Initialize fdata->flags.has_user_comment too.
svn path=/trunk/; revision=51095
2013-08-01 21:20:31 +00:00
Jeff Morriss 1dc3a29474 From Dominique Martinet via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8787 :
Follow-up on 9P dissector enhancement ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8589 )

"fid"s, 9P file descriptors, are valid from the moment it's allocated until
when it's freed. My original patch kept a fid hashtable updated everytime a
packet was dissected in full-view (with a non-null tree)

Attached is a patch that builds a tree for each 9P fid and stores the
corresponding path when it becomes valid/marks it as invalid when it no longer
is.

svn path=/trunk/; revision=51092
2013-08-01 21:04:32 +00:00
Jakub Zawadzki 08eb36b5af Remove fdata->opt_comment, add pkt_comment to pinfo
Original (read from file) comments can be accessed by pkthdr->opt_comment
Keep user comments in seperated BST, add new method for epan session to get it.

svn path=/trunk/; revision=51090
2013-08-01 20:59:38 +00:00
Guy Harris 91382394d6 Squelch a warning by explicitly casting to throw away the upper 32 bits
of a result.

svn path=/trunk/; revision=51088
2013-08-01 20:46:49 +00:00
Martin Kaiser 73444a24e0 remove unused function hash_eth_wka()
in order to fix the compile error
addr_resolv.c:1250:1: error: 'hash_eth_wka' defined but not used
[-Werror=unused-function]

svn path=/trunk/; revision=51085
2013-08-01 20:31:09 +00:00
Anders Broman 0105d538d2 Use glibs hastables rather than home grown variants for manuf an wka(well known addresses).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9000

svn path=/trunk/; revision=51084
2013-08-01 20:11:13 +00:00
Jeff Morriss 490f48044c From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9001 :
Some small improvements to the Modbus Dissector:
- Better detection of query/response w/ serial line Modbus RTU
- Smallest Modbus RTU message can actually be 6 bytes, not 8.
- Only check 16/32-bit register decoding options with appropriate function codes

svn path=/trunk/; revision=51083
2013-08-01 19:32:24 +00:00
Jakub Zawadzki d0cb52d0b7 Move some asserts to be triggered sooner.
svn path=/trunk/; revision=51082
2013-08-01 17:19:20 +00:00
Jakub Zawadzki 10e40c1638 tvb: check_offset_length() can calculate remaining length, use it.
svn path=/trunk/; revision=51081
2013-08-01 16:54:22 +00:00
Jeff Morriss 565211c938 As pointed out in https://www.wireshark.org/lists/wireshark-dev/201307/msg00250.html :
r51066 should have also updated the hf_ variable name, comments, and a couple
of data structures.

(I don't know this protocol so these changes are basically a half-educated
global search-n-replace.)

svn path=/trunk/; revision=51080
2013-08-01 16:03:55 +00:00
Jakub Zawadzki a2a20ed62a Move tvbuff composite structure to their own file.
svn path=/trunk/; revision=51072
2013-07-31 20:01:53 +00:00
Jakub Zawadzki 9d519b5659 Move composite tvbuff to seperate file (with some subtle changes).
svn path=/trunk/; revision=51071
2013-07-31 19:58:13 +00:00
Jakub Zawadzki a9b8779fb9 Linux: add support for getting total/rss from /proc/self/statm
svn path=/trunk/; revision=51070
2013-07-31 19:02:56 +00:00
Jakub Zawadzki 1cabad610b Add some very basic framework to fetch statistics of memory usage per component.
Use it in memory_dlg.

svn path=/trunk/; revision=51069
2013-07-31 18:26:14 +00:00
Evan Huus 0e90cd8f80 As noticed by Anders: move a wmem include outside of the #ifdef, we want it
regardless of whether or not we have GnuTLS.

svn path=/trunk/; revision=51067
2013-07-31 15:32:42 +00:00
Jeff Morriss fbbeebe054 From Richard Sharpe:
It's not Command Sequence Number but Message ID.

https://www.wireshark.org/lists/wireshark-dev/201307/msg00242.html

svn path=/trunk/; revision=51066
2013-07-31 13:30:29 +00:00
Evan Huus 5b485c3c0a Don't use emem or wmem in base_custom functions, just use a buffer on the stack,
since it's not needed after we write it into the output field. Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8996 which was introduced by
the wmem conversion.

svn path=/trunk/; revision=51065
2013-07-31 12:15:34 +00:00
Guy Harris a6abba0bcf Add the URL of a document from VSS Monitoring that gives details of the
trailer.

svn path=/trunk/; revision=51064
2013-07-31 10:59:38 +00:00
Michael Mann 5047c5fcd5 Some cleanup prepping for convert_proto_tree_add_text.pl. Major issue was making value_strings global for the file (and adjusting their "namespace"), so they can be used in the hf array.
svn path=/trunk/; revision=51048
2013-07-31 02:14:50 +00:00
Evan Huus 615687f4c0 Fix the most egregious of the newly exposed leaks, about 28KB.
svn path=/trunk/; revision=51047
2013-07-31 01:55:20 +00:00
Evan Huus 999c603027 Convert preferences to wmem. Exposes some more memory leaks that didn't show up
before.

svn path=/trunk/; revision=51046
2013-07-31 01:49:57 +00:00
Evan Huus 8fafa9b758 Add wmem_tree_is_empty(). Also permit lookups on a NULL tree for compatibility
with emem.

svn path=/trunk/; revision=51045
2013-07-31 01:48:47 +00:00
Evan Huus f9d7a5ee47 Revert one tiny bit of r51043 where UAT code got wmemed by accident.
svn path=/trunk/; revision=51044
2013-07-31 01:47:00 +00:00
Evan Huus 960a461c8a Convert SSL and TCP dissectors to wmem (with the exception of UAT).
svn path=/trunk/; revision=51043
2013-07-31 01:26:05 +00:00
Evan Huus bc7c14a2a1 Convert the USB dissectors to wmem.
svn path=/trunk/; revision=51042
2013-07-31 01:06:50 +00:00
Jakub Zawadzki 9bb17b7b2b Remove interface_id, pack_flags from frame_data structure.
This patch assumes that wtap_phdr interface_id, pack_flags both from initial read and seek read will contain same values.
Please fix if it's not.

svn path=/trunk/; revision=51041
2013-07-30 23:14:09 +00:00
Pascal Quantin 564c6234fc Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8883 :
Add support for FemtoInterfaceMsg media type

svn path=/trunk/; revision=51040
2013-07-30 21:27:01 +00:00