Commit Graph

27983 Commits

Author SHA1 Message Date
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 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 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 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
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
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 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
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
Alexis La Goutte c610c38b6f Conversation Table : Copy-paste error (CID 1262415)
Change-Id: I37fd8154f93763ac091528921d1b66d8e8fd56dd
Reviewed-on: https://code.wireshark.org/review/6555
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-15 19:23:32 +00:00
Alexis La Goutte e75dd98b3d NetFlow: Assign instead of compare (CID 1262419 & 1262420)
Change-Id: Idc2c2e02b973f65c6c2f22f2d1bfd8545cd23f63
Reviewed-on: https://code.wireshark.org/review/6554
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-15 19:04:47 +00:00
Alexis La Goutte 3385984dd2 Address to str: Missing break in switch (CID 1262416 & 1262417)
It will also fix "Unused Value" (CID 1262422)

Change-Id: I626c087365e9d6fe625f807ab8ded518d94cab64
Reviewed-on: https://code.wireshark.org/review/6553
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-15 18:51:00 +00:00
Alexis La Goutte adf088173a HTTP: fix implicit conversion shortens 64-bit value into a 32-bit value
It will be make Mac OS X buildbot happy

Change-Id: I628445c1358675a58cc2d26ce1ca3007dd619ff3
Reviewed-on: https://code.wireshark.org/review/6551
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-15 18:28:26 +00:00
Pascal Quantin 9c044e2ca4 ZigBee: packet scope memory cannot be used for BASE_CUSTOM callbacks
Change-Id: I28fe21151b9f8c91786ca6c56d141a458419c501
Reviewed-on: https://code.wireshark.org/review/6548
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-15 17:11:19 +00:00
Uli Heilmeier 69d32a99bb HTTP Dissector: Add CitrixAGBasic authentication
Citrix uses a proprietary authentication schema called CitrixAGBasic for
their StoreFront/Web Interface product.

The Header looks like:
Authorization: CitrixAGBasic username="dGVzdHVzZXI="; domain= \
       "dGVzdGRvbWFpbg=="; password="c2VjcmV0"; AGESessionId= \
       "YzI0NmRkMmFmYmE5ZTk5M2I5ZDRkN2UwYzYzZWExN2U="

This patch enhances the HTTP dissector to decode this authentication data.

Due to non-discolsure I can only provide a faked GET request as a pcap
capture (attached to this bug).

Bug: 10851
Change-Id: Ic8e48db94809c9c64889cd050911de3fe23cdcdd
Reviewed-on: https://code.wireshark.org/review/6526
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-15 16:55:21 +00:00
Martin Kaiser a1fce22373 remove the executable bits from packet-zvt.c
(I should not use git on cygwin for adding new files)

Change-Id: I314d78073f1ebd633a20ff7c9ac3d0b236b3906a
Reviewed-on: https://code.wireshark.org/review/6547
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-15 15:21:19 +00:00
Martin Kaiser ba7aa190b3 start a dissector for ZVT Kassenschnittstelle
this is a protocol between payment terminals and
electronic cash-register systems / vending machines

Change-Id: Ieac87c0af8e15f2dfe8b4a6274f3b56d652a5b1f
Reviewed-on: https://code.wireshark.org/review/6531
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-15 15:07:53 +00:00
AndersBroman 1e1d96f108 Modify the errorcode defenition to suit ANSI MAP, this is (probably) OK as
ANSI MAP is currently the only user of ANSI TCAP.
Bug: 6112

Change-Id: I49f89c862ddc8351091a9a939415e4ba6e7603f5
Reviewed-on: https://code.wireshark.org/review/6546
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-15 15:05:04 +00:00
Evan Huus ef0435bdb5 ZigBee: don't use packet_scope outside of dissection
The decode_* functions defined here are called post-dissection for formatting
labels, so don't have access to packet scope. Just use and free manual memory.

Introduced in gbdfabe59.

