aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-01-18Try to make Mac OS X Buildbots happyAlexis La Goutte1-2/+2
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-18Miscellaneous ep_strdup_printf replacement.Michael Mann9-22/+35
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-18Remove ep_strndupMichael Mann6-39/+24
Change-Id: Id336dc16f97a0973754993094aa637813c0ca31c Reviewed-on: https://code.wireshark.org/review/6604 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-18Remove emem from GeoIPMichael Mann7-34/+77
Change-Id: Ifa96dc38a277b86c28f762489251dcc595afae67 Reviewed-on: https://code.wireshark.org/review/6603 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-18Trim down the use of ep_ memory in the display filter code.Michael Mann4-22/+31
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-17Replace the last of ep_alloc and ep_alloc0 with wmem equivalent.Michael Mann4-14/+12
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-17Replace all remaining instances of ep_new with wmem_new and wmem_packet_scope.Michael Mann4-29/+24
Change-Id: I50b2cd0e233554bc58082e96e8d879b40edfc0c1 Reviewed-on: https://code.wireshark.org/review/6595 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-17DHCP/BOOTP: Option 125 Suboption: (1) option-len always expects 1 but ↵Alexis La Goutte1-2/+2
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-17X509AF: dissect Certificate Serial Number as INT64 instead of INT32Pascal Quantin2-4/+9
Bug: 10862 Change-Id: Ie315298dd090b3b689f6a9bfff6f6f5bf7cc715a Reviewed-on: https://code.wireshark.org/review/6594 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-17A few more emem replacements with wmem.Michael Mann2-10/+8
Change-Id: Icfb319fba937642db637a7f26b5e7627461df3b0 Reviewed-on: https://code.wireshark.org/review/6590 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-17Convert proto_construct_match_selected_string to use wmem.Michael Mann6-10/+22
Change-Id: I7a40c0996517aa71b4ddb764ce3a6e92a55260ad Reviewed-on: https://code.wireshark.org/review/6589 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-17Added Card Application Toolkit Transport Protocol (CATTP) dissectorSebastian Kloeppel4-0/+609
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-17Correct PF field offset when looking for DARussel1-1/+1
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-17dissect CCRC, APRC and the APDU body's dataMartin Kaiser1-2/+28
Change-Id: I21f7420286ed3e668ce4dc0eac06bbf4172039d6 Reviewed-on: https://code.wireshark.org/review/6588 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-17dissect the serial characters and the CRCMartin Kaiser1-2/+35
Change-Id: I64af822f30b02d313f5242014ff5e40a73dffa35 Reviewed-on: https://code.wireshark.org/review/6587 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-17RSYNC: Malformed Packet on rsync-version with length 2Alexis La Goutte1-2/+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-17EAPOL-MKA: Included fixes for the distributed sak handling.maisheri3-3/+23
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-17PacketLogger files can be big-endian or little-endian.Guy Harris1-12/+52
Bug: 10861 Change-Id: Iedb248aa4a96e65bb525ba6475dc767e5dfefbe0 Reviewed-on: https://code.wireshark.org/review/6579 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-16USB: do not put usb_address_t structure on stack and initialize it ↵Pascal Quantin1-16/+17
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-16Update a commentPascal Quantin1-2/+2
Change-Id: I7bf1173bfb23e5f083b8aaf09476b30b4791aae0 Reviewed-on: https://code.wireshark.org/review/6577 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-16Update comment to reflect the current reality.Guy Harris1-1/+2
Change-Id: I7f8c66723efc9d21ec3abc08e57db1df5f772f04 Reviewed-on: https://code.wireshark.org/review/6576 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-16Spaces separate bytes; they don't have to surround them.Guy Harris1-6/+7
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-16IS-IS: Add missing i variable for subclv loop (IS Reachability)Alexis La Goutte1-1/+1
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-16IS-IS: wrong length for SubTLV 18 (TE default Metric)Alexis La Goutte1-1/+1
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-16Kill more unused emem functionsEvan Huus4-60/+1
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-16CMakeList.txt/Makefile.am (root) : fix indent (use tabs)Alexis La Goutte2-124/+137
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-16ZBee ZCL: use tvb_get_guint8() (avoid tvb_get_ptr... !)Alexis La Goutte1-1/+1
Change-Id: I248ddb1dee5398528279807968b095cbc5413ae0 Reviewed-on: https://code.wireshark.org/review/6569 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-16Remove se_ alloced memory from packet_list_storeMichael Mann1-3/+3
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-16GSM SIM: enhance dissection of APDU Class bytePascal Quantin1-9/+73
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-16SE_COPY_ADDRESS -> WMEM_COPY_ADDRESSMichael Mann26-114/+117
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-16Remove seasonal memory from everything except address resolutionsMichael Mann6-20/+20
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-16bug 10833 undecoded bitmaps were being displayed raw which is hard to ↵Chris Brandson1-70/+105
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(Trivial) Move a comment next to the code related to it.Jeff Morriss1-7/+7
Change-Id: I83749a1b30059cc8e8f13b58fbde74e9ab873582 Reviewed-on: https://code.wireshark.org/review/6562 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-01-16Quakeworld: Nesting level does not match indendation (CID 1159218)Alexis La Goutte1-1/+2
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-16Remove the last two true calls to se_alloc.Michael Mann2-11/+35
(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-16Replace se alloced memory in compare stat tap.Michael Mann9-17/+36
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-16QT: stats_tree plug-ins not added to statistics menuDeon van der Westhuysen3-0/+61
Wireshark Qt does not add plug-ins that register with stats_tree_register_plugin() to the statistics menu in the ui (like the gtk version does). This patch dynamically adds all registered stats_tree plug-ins to the statistics menu. Bug: 9528 Change-Id: I99f9415502ca9f7121d494c856861edc1a762079 Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-on: https://code.wireshark.org/review/6336 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15Replace C++ style comment with C style.Michael Mann1-1/+1
Change-Id: Ibee0dccdb5a330866dcd0047216cd5a4da45fc8b Reviewed-on: https://code.wireshark.org/review/6559 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-15Conversation Table : Copy-paste error (CID 1262415)Alexis La Goutte1-1/+1
Change-Id: I37fd8154f93763ac091528921d1b66d8e8fd56dd Reviewed-on: https://code.wireshark.org/review/6555 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-15NetFlow: Assign instead of compare (CID 1262419 & 1262420)Alexis La Goutte1-2/+2
Change-Id: Idc2c2e02b973f65c6c2f22f2d1bfd8545cd23f63 Reviewed-on: https://code.wireshark.org/review/6554 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-15Packet List (Qt): Missing break in switch (CID 1262418)Alexis La Goutte1-0/+1
Change-Id: Id46f2be5b5206dfcb0ce7e7ea2d31398eff54917 Reviewed-on: https://code.wireshark.org/review/6552 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15Address to str: Missing break in switch (CID 1262416 & 1262417)Alexis La Goutte1-0/+3
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-15HTTP: fix implicit conversion shortens 64-bit value into a 32-bit valueAlexis La Goutte1-1/+1
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-15ZigBee: packet scope memory cannot be used for BASE_CUSTOM callbacksPascal Quantin2-2/+8
Change-Id: I28fe21151b9f8c91786ca6c56d141a458419c501 Reviewed-on: https://code.wireshark.org/review/6548 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-15HTTP Dissector: Add CitrixAGBasic authenticationUli Heilmeier1-0/+122
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-15CMake: Rename the windeployqt variable.Gerald Combs1-3/+6
The windeployqt variable name ends up in the cache. Change it to QT_WINDEPLOYQT_EXECUTABLE, which follows conventions used in the Qt CMake modules. Change-Id: I14998b921009e44e5ca743e2915fe84447b22df0 Reviewed-on: https://code.wireshark.org/review/6549 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15Fix-copy-qt-dllGraham Bloice1-2/+6
The copy-qt-dll custom command should ensure the qt bin dir is on the path. Modify the flags passed to windeployqt depending on the configuration. Change-Id: I12860d415f80cee323c72aa8a4892eaa6126f165 Reviewed-on: https://code.wireshark.org/review/6537 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15remove the executable bits from packet-zvt.cMartin Kaiser1-0/+0
(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-15start a dissector for ZVT KassenschnittstelleMartin Kaiser4-0/+356
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-15Modify the errorcode defenition to suit ANSI MAP, this is (probably) OK asAndersBroman2-7/+49
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>