Commit Graph

56660 Commits

Author SHA1 Message Date
Martin Kaiser 4399319cb5 clean up the functions that dissect the hid requests
Change-Id: Ie4d52b62824a8c0c777ffce3988fbe1fd4e5b4a4
Reviewed-on: https://code.wireshark.org/review/6627
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-18 16:36:44 +00:00
Martin Kaiser 9ba910fffd remove redundant (and unused) paramter usb_trans_info
Change-Id: Ibb683f6d42125b13417aceb06949102a9821d626
Reviewed-on: https://code.wireshark.org/review/6626
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-18 16:36:22 +00:00
Gerald Combs 2441a232ab [Automatic manuf, services and enterprise-numbers update for 2015-01-18]
Change-Id: If1c72e3b58ced6b9b86a584d96f632b2433751e8
Reviewed-on: https://code.wireshark.org/review/6623
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-18 16:04:44 +00:00
Pascal Quantin 0d92b99059 ISUP: add dissection of generic number qualifier indicator
Bug: 10865
Change-Id: Ib4cd60f570250490d5417c692f487711a65536b1
Reviewed-on: https://code.wireshark.org/review/6620
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-18 15:14:29 +00:00
Pascal Quantin b01ef11f87 HTTP: revert a change done in g0ee179c
As indicated in the comment above, the previous code was done on purpose to handle the NUL case

Bug: 10866
Change-Id: I66eb9f6fbc9477456310978b420ba30975d81b0a
Reviewed-on: https://code.wireshark.org/review/6621
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-18 14:38:30 +00:00
Martin Kaiser 2660806145 no need for if(tree)
Change-Id: I7e8cfe3a220d65e80afa109a62867c4ff2ce08e8
Reviewed-on: https://code.wireshark.org/review/6619
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-18 14:14:23 +00:00
Michael Mann c922801e32 ftype (integer): fix Uninitialized argument value found by Clang Analyzer
Change-Id: I79e893f1d810a90c6a495067941d2e393e9fee72
Reviewed-on: https://code.wireshark.org/review/6501
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-18 13:47:55 +00:00
Pascal Quantin e7593ea19d asn2wrs: autodetect if 64 bits variant is required for constrained integers
It does not work with defines, but is already a great step forward

Change-Id: I346d4124690ec46a2299d4eae8031bbb19a3db8e
Reviewed-on: https://code.wireshark.org/review/6617
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-18 13:30:56 +00:00
Pascal Quantin 12d17d2cea Update libwireshark0.symbols
Change-Id: I694448a998d3a1b74b19d2f1dfd6bb2be5bbce39
Reviewed-on: https://code.wireshark.org/review/6616
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-18 12:36:21 +00:00
Pascal Quantin c326fcaf9b LDAP: g8c608e6 did not include the changes in template file, that got lost afterwards
Change-Id: I5d79d3e48c1ad83713a312dce39b749f47b0ecc8
Reviewed-on: https://code.wireshark.org/review/6612
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-18 11:25:07 +00:00
Pascal Quantin 13b1e907f1 ASN.1: regenerate dissectors after g506409d
Change-Id: If82112ce7bae4de0c0c24794dc57ffebbf401978
Reviewed-on: https://code.wireshark.org/review/6611
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-18 11:04:59 +00:00
Guy Harris ebea11a1f4 We need epan/wmem/wmem.h regardless of whether we have GeoIP.
It's used to generate the "sorry, we don't have GeoIP" message.

Change-Id: Ibd4e15508d3e2d09d81951b4dc23a1264971bb7a
Reviewed-on: https://code.wireshark.org/review/6610
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18 10:49:02 +00:00
Guy Harris c7500dd46a Fix another dfilter_compile() call.
Change-Id: I8b035a09b1bc1981a78a80e0a2547dce65a2ac9c
Reviewed-on: https://code.wireshark.org/review/6609
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18 10:44:27 +00:00
Guy Harris cfcbb28671 Clean up ftype-conversion and dfilter error message string handling.
Have dfilter_compile() take an additional gchar ** argument, pointing to
a gchar * item that, on error, gets set to point to a g_malloc()ed error
string.  That removes one bit of global state from the display filter
parser, and doesn't impose a fixed limit on the error message strings.