Bug: 10855
Change-Id: I9b0085b1f7779ae6fbd12482c44d8f611cdbb49f
Reviewed-on: https://code.wireshark.org/review/6545
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-15 13:34:18 +00:00
Evan Huus c2350a5070 rsvp: fix typo
caught by test suite as:
Duplicate field detected in call to proto_register_field_array:
rsvp.call_attributes is already registered

Change-Id: Ibf4ead3026b9930fb8f6ab07f0a5a4c299cedc35
Reviewed-on: https://code.wireshark.org/review/6544
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-15 10:43:11 +00:00
Martin Mathieson 0d9248e125 Netflow: Fix spelling of 'latitude'
Change-Id: Iaae40f4a191e458645263c8d7a114392cd063707
Reviewed-on: https://code.wireshark.org/review/6543
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-15 09:42:41 +00:00
Alexis La Goutte adaa661b74 Update to libnghttp2 0.7.1
Change-Id: Ib8d40586a3b95674447819f77eaaa69376dce6fd
Reviewed-on: https://code.wireshark.org/review/6411
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-15 08:34:38 +00:00
Miltos Patsiouras 5b92ab9f97 RSVP: Add support of GMPLS Support for Metro Ethernet Forum and G.8011 (RFC 6004)
This document describes a method for controlling two specific types
   of Ethernet switching via Generalized Multi-Protocol Label Switching
   (GMPLS).  This document supports the types of switching corresponding
   to the Ethernet services that have been defined in the context of the
   Metro Ethernet Forum (MEF) and International Telecommunication Union
   (ITU) G.8011.  Specifically, switching in support of Ethernet private
   line and Ethernet virtual private line services are covered.  Support
   for MEF- and ITU-defined parameters is also cover

Bug: 7841
Change-Id: I12e12d01d497bd0e9703efcf6bd8ad100805bccc
Change-Id: I180c095652604bc025ab81171dd8a042e0930f08
Reviewed-on: https://code.wireshark.org/review/5323
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-15 08:33:48 +00:00
Alexis La Goutte 06ddb7e31d CAPWAP: Add a IEE802.11 Message Element Type (RFC5416)
* IEEE 802.11 Information Element (1029)

Add add_tagged_field to packet-ieee80211.h (will be used by other dissector)

Change-Id: Icd13be416ccc47fb2309b9962e9a47c339885d1e
Reviewed-on: https://code.wireshark.org/review/6524
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-15 08:30:54 +00:00
Alexis La Goutte cb1f8a3d2b CAPWAP: Add some IEE802.11 Message Element Type (RFC5416)
* IEEE 802.11 OFDM Control (1033)
* IEEE 802.11 Update WLAN (1044)

Change-Id: I702de1d649b1dc2af1de83ee21152c6a18f42dfc
Reviewed-on: https://code.wireshark.org/review/6509
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-15 05:43:38 +00:00
Alexis La Goutte f6021e8d02 CAPWAP: Add a new Message Element Type (RFC5415)
* Delete Station (18)

Change-Id: I33afa96d183b8ff22725d2e00dcfeccea3fdfa04
Reviewed-on: https://code.wireshark.org/review/6508
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-15 05:40:51 +00:00
AndersBroman 20e2c05d9b [E212]Modify dissect_e212_mcc_mnc() to take E212 number type as an
argument. While at it remove deprecated APIs

Change-Id: Ib1a7e9d7aeba6379fb4492816a0ac602e67493c6
Reviewed-on: https://code.wireshark.org/review/6534
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-14 13:37:14 +00:00
Pascal Quantin 0ee179c8c6 HTTP: allocate header_name in packet scope instead of file scope
While we are at it, factorize the copy of value string

Change-Id: I2a16155641b8bd8623baf51f787a5f450e7b3803
Reviewed-on: https://code.wireshark.org/review/6530
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-14 09:16:02 +00:00
Guy Harris 63a3d043e3 Consistently use the "g_string_free returns a C string pointer" idiom.
g_string_free(str, FALSE) frees the GString container but not the
underlying g_malloc()ed string; instead, it returns a pointer to the
g_malloc()ed string.

Fix those places that didn't already get the string pointer from
g_string_free() to do so rather than manually extracting the string
themselves.

