aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2014-05-05Solaris doesn't like anonymous unionsEvan Huus1-11/+11
so give it a name Change-Id: Iaf9a6f8cb58a565673f53696f7e5d1698e6eae0f Reviewed-on: https://code.wireshark.org/review/1509 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-05OpenFlow 1.4 OXM field OXM_OF_IPV6_ND_SLL incorrectly dissected (128 bits ↵Alexis La Goutte1-2/+2
read instead of 48) Dissection of OXM_OF_IPV6_ND_SLL triggers "malformed packet" comment in packet list since it makes dissecting of further OXM fields impossible. It is possible that similar issue will be with OXM_OF_IPV6_ND_TLL since its dissecting is basically the same. Issue found by Viktor Closed-bug:10011 Change-Id: I21b85cc0572ffdb8bb8b73cfae0db1d72219fe4b Reviewed-on: https://code.wireshark.org/review/1505 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-05OpenFlow 1.3 OXM field OXM_OF_IPV6_ND_SLL incorrectly dissected (128 bits ↵Alexis La Goutte1-2/+2
read instead of 48) Dissection of OXM_OF_IPV6_ND_SLL triggers "malformed packet" comment in packet list since it makes dissecting of further OXM fields impossible. It is possible that similar issue will be with OXM_OF_IPV6_ND_TLL since its dissecting is basically the same. Issue found by Viktor Closed-bug:10011 Change-Id: I13893710ad4028669e454c6f8485f719b62bcaab Reviewed-on: https://code.wireshark.org/review/1504 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-05Fix build with older compilersEvan Huus1-3/+7
The struct literal syntax {0} does not appear to be universally supported - use memset instead. Change-Id: If70d475cf3d7a582c43dcc879cefebc9aef0a99e Reviewed-on: https://code.wireshark.org/review/1508 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-05SSH dissector: fix MAC length calculation for recent OpenSSH featuresJan Seda1-9/+61
Also, show the packet length part of the encrypted packet. The length may be encrypted (typical) or not (-etm modes and GCM mode). When not encrypted, show as a number. Bug:10066 Change-Id: I8c3a943b1b527b326b662e71f07ac6157684d5d9 Reviewed-on: https://code.wireshark.org/review/1462 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-05Media Agnostic USB Packet DissectorSean O. Stalley5-2/+1495
This dissector dissects MA USB Packets. It is capable of dissecting Media Agnostic packets both in a TCP stream as well as packets sent over SNAP (referred to in spec as "Raw Ethernet" mode). Change-Id: I3ad4e1beb891f9c2835adff320095e7e738241eb Signed-off-by: Sean O. Stalley <sean.stalley@intel.com> Reviewed-on: https://code.wireshark.org/review/1252 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-05Fix dead assignment found by clang in test codeEvan Huus1-1/+1
Change-Id: Ie78769bfd8034f6c2ee7d9e26a209d650cedb98d Reviewed-on: https://code.wireshark.org/review/1507 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-05Allow IPv6 Mobility Option Service Selection with option length = 1Alexis La Goutte1-1/+1
According to RFC 5149 (http://tools.ietf.org/html/rfc5149#section-3), the Service Selection mobility option length must be between 1 and 255. Discovered while working on Pcap.Net, http://pcapdot.net. Found by Boaz Change-Id: I6d9e9eba8c45b5a6c38523182069ab0f236d85bb Closed-bug:10045 Reviewed-on: https://code.wireshark.org/review/1506 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-05Reduce wmem fast-block fuzz rounds even furtherEvan Huus1-1/+1
Follow-up to g19e650f43adf23b0aa92821bff0cc389643944f6 since the fuzz-bot is still failing. Change-Id: I2d05a861b0edf50ce734b682e6e3e33729bf6771 Reviewed-on: https://code.wireshark.org/review/1503 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-05Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-3/+3
Change-Id: I35ed4c0ecc28dee57d7a4cac8ddbf43d16b39677 Reviewed-on: https://code.wireshark.org/review/1501 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-05Fix indent (use tab) and modelinesAlexis La Goutte1-125/+138
Change-Id: Ibff9e0564f2786e8a51b8884724c322725fdf147 Reviewed-on: https://code.wireshark.org/review/1500 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-05Several tweaks to fast block allocatorEvan Huus1-45/+24
- manually inline wmem_block_fast_add_to_block_list, it was only two lines and only called twice, so the function boilerplate was outweighing the abstraction - change free_all to release all but one block to the OS immediately, making gc a no-op; the alloc logic doesn't reuse later blocks anyways, so this was effectively a leak Change-Id: I033fbb2f3d87e58c7346cba10f2c710eaaa49e9f Reviewed-on: https://code.wireshark.org/review/1499 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-05Add dissector for 3GPP2 A21/S102 protocol.Michael Mann3-0/+975
Change-Id: I611c217e1eec47da7427c0317ed9416b4c52411a Reviewed-on: https://code.wireshark.org/review/1487 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-05Fix possible buffer overflow in col_append_sep_fstr()Jakub Zawadzki1-3/+5
After appending separator it might happen that len > max_len, in such case g_vsnprintf() will overflow the col_buf buffer. Change-Id: Ic5ff49d30e30509e835165c4cc7e72e31f92fd5f Reviewed-on: https://code.wireshark.org/review/1493 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-05Fast block allocator: make wmem_block_fast_hdr_t single linked list.Jakub Zawadzki1-4/+1
Double linked list was required by jumbo allocation. No support for jumbo -> no need for double linked list -> have only 'next' pointer in header. Change-Id: I48a0f468ebba9db3a63548d8e7307b6424c759ed Reviewed-on: https://code.wireshark.org/review/1495 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-04Fuzz fewer iterations of the fast block allocatorEvan Huus1-6/+11
I believe the XP buildbot failures are simply running out of memory, so hopefully reducing the number of iterations should be enough to let it finish reliably. Change-Id: I40af789d528c2623e95f153529205b5e617c6e02 Reviewed-on: https://code.wireshark.org/review/1496 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-04MAC LTE: fix compilation errorPascal Quantin1-4/+10
error: assignment discards 'const' qualifier from pointer target type [-Werror] also add the missing definition of hf_mac_lte_bsr_size_median Change-Id: I31e172a16b4afd59ba8cf5a9b281bbeaf15b6c56 Reviewed-on: https://code.wireshark.org/review/1492 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-04Update some soft-deprecated APIs.AndersBroman7-13/+13
Change-Id: I0e255e72dd4cd9a94a4f92af409c4b34c0a266ed Reviewed-on: https://code.wireshark.org/review/1491 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-04[Automatic manuf, services and enterprise-numbers update for 2014-05-04]Gerald Combs1-39/+340
Change-Id: Idd150c8d2a7f4e5368ca80c35ae920fb40944f1d Reviewed-on: https://code.wireshark.org/review/1488 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-05-04GUI modules for LBM aka 29West dissectors.David Ameiss1-0/+1
bug:9718 Change-Id: I05330d8a2475ad0d238723d444f3d98bdbd7be39 Reviewed-on: https://code.wireshark.org/review/1041 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-04Remove enabling HAVE_SNOW3G by defaultMichael Mann1-2/+1
Change-Id: Ie1af436b763ec762a41af0bdfc1f3ec6adea2bc1 Reviewed-on: https://code.wireshark.org/review/1486 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-03Have RRC tell MAC about RAPID ranges so it can show for RAPIDs seenMartin Mathieson3-5/+67
Change-Id: Ie9adbe3015c63e53997068053b6f8ec224a5bf82 Reviewed-on: https://code.wireshark.org/review/1474 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-05-03Update TODO commentsMartin Mathieson1-4/+6
Change-Id: I4ea940be5b65c041bdd330bfc2bdbe9a00360d00 Reviewed-on: https://code.wireshark.org/review/1475 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-05-02LLDP: Remove packet-lldp.hAlexis La Goutte3-62/+27
Change-Id: If6d1fd1b7961f975447db43f616e016f70ca5cb8 Reviewed-on: https://code.wireshark.org/review/1473 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-02ECP dissector Remove packet-lldp.h dependsAlexis La Goutte1-25/+83
* Fix indent (use tabs) * Use VDP function for end VTPDU Change-Id: I93216ac5b304dc3ba78cbe830e5d12589c138eb5 Reviewed-on: https://code.wireshark.org/review/1472 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-02Move value string of LLDP OUI to epan/oui.hAlexis La Goutte2-16/+17
Change-Id: I3d9ddbae60631c958880574e7e441a931db3492d Reviewed-on: https://code.wireshark.org/review/1471 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-02wmem: add new simple block allocator, use it in packet-scope.Jakub Zawadzki9-36/+377
For packet-scope allocation, there's no need to support realloc(), free() cause memory will be garbage collected after packet dissection. (and this allocator is much faster than full block allocator). Change-Id: I73fdf708c3077f48f55bdcc71f4fa859e4ac2335 Reviewed-on: https://code.wireshark.org/review/1428 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-02Enhance display of SPDY packet (Remove some information from column)Alexis La Goutte1-59/+33
Fix also tvb_length / tvb_length_remaining soft warning Change-Id: I3fd8f3a842fa84273b84ae36317e2c3fbdca076d Reviewed-on: https://code.wireshark.org/review/1461 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-02Add modelines infoAlexis La Goutte1-1/+13
Change-Id: I35bed12af5e0a2da9daf2fb5b6dfdfe05377549e Reviewed-on: https://code.wireshark.org/review/1470 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-02Add modelines infoAlexis La Goutte1-0/+13
Change-Id: I82f841e0ee9e00c69894d8c4c67f581278c87546 Reviewed-on: https://code.wireshark.org/review/1469 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-02Reintroduce wmem_allocator_force_newEvan Huus1-4/+36
We now have to call wmem_init in order to randomly seed the values for wmem_map. This means we can no longer rely on the lack of override, so we have to force the right allocator type when testing/timing the allocators themselves. Change-Id: I005034465b0a98f19876899b96ef65b3e4b1d759 Reviewed-on: https://code.wireshark.org/review/1468 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-02Optimize wmem_strbuf_grow.Evan Huus1-0/+8
As suggested by Anders, in the case of repeated calls to wmem_strbuf_append_c (and other functions which append very little data) the growth check was a substantial portion of the over-all running time. By short-circuiting the check in the case where growth isn't needed (as opposed to letting it fall-through naturally) we shave ~25% off the cost of such repeated calls in my benchmarks. The function (wmem_strbuf_grow) is inline, so the compiler should be able to optimize each caller individually for the short-circuit. Change-Id: I76419020f4d8fa675906eb77798969b6c61c7732 Reviewed-on: https://code.wireshark.org/review/1467 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-02Add a new Dissector for HiSLIPMarcel Essig3-0/+1071
Change-Id: I87aaf4c8093ee8013a661aa8af81dba63eaa7086 Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-on: https://code.wireshark.org/review/1337
2014-05-02Fix Dereference of null pointer found by Clang analyzerAlexis La Goutte1-43/+54
Also add modeline info and use _U_ only when it is needed (for pinfo) Change-Id: I71349d6451e1d8304fad04781e5ee226a1a4c729 Reviewed-on: https://code.wireshark.org/review/1466 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-02Add support for Logical Link Down TLV.Anish Bhatt1-0/+25
TLV is 1 octet long, and only MSB holds info with 7 unused bits Change-Id: Ic1f5ce1b774bb7439cd2a23bc9bfb44f7dc25888 Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/1450 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-01MBIM: dissect MBIM_SET_STK_PAC and MBIM_STK_PAC_INFO messagesPascal Quantin1-9/+663
Change-Id: Ib58dece7ce7278e292d88f68368c238695c32394 Reviewed-on: https://code.wireshark.org/review/1463 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-01Cleanup SPDY dissector.Michael Mann1-27/+55
Address Evan's missed comments from https://code.wireshark.org/review/767/ From Alexis La Goutte Fix unused variable (pinfo) and fix crash (wrong variable in while) Change-Id: I1b134585f4d522d3e808069f606beb4aae0488fa Reviewed-on: https://code.wireshark.org/review/1164 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-01Add OSPF Authentication Trailer (RFC6506)Alexis La Goutte1-0/+102
Change-Id: Ie5c536a6977e35acc12222af3c48d29740cd57f2 Closed-bug:9941 Reviewed-on: https://code.wireshark.org/review/1440 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-01Fix Dereference of null pointer found by Clang analyzerAlexis La Goutte1-2/+2
packet-teamspeak2.c:456:21: warning: Access to field 'fragmented' results in a dereference of a null pointer (loaded from variable 'frag') Change-Id: Ie253991f8d664c4594254bcd4569883614aafe2f Reviewed-on: https://code.wireshark.org/review/1455 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-01Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-2/+2
Change-Id: I8ab25b1a3326ade46408ebd2e14cf841191c57d9 Reviewed-on: https://code.wireshark.org/review/1454 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-01Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
Change-Id: Id38f366c04edcf3326b323fc851a6644a942d79d Reviewed-on: https://code.wireshark.org/review/1453 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-01gluster: add support for GlusterD v3 proceduresNiels de Vos3-7/+173
The GlusterD Management protocol has been updated to version 3. All procedures are implemented with this change. This change also takes care of converting values passed in a dictionary to real and displayable GUIDs. Change-Id: I93808eda393745aa9ab3b986a6b7997f6f80df50 Reported-by: Vikhyat Umrao <vumrao@redhat.com> Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: https://code.wireshark.org/review/1411 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-01AT: do not always prepend "/" to protocol namePascal Quantin1-1/+1
Change-Id: Ice043e0355ea4d9112b377398079c94e66e35cc8 Reviewed-on: https://code.wireshark.org/review/1452 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-01Try to fix warning C4244: '-=' : conversion from '__int64' to 'int',AndersBroman1-1/+1
possible loss of data Change-Id: I8cf74090e507f21eebfb40d72a3630d9f9bb0390 Reviewed-on: https://code.wireshark.org/review/1451 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-30Document to_str-int.h functions.Jakub Zawadzki2-7/+119
Change argument name of hex_to_str_back pad->len it seems to sounds better. Make uint_to_str_back_len() value uint32, to be sure about required buffer size. Change-Id: I48fd560683c5c0845cbb60813887a18328ec01e6 Reviewed-on: https://code.wireshark.org/review/1448 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-30Optimize display_signed_time() - remove g_snprintfJakub Zawadzki2-10/+61
When tshark is printing columns (default) display_signed_time() is called for every frame. Current implemention is using g_snprintf() which makes this function costly when there is lot frames. Change-Id: I109c8699d38bfbd05475d457ae4173e937c6812d Reviewed-on: https://code.wireshark.org/review/1447 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-30Fix uninitialized struct in SMB2Evan Huus1-6/+2
Bug:10056 Change-Id: I6c7d3900208ee058ca9505e8d9f673ce4f4801cb Reviewed-on: https://code.wireshark.org/review/1446 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-30Add '#include "packet-ipsec.h'; Do some cleanup.Bill Meier1-1294/+1309
Cleanup: - #include <stdio.h> & <ctype.h> only when needed; - Add editor modelines; - Convert tabs to spaces; - Use a consistent indentation (2 spaces). Change-Id: I5ef67b5c6aff99bf5dc1655b20760f862cd14d7f Reviewed-on: https://code.wireshark.org/review/1445 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-04-30IPsec: fix compilation when building without libgcryptPascal Quantin1-4/+3
Change-Id: If525fb27ec607201efceb3ab9207305c3a4953dc Reviewed-on: https://code.wireshark.org/review/1439 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-30Cleanup libz streams in SPDY dissectorEvan Huus1-1/+21
Fixes major memory leak. Bug:10062 Change-Id: Ife70f12b8697a7873860c702ee0c740f98d98821 Reviewed-on: https://code.wireshark.org/review/1435 Reviewed-by: Evan Huus <eapache@gmail.com>