Have fvalue_from_string() and fvalue_from_unparsed() take a gchar **
argument, pointer to a gchar * item, rather than an error-reporting
function, and set the gchar * item to point to a g_malloc()ed error
string on an error.

Allow either gchar ** argument to be null; if the argument is null, no
error message is allocated or provided.

Change-Id: Ibd36b8aaa9bf4234aa6efa1e7fb95f7037493b4c
Reviewed-on: https://code.wireshark.org/review/6608
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18 10:22:59 +00:00
Alexis La Goutte c60fb3038e Try to make Mac OS X Buildbots happy
fix return makes pointer from integer without a cast

Change-Id: Iaa55de58c36b1a59b08946836e519fee7bb889fc
Reviewed-on: https://code.wireshark.org/review/6607
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-18 09:24:19 +00:00
Michael Mann a1f2342e13 Miscellaneous ep_strdup_printf replacement.
Change-Id: I973c672e9d573ad67e9b9fd82a5610aaf8a74efa
Reviewed-on: https://code.wireshark.org/review/6605
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-18 04:15:18 +00:00
Michael Mann ef7e8aa065 Remove ep_strndup
Change-Id: Id336dc16f97a0973754993094aa637813c0ca31c
Reviewed-on: https://code.wireshark.org/review/6604
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-18 04:14:55 +00:00
Michael Mann 403be722ce Remove emem from GeoIP
Change-Id: Ifa96dc38a277b86c28f762489251dcc595afae67
Reviewed-on: https://code.wireshark.org/review/6603
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-18 04:14:03 +00:00
Michael Mann 86726f404a Trim down the use of ep_ memory in the display filter code.
Couldn't quite eliminate it completely, but it's much improved.  Need to figure out where/when to free dfilter_error_msg.

Change-Id: I10216e9546d38e83f69991ded8ec0b3fc8472035
Reviewed-on: https://code.wireshark.org/review/6591
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-18 00:28:53 +00:00
Michael Mann 0ad15f88cc Replace the last of ep_alloc and ep_alloc0 with wmem equivalent.
Change-Id: I0338d0acda5e4b9957aad4825ca2cfd6fa506ead
Reviewed-on: https://code.wireshark.org/review/6596
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-17 23:23:06 +00:00
Michael Mann b5eb9710db Replace all remaining instances of ep_new with wmem_new and wmem_packet_scope.
Change-Id: I50b2cd0e233554bc58082e96e8d879b40edfc0c1
Reviewed-on: https://code.wireshark.org/review/6595
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-17 23:22:46 +00:00
Alexis La Goutte be113e8806 DHCP/BOOTP: Option 125 Suboption: (1) option-len always expects 1 but specification allows for more
We believe this is a bug in Wireshark with Option 125 Suboption: (1)  option-len where Wireshark always expects 1 but specification is more flexible.
Re: http://www.cablelabs.com/wp-content/uploads/specdocs/CL-SP-CANN-DHCP-Reg-I10-1308081.pdf page 15 part 4.2.2 'The DHCPv4 Option Request Option'

Issue reported by Steve Krebs

Bug:10784
Change-Id: I8eced7a70877d13d925b81c0f47885609baa7633
Reviewed-on: https://code.wireshark.org/review/6510
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-17 22:26:09 +00:00
Pascal Quantin 506409d28c X509AF: dissect Certificate Serial Number as INT64 instead of INT32
Bug: 10862
Change-Id: Ie315298dd090b3b689f6a9bfff6f6f5bf7cc715a
Reviewed-on: https://code.wireshark.org/review/6594
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-17 22:14:19 +00:00
Michael Mann 77dac91eb0 A few more emem replacements with wmem.
Change-Id: Icfb319fba937642db637a7f26b5e7627461df3b0
Reviewed-on: https://code.wireshark.org/review/6590
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-17 21:05:58 +00:00
Michael Mann 5c5b3f7d26 Convert proto_construct_match_selected_string to use wmem.
Change-Id: I7a40c0996517aa71b4ddb764ce3a6e92a55260ad
Reviewed-on: https://code.wireshark.org/review/6589
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-17 21:04:22 +00:00
Sebastian Kloeppel 6010d99a1f Added Card Application Toolkit Transport Protocol (CATTP) dissector
Bug: 10843
Change-Id: I35350d98b4225be12875b16e67506f7385ea9f28
Reviewed-on: https://code.wireshark.org/review/6111
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-17 20:22:55 +00:00
Russel ffa8bdd3ca Correct PF field offset when looking for DA
Previous code was not shifting far enough, was checking PS instead
of PF.