And fix one place that didn't even need to use a string - it was just
scanning a C string without even modifying it.

Change-Id: Ibbf4872bf5b9935b9907f539b6edb1013f3053a5
Reviewed-on: https://code.wireshark.org/review/6532
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-13 23:14:13 +00:00
Guy Harris 9f5e4fb7a5 uat_load() and uat_save() return a success indication; use it.
Instead of always ignoring the return value, always check it, and only
report an error if it returns FALSE.

(Alternative: have it return NULL on success and a pointer to a
g_malloc()ed string on failure.)

Fix a comment while we're at it.

Change-Id: Icb72c9f47775b6552e3eb4fe5ddcc85482bfb5fb
Reviewed-on: https://code.wireshark.org/review/6528
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-13 21:01:28 +00:00
Pascal Quantin 25f010b269 MAC LTE: upgrade dissector to v12.4.0
Change-Id: Ieb5395a6ae7a1d7625fe645d0caf14008993d3d9
Reviewed-on: https://code.wireshark.org/review/6521
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-13 20:57:01 +00:00
Guy Harris bc23f79729 UAT error string pointers should not be const pointers.
UAT error strings are usually allocated by g_strdup() or
g_strdup_printf(), and must ultimately be freed by the caller.

Make the pointer-to-error-string-pointer arguments to various functions
be "char **", not "const char **".

Fix cases that finds where a raw string was being used, as that won't
work if you try to free it; g_strdup() it instead.

Add a missing free of an error string.

Remove some no-longer-necessary casts.

Remove some unnecessary g_strdup()s (the string being handed to it was
already g_malloc()ated).

Change some variable declarations to match.

Put in XXX comments for some cases where the error string is just freed,
without being shown to the user.

Change-Id: I40297746a2ef729c56763baeddbb0842386fa0d0
Reviewed-on: https://code.wireshark.org/review/6525
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-13 20:20:03 +00:00
AndersBroman 42e4040429 [GPRS CDR]Fix faulty ASN1 modification
Should be: egsnPDPRecord			[70] EGSNPDPRecordV750

Change-Id: I4b03524c09b6ce603cf4783144d588c8839a16e6
Reviewed-on: https://code.wireshark.org/review/6523
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-13 14:15:20 +00:00
AndersBroman db7f25f354 [GPRS CDR] Handle Rel 7 CDRs
Change-Id: I09833a326e486273c3eacaceba0963fe88e0dac6
Reviewed-on: https://code.wireshark.org/review/6522
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-13 13:44:01 +00:00
Guy Harris f90eeb1775 When allocating address structures, use wmem_new0().
For structures used as the data in an address, use wmem_new(), so that
structure padding is zeroed out; the comparison code for addresses
compares all bytes of the structure for addresses that are structures,
and the hashing code for hash tables using addresses as keys hash all
the bytes, so we have to make sure that, for addresses that are the
same, *all* bytes are the same.

Change-Id: I995fd26cc2f20edb5a599f95562b720561708e57
Reviewed-on: https://code.wireshark.org/review/6517
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-13 04:36:24 +00:00
Guy Harris b204ff4846 Do bounds checking when decompressing WCP packets.
Extract the data offset and count only once, and make sure we don't run
past the end of the data we've copied from the packet; have
decompressed_entry() just do the decompression, rather than also
fetching the data offset and count.

Add some comments while we're at it.

Bug: 10844
Change-Id: I2dc2f9594422ffa8f15fd5c57c9dac2e30e363f4
Reviewed-on: https://code.wireshark.org/review/6514
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-13 04:08:23 +00:00
Michael Mann de5e7b820f Fix casting compiler warning
Change-Id: I179706042168cb4fd1bfb5f9c573f302d9d62fa0
Reviewed-on: https://code.wireshark.org/review/6506
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-12 18:23:22 +00:00
Evan Huus 0b271aa867 Remove ep_strbuf code
Thanks to Michael's work, it is now totally unused.

