aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-05-09Revert "Try to fix the build boot by changing the signature of ↵Guy Harris1-2/+1
catapult_dct2000_dump() to the declared one." This reverts commit f5a0d7e89753622bb11a6e27292c459a87ca9c67. There's a lot more work needed to fix this change; that's not the only broken file. I'm going to be reverting the whole thing. Change-Id: I8e9bb3902f7e398ccb71c66711869c3dd338271c Reviewed-on: https://code.wireshark.org/review/1569 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-09Use g_ alloced memory (instead of emem) when printing fields. emem ↵Michael Mann4-23/+22
shouldn't be used for GUI functions. emem was exposed because of its memory limits trying to output PDML for a very large byte field in a capture file. bug:10081 Change-Id: I6346dfdfb5f6381e16761a99291c4be7851185d9 Reviewed-on: https://code.wireshark.org/review/1566 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-09Try to fix the build boot by changing the signature ofAndersBroman1-1/+2
catapult_dct2000_dump() to the declared one. Change-Id: Ib9b38fb35ace1e858e8105a54a192c044899b69a Reviewed-on: https://code.wireshark.org/review/1567 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-09Refactor WiretapMichael Mann143-3089/+3557
Start of refactoring Wiretap and breaking structures down into "generally useful fields for dissection" and "capture specific". Since this in intended as a "base" for Wiretap and Filetap, the "wft" prefix is used for "common" functionality. The "architectural" changes can be found in cfile.h, wtap.h, wtap-int.h and (new file) wftap-int.h. Most of the other (painstaking) changes were really just the result of compiling those new architecture changes. bug:9607 Change-Id: Ife858a61760d7a8a03be073546c0e7e582cab2ae Reviewed-on: https://code.wireshark.org/review/1485 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-08Profiling show that g_log() takes a lot of CPU even when logging isn'tAndersBroman1-0/+2
active. Change-Id: I242f8e98a77861c0174e432c7026964babae7299 Reviewed-on: https://code.wireshark.org/review/1565 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-08Add a command option for dumpcap.AndersBroman1-2/+5
Change-Id: Ic9a4b35f5a6245e0100f93c890622674e44413c6 Reviewed-on: https://code.wireshark.org/review/1564 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-08Fix a whitespace after IKE_AUTHAlexis La Goutte1-1/+1
Change-Id: Id58da1f546ee5dff72cbc1bc012095ad0b9a9be5 Reviewed-on: https://code.wireshark.org/review/1562 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-08MAC LTE: add a comment explaining why g_hash_table_lookup_extended is usedPascal Quantin1-0/+2
Change-Id: I9d7310359d5972c603396a802abc2a82b46fe57e Reviewed-on: https://code.wireshark.org/review/1563 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-08Small fix to how number of traffic classes is displayed for ETS.Anish Bhatt1-1/+4
Used proto_tree_add_uint_format_valu instead of append_text Change-Id: I6d3d6049655c0573b66249ce93ea850c15b1cb7b Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/1522 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-08Remove trailing whitespaceMartin Mathieson1-2/+1
Change-Id: Idf8f9aba4e020a278e7b779de13ecdbcfcc39776 Reviewed-on: https://code.wireshark.org/review/1560 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-05-08Prettify a little, by showing ike2 flag values in flag root, and showing MID ↵Martin Mathieson1-2/+15
and flags in Info column Change-Id: I70884c933b3d82dfb7168352c5bed925f7e89e11 Reviewed-on: https://code.wireshark.org/review/1554 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-05-08MAC LTE: fix copy/paste errorPascal Quantin1-1/+1
Change-Id: I59fd7745d454357d3eeaf48ed8700581a8aa0018 Reviewed-on: https://code.wireshark.org/review/1556 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-08packet-dis: correct 'Terminal Primary Mode' and 'Sync State' enumeration valuesPeter Ross1-5/+4
SISO-STD-002 Standard for Link 16 Simulations, June 2006: http://www.sisostds.org/DigitalLibrary.aspx?Command=Core_Download&EntryId=30265 Change-Id: Ic06c5f63b2da605cc3e3b14d001c81f87b98cdb4 Reviewed-on: https://code.wireshark.org/review/1553 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-08TCAP: set a fence on info column after calling sub dissectorPascal Quantin2-2/+6
Bug: 10091 Change-Id: I7af57345e31209fb4dd02cdab7960c44c69dc0a5 Reviewed-on: https://code.wireshark.org/review/1555 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-08MAC LTE: get extended BSR sizes configuration from RRCPascal Quantin4-9/+138
Change-Id: I09afa7c17be5e0ed902a2c2f5ea9989df3380615 Reviewed-on: https://code.wireshark.org/review/1550 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-08Recognize kafka's ConsumerMetadata message typeEvan Huus1-12/+14
actual dissection still TODO Change-Id: I58e54ca117a9ccd5d6af34d18f9277afd009aa95 Reviewed-on: https://code.wireshark.org/review/1547 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-08Populate heuristic extension list during initialization and not during each ↵Michael Mann5-95/+109
call to heuristic_uses_extension. Change-Id: I7e484de65c49060793a91cc11cb211effa2006db Reviewed-on: https://code.wireshark.org/review/1494 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-07Add handling of TEXT and HTML types.Jaap Keuter1-0/+78
Change-Id: Ife125be2c5043cc6cc1b879714671d9973c8214b Reviewed-on: https://code.wireshark.org/review/1549 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-07Use a strong hash function for ethernet addresses.Evan Huus1-132/+23
The capture for bug 10078 caused the buildbot to time out; callgrind revealed an enourmous amount of time being spent looking up ethernet addresses. The previous code cast each address (6 bytes) to a guint64 (8 bytes) then used the built-in g_int64_hash. Unfortunately, g_int64_hash is an *awful* hash function - it produces a 4-byte hash by simply discarding the upper 4 bytes of its input. For the capture file in question this strategy (which effectively ignores the upper two bytes of each ethernet address) produced an astounding number of collisions, leading to the terrible running-time. Use wmem_strong_hash directly on the 6-byte address instead, which saves us a bunch of useless casting and bit-twiddling and produces a much better hash distribution. This shaves 20% off the time to tshark-with-tree the capture file in question *despite* a substantially more expensive hash function (wmem_strong_hash is not exactly fast compared to g_int64_hash). Bug:10078 Change-Id: I8e81cbc478e6394ec3a8efe39eec08f680a55609 Reviewed-on: https://code.wireshark.org/review/1543 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-07Fix a typo.AndersBroman1-1/+1
Change-Id: I17171157350f985506ef8498c88814e319396bd6 Reviewed-on: https://code.wireshark.org/review/1545 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-07Error out if someone passes the address of a pointer to a *_string to VALS() ↵Jeff Morriss1-0/+8
or RVALS(). Change-Id: I85021b1cba151c16bf0a2d30169cf3dec77780f5 Reviewed-on: https://code.wireshark.org/review/1540 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-07Make it pass the new check in checkapiAndersBroman1-8/+8
"Error out if someone passes the address of a pointer to a *_string to VALS() or RVALS()." Change-Id: I1b5b9bbf512f8fdfaab5febea28db2c51d49c48c Reviewed-on: https://code.wireshark.org/review/1544 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-07Further LLDP dissection cleanupAnish Bhatt1-16/+51
Change-Id: I75f4ed401f63e993a2aefa1c289fd48fa00b46e2 Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/1528 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-07Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-2/+0
Change-Id: I8727e74d0818f759f3c58c6f156b0b4e36eb7218 Reviewed-on: https://code.wireshark.org/review/1465 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-07Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I3c54712108978d1bafe2b5da96e6a7d3d41948b5 Reviewed-on: https://code.wireshark.org/review/1535 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-06"Reserved" is not a valid 'fieldconvert' value for an hf.Jeff Morriss1-2/+2
Fixes (for real this time, I swear!) the fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10079 Bug: 10079 Change-Id: I2a73ef32d704fc9ecc71fd983fc09cf4f9194b2e Reviewed-on: https://code.wireshark.org/review/1542 Reviewed-by: Sean Onufer Stalley <sean.stalley@intel.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-05-06PDCP LTE: add identification of ZUC based security algorithmsPascal Quantin2-1/+3
Change-Id: I63a66bc5822ac04f1a2bccd3a15adac30b65e397 Reviewed-on: https://code.wireshark.org/review/1541 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-06Don't pass the address of a pointer to a *_string to VALS() or RVALS().Jeff Morriss1-8/+8
This is a followup to Ifc8d6895cc33ad1f00386a3e59926322bd501125; the MQ sample captures I have don't seg-fault on this but the code was stillw wrong. Change-Id: Ic689c06836b823a15217281d67b33580fd8e9823 Reviewed-on: https://code.wireshark.org/review/1539 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-06Tweak ber_choice flow control.Evan Huus1-2/+2
There appear to be a couple of bugs in the flow control of this function (which is very confusing), at least one of which is leading to a buffer overrun. See the bug comments for more details and guesses of what the correct thing to do is. Bug:9579 Change-Id: Ibd3077792c7689a715ea53e8bf8c7a561c67389f Reviewed-on: https://code.wireshark.org/review/1530 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-06fix dissect_usb_endpoint_descriptorSean O. Stalley2-2/+2
dissect_usb_endpoint_descriptor uses usb_trans_info, but the signature contains a _U_ macro. Change-Id: I87fe6d91d5f8cf15926bf2dfd6381a256cd0785d Reviewed-on: https://code.wireshark.org/review/1537 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-06VALS() doesn't take the address of a (pointer to a) value_string, it takesJeff Morriss1-7/+7
a pointer to a value_string. Fixes the fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10079 Bug: 10079 Change-Id: Ifc8d6895cc33ad1f00386a3e59926322bd501125 Reviewed-on: https://code.wireshark.org/review/1538 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-06Added check for MAUSB length being multiple of a DWORD.Sean O. Stalley1-0/+8
MAUSB Packets should always be sent in DWORDs. This means that the only valid values for the length field are multiples of 4. This patch adds an expert info check to flag length fields that are multiples of 4. Change-Id: Ifb793f82aed4c9fb09a12f6ea97087733b58d14a Reviewed-on: https://code.wireshark.org/review/1536 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-06Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-2/+0
Change-Id: Ib4bbf1fa048cde14baf10bd31342b3c75e10b544 Reviewed-on: https://code.wireshark.org/review/1534 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-06Update kafka dissector closer to latest specEvan Huus1-17/+8
Some new error values, some message types that have been "undocumented" as internal-only, etc. Change-Id: Iff15dd67b188c9e2745964d4916b22e0bea4243d Reviewed-on: https://code.wireshark.org/review/1533 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-06Fix macro parens to avoid unexpected behaviourEvan Huus1-2/+2
Based on Icfe1e5477043dd695fd9b02b677ef29ac3fa8866 but rebased and simplified. Change-Id: I9b7266e2fdcb58f38115250d785637cd585c69e0 Reviewed-on: https://code.wireshark.org/review/1532 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-06Enhance Microsoft NLB dissectionAlexis La Goutte2-67/+529
Rewrite from Microsoft Network Monitor dissector Based from NPL dissector https://nmparsers.codeplex.com/SourceControl/latest#Develop_Branch/NPL/Windows/nlb.npl No yet support type Reliable Protocol (no found pcap with this pcap) Change-Id: Ic5aa68798a629f9e0ad15337b192a1fe180ae62c Reviewed-on: https://code.wireshark.org/review/1464 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-06Minor changes to LBM dissectors:David Ameiss2-31/+31
(1) Display sequence numbers in both decimal and hex (2) Fix an inconsistency in field naming between LBT-RU and LBT-RM. bug:9718 Change-Id: I967062d6aa00ea9a3db51db94e56d37e68e642d3 Reviewed-on: https://code.wireshark.org/review/1531 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-06sigcomp: Add buffer check to STATE-ACCESSPeter Wu2-8/+28
Two conditions were not checked, state_length == 0 && state_begin != 0 and the boundaries of the state buffer. The former is not a big deal, but the second issue causes a buffer overrun (detected by ASAN). The buffer size is supposed to be stored in the state buffer, that was not the case for the initial two SIP SDP and Presence state buffers. Fix a typo for presence_buf zero-ing while at it. Bug: 9601 Change-Id: I41dde83185da60b670cca010ecc7b2a2aaaedeb9 Reviewed-on: https://code.wireshark.org/review/1529 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-06Fix build failures caused by lldp cleanupAnish Bhatt1-51/+2
Change-Id: I4d4aeb71720f02e4a6f4a8e5f803fd63dc7aed81 Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/1524 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-06Add a cast to make MSVC happy.AndersBroman1-1/+1
Change-Id: Iee901ae56c796007821c1754056c61954e8a342f Reviewed-on: https://code.wireshark.org/review/1526 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-06Try to fixAndersBroman1-2/+2
packet-mysql.c(1446) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data Change-Id: Ie0b2e916e0d15287f5a3ededc404b678b45600d8 Reviewed-on: https://code.wireshark.org/review/1525 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-06MySQL protocol dissector: Add support for sessiontracking in MySQL 5.7.4. ↵Jess Balint1-16/+203
Bug 9948. Change-Id: Ia451bfff571c4da280ccf76b1d5ac9dfcfead78c Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-on: https://code.wireshark.org/review/916 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-06Move common part of col_append_fstr, col_append_sep_fstr to seperate fnction.Jakub Zawadzki1-51/+36
From the comments I think it was intended - but there were no G_VA_COPY macro in glib (?). Change-Id: Ic1e1d4a5ac9e5b8f27f25487416c0ededeed2093 Reviewed-on: https://code.wireshark.org/review/1518 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-06Cleanup LLDP dissection, convert add_text to tree items.Anish Bhatt1-17/+41
Just started on this, more changes incoming Change-Id: Idc88442f382cea1f29f05edb991b920488cfc113 Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/1502 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-06tcp: move & optimize printing tcp flags to seperate routine.Jakub Zawadzki1-27/+38
The formatting routine is quite simple so it can be replaced with g_stpcpy() and still keeping it clean. Change-Id: Ifbab1dc1140ee271d39bbbfb7586cfda6ded5c54 Reviewed-on: https://code.wireshark.org/review/1517 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-06Increase the work used to time wmem allocatorsEvan Huus1-1/+7
It appears that on some platforms the timer underlying g_test_timer() is relatively low-precision, so the small amount of work that we were previously doing was not enough for the timer to provide a useful value. Bumping the amount of work should provide more meaningful values, and the whole timing step still takes only a few seconds. Change-Id: Idce1386eaa33add845d9a2758b0beb72bbf370d6 Reviewed-on: https://code.wireshark.org/review/1523 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-05MAC/RLC/PDCP LTE: replace obsolete APIsPascal Quantin3-47/+47
Change-Id: I5368cc7b1986c6a87cb70a3fd3cb5e589d73f870 Reviewed-on: https://code.wireshark.org/review/1520 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-05-05Added parentheses to macros to prevent unexpected behaviorSean O. Stalley1-3/+3
Masks for padding now have an additional parenthesis to ensure proper operator precedence. Per the request of Evan Huus; See comment in Change-Id: I3ad4e1beb891f9c2835adff320095e7e738241eb, Patch Set 10. Change-Id: Ic8878f870b58cd272675b4d6c3658a029bb67984 Reviewed-on: https://code.wireshark.org/review/1519 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-05libnl is a Linux-specific library; don't offer libnl support except on Linux.Guy Harris1-1/+3
Change-Id: I79a98d1f9b3559fe76feed1038d673dd3424409c Reviewed-on: https://code.wireshark.org/review/1515 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-05Add RFC6463 (Runtime Local Mobility Anchor (LMA) Assignment SupportAlexis La Goutte1-4/+204
for Proxy Mobile IPv6) MIP6 Mobile Option Change-Id: I650cb33fcf083bd8826a702cb975295518012292 Reviewed-on: https://code.wireshark.org/review/1511 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 22:43:53 +0000