Change-Id: Ic0bdbb4dfaa7bdd708a49f1fb67706dd949f2607
Reviewed-on: https://code.wireshark.org/review/6578
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-17 20:21:44 +00:00
Martin Kaiser 8ec6ac6969 dissect CCRC, APRC and the APDU body's data
Change-Id: I21f7420286ed3e668ce4dc0eac06bbf4172039d6
Reviewed-on: https://code.wireshark.org/review/6588
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-17 18:46:30 +00:00
Martin Kaiser 21e40ea068 dissect the serial characters and the CRC
Change-Id: I64af822f30b02d313f5242014ff5e40a73dffa35
Reviewed-on: https://code.wireshark.org/review/6587
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-17 18:41:50 +00:00
Alexis La Goutte a38b714908 RSYNC: Malformed Packet on rsync-version with length 2
RSYNC dissector always think the resync-version length = 4

Bug:10863
Change-Id: I2dee3ff7195af110223903d79b938849666878a7
Reviewed-on: https://code.wireshark.org/review/6584
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-17 15:47:21 +00:00
maisheri aa1057daba EAPOL-MKA: Included fixes for the distributed sak handling.
Change-Id: Id91ba408266f18a9336811bf9d8b875796ea0cc1
Reviewed-on: https://code.wireshark.org/review/6582
Reviewed-by: maisheri <maisheri.hitesh@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-17 15:03:18 +00:00
Guy Harris 62ea3194ed PacketLogger files can be big-endian or little-endian.
Bug: 10861
Change-Id: Iedb248aa4a96e65bb525ba6475dc767e5dfefbe0
Reviewed-on: https://code.wireshark.org/review/6579
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-17 02:59:59 +00:00
Pascal Quantin 3f284fbca4 USB: do not put usb_address_t structure on stack and initialize it completely (including implicit padding for alignment)
Bug: 10857
Change-Id: Ib8339a5dc1c9461e681e0015c3f851c642f300c9
Reviewed-on: https://code.wireshark.org/review/6560
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-16 22:55:10 +00:00
Pascal Quantin 1e8c6eef4a Update a comment
Change-Id: I7bf1173bfb23e5f083b8aaf09476b30b4791aae0
Reviewed-on: https://code.wireshark.org/review/6577
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-16 21:31:14 +00:00
Guy Harris fa5478185c Update comment to reflect the current reality.
Change-Id: I7f8c66723efc9d21ec3abc08e57db1df5f772f04
Reviewed-on: https://code.wireshark.org/review/6576
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-16 19:26:50 +00:00
Guy Harris 23666badc5 Spaces separate bytes; they don't have to surround them.
I.e., you don't need a trailing blank, at least not with the current
version (and there shouldn't be a requirement for such an extra trailing
blank).

Change-Id: Ia2b732c74fc6020acc01a2c0c52ed3567d36d762
Reviewed-on: https://code.wireshark.org/review/6575
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-16 18:41:39 +00:00
Alexis La Goutte b6ec25f0b2 IS-IS: Add missing i variable for subclv loop (IS Reachability)
Issue found by Alexander Okonnikov

Change-Id: I4eacab63a685b84c0d75811b96dc452471244337
Reviewed-on: https://code.wireshark.org/review/6573
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-16 17:51:49 +00:00
Alexis La Goutte 22543d3cec IS-IS: wrong length for SubTLV 18 (TE default Metric)
Issue found by Alexander Okonnikov