Change-Id: I67b5f7c69535a08f96f449c36c429e2548f4ea11
Reviewed-on: https://code.wireshark.org/review/6505
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-12 17:11:34 +00:00
Michael Mann 7967ef9510 Remove emem APIs from UAT functionality.
Change-Id: I009c09f25d170e5c9aaaef713eaacb3252817856
Reviewed-on: https://code.wireshark.org/review/6460
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-12 14:25:12 +00:00
AndersBroman 554a3972cd [GPRS CDR] Add expert info for unknown record types.
Change-Id: Ib485f435b6c423b06c7c31f2cf681d01261bfc15
Reviewed-on: https://code.wireshark.org/review/6504
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-12 13:01:00 +00:00
AndersBroman 2619eddee8 [E212] Make it possible to use different filters for MCC and MNC in LAI
RAI and SAI.

Change-Id: I2abcc868899b8752f66347b3a0fe190670c3ce3f
Reviewed-on: https://code.wireshark.org/review/6447
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-12 08:42:55 +00:00
Alexis La Goutte 706c625e2a ISIS: Add code and length for SubTLV Extended IS Reachability
* remove some proto_tree_add_text call

Change-Id: I18bc26cc95934e77b19d24edbb417af4c895d53e
Reviewed-on: https://code.wireshark.org/review/6468
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-12 05:24:01 +00:00
Graham Bloice 528a857258 Fix CMake generation and use of Windows .rc files
CMake now generates local copies of .rc files for all the Windows
components and uses the files in the build of the components.

The .rc.in files that include an icon were modified to allow the icon
path to be set by CMake.  The path is removed for nmake builds.

Updated build architecture detection, required for wireshark.manifest.in

Change-Id: I7b1ff43050e9b0efb861d1041636fb4aef49a4f8
Reviewed-on: https://code.wireshark.org/review/6482
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-11 20:22:32 +00:00
Pascal Quantin 7d004dc887 Revert "Lemon: Update lemon tools"
This reverts commit 5855dd8d53.

This Lemon update fails to compile on OSX and triggers asserts on other platforms

Change-Id: I12a8a2bf32db31e5a9b0cb1a67a39724e30f3e91
Reviewed-on: https://code.wireshark.org/review/6496
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-11 19:57:45 +00:00
Pascal Quantin c8c9917f81 Fix some more regressions introduced in gecaa1f8
Convert one other set of static variables to pinfo scoped memory while we are at it

Change-Id: If550b76ef6a4dd2707d79de8579ac439d16dce79
Reviewed-on: https://code.wireshark.org/review/6490
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-11 19:12:43 +00:00
Alexis La Goutte 5855dd8d53 Lemon: Update lemon tools
Fix warning: declaration shadows a variable in the global scope [-Wshadow]

Add include <config.h>

Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_)

Fix implicit conversion loses integer precision

Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare]

Fix function declaration isn’t a prototype [-Wstrict-prototypes]

Fix warning: old-style function definition [-Wold-style-definition]

Fix trailing whitespace

Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake

Fix -Wmissing-prototypes

Remove unused function (acttab_free)

Add basename the filename with only filename (no path...)

Change-Id: Ia79f61e29f828575df61cc89134c6c553044e86d
Reviewed-on: https://code.wireshark.org/review/3976
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-11 18:56:08 +00:00
Robert Grange 9b9a06c3cb packet-mq: Avoid using sort in dissector
Avoid using sort for string_value_ext. The string value are now
sorted at definition

Change-Id: I08452b0423289d04e55ed7e3573e74bfcc329865
Reviewed-on: https://code.wireshark.org/review/6488
Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-11 17:23:44 +00:00
Gerald Combs 9d55a0ba62 [Automatic manuf, services and enterprise-numbers update for 2015-01-11]
Change-Id: I2f9625ebc812095bd4c7464981a96b38c4548694
Reviewed-on: https://code.wireshark.org/review/6491
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-11 16:05:11 +00:00
Pascal Quantin f2bedeb3fe FDDI: fix a memory corruption introduced in gecaa1f8
Bug: 10845
Change-Id: I4d47711f397d9aaa965dff3e97478517f638a2e2
Reviewed-on: https://code.wireshark.org/review/6489
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-11 13:58:14 +00:00
Pascal Quantin aa9376e0b4 LTE RRC: upgrade dissector to v12.4.0
Change-Id: I0bd6c124bd3aa0efe09db81135adc690751e08ae
Reviewed-on: https://code.wireshark.org/review/6477
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-11 09:43:02 +00:00
Michael Mann d07364d042 Restore #undef HAVE_STDLIB_H and #undef HAVE_STRING_H in kerberos dissector.
These were removed when the kerberos dissector was switched to being a pure ASN.1 dissector (see dea68bf00f).

