aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2015-01-18Remove some apparently-unnecessary includes of emem.h.Guy Harris24-34/+0
Change-Id: Ib7d1b587b439ff21ec6b7f1756ce6ccf25b66f80 Reviewed-on: https://code.wireshark.org/review/6635 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18proto.c: Update some comments to reflect realityBill Meier1-7/+8
Change-Id: I0f82666cb233688d94d6f3a2c45d7490a7f79bec Reviewed-on: https://code.wireshark.org/review/6634 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-18Remove some apparently-unnecessary includes of emem.h.Guy Harris9-9/+0
Change-Id: Id50ce3e707056cca8f30052f05c451ce431b39b5 Reviewed-on: https://code.wireshark.org/review/6632 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18Remove seasonal memory from address resolution.Michael Mann1-4/+25
This is the last remaining use of se_ memory APIs. Change-Id: Ic0508a830bc5460bc743d21eb33ffdd7f4ce2eb5 Reviewed-on: https://code.wireshark.org/review/6574 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-18make things a bit easier to read...Martin Kaiser1-3/+4
Change-Id: I3499c2f9e07a960f8bdf83973693bdeb4fb4ebd9 Reviewed-on: https://code.wireshark.org/review/6630 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-18remove trans_info parameter from dissect_usb_hid_report_item()Martin Kaiser1-6/+3
Change-Id: I04eba644be7dd3e64b67c7d42c596bcdcf6a1942 Reviewed-on: https://code.wireshark.org/review/6628 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-18clean up the functions that dissect the hid requestsMartin Kaiser1-80/+80
Change-Id: Ie4d52b62824a8c0c777ffce3988fbe1fd4e5b4a4 Reviewed-on: https://code.wireshark.org/review/6627 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-18remove redundant (and unused) paramter usb_trans_infoMartin Kaiser1-8/+8
Change-Id: Ibb683f6d42125b13417aceb06949102a9821d626 Reviewed-on: https://code.wireshark.org/review/6626 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-18[Automatic manuf, services and enterprise-numbers update for 2015-01-18]Gerald Combs3-8/+172
Change-Id: If1c72e3b58ced6b9b86a584d96f632b2433751e8 Reviewed-on: https://code.wireshark.org/review/6623 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-18ISUP: add dissection of generic number qualifier indicatorPascal Quantin1-5/+21
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-18HTTP: revert a change done in g0ee179cPascal Quantin1-1/+3
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-18no need for if(tree)Martin Kaiser1-7/+4
Change-Id: I7e8cfe3a220d65e80afa109a62867c4ff2ce08e8 Reviewed-on: https://code.wireshark.org/review/6619 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-18ftype (integer): fix Uninitialized argument value found by Clang AnalyzerMichael Mann1-0/+3
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-18asn2wrs: autodetect if 64 bits variant is required for constrained integersPascal Quantin7-229/+184
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-18LDAP: g8c608e6 did not include the changes in template file, that got lost ↵Pascal Quantin1-4/+6
afterwards Change-Id: I5d79d3e48c1ad83713a312dce39b749f47b0ecc8 Reviewed-on: https://code.wireshark.org/review/6612 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-18ASN.1: regenerate dissectors after g506409dPascal Quantin5-13/+13
Change-Id: If82112ce7bae4de0c0c24794dc57ffebbf401978 Reviewed-on: https://code.wireshark.org/review/6611 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-18We need epan/wmem/wmem.h regardless of whether we have GeoIP.Guy Harris1-4/+6
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-18Clean up ftype-conversion and dfilter error message string handling.Guy Harris29-401/+511
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-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 Mann7-20/+27
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 Mann4-37/+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 Mann4-29/+64
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 Mann3-27/+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 Quantin1-4/+4
Bug: 10862 Change-Id: Ie315298dd090b3b689f6a9bfff6f6f5bf7cc715a Reviewed-on: https://code.wireshark.org/review/6594 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-17Convert proto_construct_match_selected_string to use wmem.Michael Mann2-9/+12
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 Kloeppel3-0/+608
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.maisheri1-3/+19
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-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-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 Huus2-54/+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-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-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 Mann23-101/+101
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 Mann5-18/+18
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 Mann7-11/+11
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-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>