Change-Id: I8c1da71183f5bba50bb0bb541c259d5dba0b067d
Reviewed-on: https://code.wireshark.org/review/6572
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-16 17:51:17 +00:00
Evan Huus 3f575120ea Kill more unused emem functions
Change-Id: Ib81410b6d760886f2ae585f44ac58fc135da62c7
Reviewed-on: https://code.wireshark.org/review/6568
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-16 17:36:15 +00:00
Alexis La Goutte 4fa73961f1 CMakeList.txt/Makefile.am (root) : fix indent (use tabs)
Makefile.am: avoid double space
CMakeList.txt: Add modelines info

Change-Id: Ic27d16b2f502362509ab13158e5428208afe3925
Reviewed-on: https://code.wireshark.org/review/6570
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-16 16:35:48 +00:00
Alexis La Goutte 16d367fef5 ZBee ZCL: use tvb_get_guint8() (avoid tvb_get_ptr... !)
Change-Id: I248ddb1dee5398528279807968b095cbc5413ae0
Reviewed-on: https://code.wireshark.org/review/6569
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-16 16:34:00 +00:00
Michael Mann 531df02736 Remove se_ alloced memory from packet_list_store
Change-Id: I7aa2f5f8b433468ad2c2cd73cfce986d128a9ae0
Reviewed-on: https://code.wireshark.org/review/6565
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-16 16:03:58 +00:00
Pascal Quantin 0235775eee GSM SIM: enhance dissection of APDU Class byte
Change-Id: I2089ff665a92ce16a0af100e2515463c92c6d057
Reviewed-on: https://code.wireshark.org/review/6567
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-16 16:01:05 +00:00
Michael Mann ada1eec702 SE_COPY_ADDRESS -> WMEM_COPY_ADDRESS
Copy addresses with wmem-scope instead of (forced) seasonal scope.  All existing instances were converted to wmem_file_scope, but the flexibility is there for other scopes.

Change-Id: I8e58837b9ef574ec7dd87e278470d7063ae8c1c2
Reviewed-on: https://code.wireshark.org/review/6564
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-16 15:25:18 +00:00
Michael Mann 260b19e98d Remove seasonal memory from everything except address resolutions
This includes circuits, conversations and streams as well as camel and h225 dissectors.

Change-Id: Ia5ee70a5e5c6bcb420f0f19df126595246a3c042
Reviewed-on: https://code.wireshark.org/review/6566
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-16 15:22:27 +00:00
Chris Brandson b2c45864f9 bug 10833 undecoded bitmaps were being displayed raw which is hard to interpret, changed to an more friendly format
Change-Id: If79a695646837cdfb3e1b168a47b96984c58e328
Reviewed-on: https://code.wireshark.org/review/6563
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-16 05:25:11 +00:00
Jeff Morriss a4d1709994 (Trivial) Move a comment next to the code related to it.
Change-Id: I83749a1b30059cc8e8f13b58fbde74e9ab873582
Reviewed-on: https://code.wireshark.org/review/6562
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-01-16 02:48:34 +00:00
Alexis La Goutte d009b55b9b Quakeworld: Nesting level does not match indendation (CID 1159218)
Change-Id: I6d18f103bda6db025eebfc902453256b007dddf7
Reviewed-on: https://code.wireshark.org/review/6556
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-16 00:52:07 +00:00
Michael Mann 3f8fbb7349 Remove the last two true calls to se_alloc.
(The other calls are just wrapped in macros)

Change-Id: I6a029dddf7742ba95510ec24cec30553461e48c6
Reviewed-on: https://code.wireshark.org/review/6558
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-16 00:38:36 +00:00
Michael Mann e530c89940 Replace se alloced memory in compare stat tap.
Also replaced comments mentioning se_alloc memory with wmem_file_scope, since it's more accurate.

It seems that many of the TShark stat taps may be leaking memory, because the hash tables created by the taps don't get a chance to be freed.  Somewhat academic since TShark exits shortly after displaying any stats, but a leak none the less.

Change-Id: I8ceecbd00d65b3442dc02d720b39c2e15aa0c8a6
Reviewed-on: https://code.wireshark.org/review/6557
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-16 00:37:02 +00:00