Change-Id: I04177046250d039a750f4e4e4dd956d8beab23bc
Reviewed-on: https://code.wireshark.org/review/6476
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-11 01:08:41 +00:00
Michael Mann f5c4d06dba Replace some "low hanging fruit" uses of emem.
Most of the remaining ep_ uses are grouped with specific functionality.

Change-Id: I8fa64a17acc6bcdcf6891b2d28715ac0c58f1a4a
Reviewed-on: https://code.wireshark.org/review/6484
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-11 00:27:57 +00:00
Guy Harris fdd6554ccd Rename the FT_BYTES separator types to SEP_ from BASE_.
There's no requirement for "display" field values to have names
beginning with BASE_; use SEP_, to indicate that they're separators.

(And, yes, we should introduce SEP_NONE, with a value of 0, and use it.)

While we're at it, fix BASE_SEMICOLON - the separator is a colon, not a
semicolon - and document SEP_SPACE in doc/README.dissector.

Change-Id: I856aafda2c60b8320dffe287f0deb06a9604a2bf
Reviewed-on: https://code.wireshark.org/review/6486
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-11 00:27:28 +00:00
Martin Mathieson 2219f78426 Netflow: do transport resolution on ports (if know they are UDP or TCP)
Change-Id: I8fc3675f03b7eaec6a9385638197067981762a70
Reviewed-on: https://code.wireshark.org/review/6474
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-10 21:52:46 +00:00
Michael Mann 14cad60f7d Remove ep_ allocated memory from get_conversation_filter and just return a g_alloced string.
Change-Id: Ie7f6b2c5479fec1a44afb5e446ef6abf304113af
Reviewed-on: https://code.wireshark.org/review/6480
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 19:58:21 +00:00
Michael Mann 59c1e32d2c Add BASE_SPACE for FT_BYTES
It's just like BASE_DOT, BASE_DASH and BASE_SEMICOLON, only its a space between bytes.  Since this seems pretty specific to FT_BYTES, perhaps there is a better was to represent the functionality (like FT_BOOLEAN uses numeric values for number of bits)?

Change-Id: I1a8f1ab263ece2736a8012b66fdd6a9105db7282
Reviewed-on: https://code.wireshark.org/review/6451
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 19:57:59 +00:00
Michael Mann effc8266ce Add preference to display spaces between bytes for FT_BYTES fields.
I think this can make fields more readable (for a small amount of bytes).

Converted DeviceNet dissector to use proto_tree_add_item for some FT_BYTES field as tvb_bytes_to_str_punct was used to create this effect "manually".

Change-Id: I59e2acf9b00a4eb1279e6c2b2b7bd8ecef20db9b
Reviewed-on: https://code.wireshark.org/review/6304
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 19:57:27 +00:00
Guy Harris 02fb2908ff Sort the value_string_exts at dissector registration time.
You *CANNOT* defer it until dissection time, otherwise "tshark -G
values" will fail.

Change-Id: I4edf9abda271baaf916f020a211b9add5543ecc7
Reviewed-on: https://code.wireshark.org/review/6481
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-10 19:48:10 +00:00
Guy Harris 531a9f0eab Squelch a compiler warning.
The clang I'm using warns about a non-constant format string in
val_to_str_ext() calls; get rid of the unknown_format variable and,
instead, make two different proto_item_append_text() calls with
different format arguments in the val_to_str_ext()-call arguments.

Change-Id: Id668efe666634798c278958bd7e6d790ec476539
Reviewed-on: https://code.wireshark.org/review/6479
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-10 19:40:33 +00:00
Robert Grange 51acf1685b packet-mq: sort some value_string_ext in dissector
Some value_string_ext are sorted only in the dissector,
and only once.

Adapted as said in comments.
Added test for sort in dissect_mq_spx

Change-Id: If72159fe96ab28a3ed540778d67996e152b4f110
Reviewed-on: https://code.wireshark.org/review/6444
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-10 17:42:09 +00:00
Pascal Quantin b760da956d MQ: ensure that at least 4 bytes were captured before doing heuristic checks
Otherwise it could trigger an exception

Change-Id: I280e3c5d9e5554e4be49035c03e0170ae4495e6e
Reviewed-on: https://code.wireshark.org/review/6463
Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-10 16:44:40 +00:00
Alexis La Goutte 7600ddb88e UTS: fix Copy-paste error (CID 11158603)
Change-Id: Ibabb8ab3ccb0543856c84822542baa1ac0139f7e
Reviewed-on: https://code.wireshark.org/review/6472
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 15:57:05 +00:00
Alexis La Goutte 15ac6eb5c8 ISMACRYP: fix Copy-paste error (CID 11158602)
Change-Id: I4978627115f46a8aa90ccf67f7c008cdf9986da6
Reviewed-on: https://code.wireshark.org/review/6471
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 15:56:16 +00:00
Alexis La Goutte e2fa5a516d CTDB: fix Copy-paste error (CID 11158596)
Change-Id: Ieaa70505f4b880569be6126166a71f32d84f79a8
Reviewed-on: https://code.wireshark.org/review/6470
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 15:55:15 +00:00
Alexis La Goutte 678051933d NLM: fix Copy-paste error (CID 11158588)
Change-Id: I0d2736f3e00c62bb908e346a641d0ddc8b171fd2
Reviewed-on: https://code.wireshark.org/review/6469
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 15:54:43 +00:00
Alexis La Goutte 0f6b09d32e to_str (epan): fix parameter 'scope' not found in the function declaration [-Wdocumentation]
Change-Id: Ie414d28415b71a79780d37fae454b90a7a610e1c
Reviewed-on: https://code.wireshark.org/review/6475
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 15:52:40 +00:00
Michal Labedzki 1a30c9767a Bluetooth: A2DP: APT-X: Unhardcode stream configuration
Change-Id: I16cfb4d014020a7fb2c67fef3128021c9901719a
Reviewed-on: https://code.wireshark.org/review/6442
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-10 15:36:39 +00:00
Michal Labedzki f343710ee2 Bluetooth: HCI: Detect Vendor by "Read Local Version Information"
There is information about manufacturer of Bluetooth chip.
Also try to detect if that "permament" info is not changed,
if so informs user about this rare event (probably there is an issue)

Change-Id: I1fa748a67ad7943e61d4445d240f0578b94560fc
Reviewed-on: https://code.wireshark.org/review/6408
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-10 15:36:22 +00:00
Michal Labedzki 55df238efd Bluetooth: SMP: Add missing opcode for "Identity Address Information"
Also fix tvb_length, tvb_length_remaining warnings.

Bug: 10299

Change-Id: Ib8b55ea9f2220394a5896d13e5cc4e2cefff1e13
Reviewed-on: https://code.wireshark.org/review/6407
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-10 15:36:02 +00:00
Michal Labedzki d6e0409892 Bluetooth: Add HCI Vendor Broadcom dissector
Since those command/events are vendor specific and proprietary
not all commands/events are implemented. All implemented commands can be
found in Open Source implementations for Broadcom chip. If you found more,
please let me know.

Change-Id: Ie68d3737c88a8cef39260a9d93192cfc81871d6c
Reviewed-on: https://code.wireshark.org/review/6406
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-10 15:35:39 +00:00
Michal Labedzki c69b2ab320 Bluetooth: ATT: Dissect opcode with more precision
Change-Id: Iddc1a6d899b10b0d5c25723a71da7dcd11c6dfad
Reviewed-on: https://code.wireshark.org/review/6405
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-10 15:35:03 +00:00