aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2015-07-02Have RPC dissector use real dissector tables for its subdissectors instead ↵Michael Mann35-154/+131
of a "homegrown" method. Change-Id: I06d7d4e9747ed8593cf40506cae3a09ae237846b Reviewed-on: https://code.wireshark.org/review/9456 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02Add support for a "custom" dissector table. This allows for a "custom" (not ↵Michael Mann2-0/+115
UINT or string) key to register dissector handles. This was designed for RPC dissectors, but probably has use elsewhere. Change-Id: I1bca6b50ba312129a0c4fad5cc3c18cd9297c217 Reviewed-on: https://code.wireshark.org/review/9455 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02Have RPC program hash table use native gtk hash functions.Michael Mann2-50/+18
Change-Id: Ie3c6daf69a1ac155ac09794a5ec87c89bbf0607d Reviewed-on: https://code.wireshark.org/review/9454 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02Replace RPC "dissect_function_t" function signature with "new style" ↵Michael Mann30-895/+1091
dissector function signature. This paves the way for using dissector tables. Change-Id: I88ac165ef9aa5bf5c05e1115f7321e18e734d683 Reviewed-on: https://code.wireshark.org/review/9453 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02Lemon: Update lemon toolsAlexis La Goutte4-4/+4
Update from SQLite trunk (19 April 2015) 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...) Fix lemon.c:3435: warning: implicit conversion shortens 64-bit value into a 32-bit value Add "new" version of lempar.c (3 November 2009). LEMPAR: fix trailing whitespace LEMPAR: fix -Wunused-parameter Change-Id: I2df7e39c9a6846de26743a981fb76aca423fe813 Reviewed-on: https://code.wireshark.org/review/6502 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02Revert "SMB2 - An out-of-order entry in smb2_ioctl_vals[] causes run-time ↵Alexis La Goutte1-5/+0
error." This reverts commit b591f07273f4e055a286ca36b6fda5da99952b5d. Change-Id: I73e7b6a8ea37b1d5869e785633b74c89d7476b54 Reviewed-on: https://code.wireshark.org/review/9457 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-07-02SMB2 - An out-of-order entry in smb2_ioctl_vals[] causes run-time error.cturney1-0/+5
In value string table "smb2_ioctl_vals[]" of packet-smb2.c {0x0011C017, "FSCTL_PIPE_TRANSCEIVE" } was placed before {0x00110018, "FSCTL_PIPE_WAIT"} which causes "Extended value string 'smb2_ioctl_vals[]' forced to fall back to linear search: entry , value 0x00110018 < previous entry, value 0x0011C017" Change-Id: I99afe5aa12c031e90bb0bd4c8e8aadfffad0135d Reviewed-on: https://code.wireshark.org/review/9449 Reviewed-by: Cal Turney <cturney@charter.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-07-02fixed spelling errors in Omron FINS packet dissectorPatrick1-3/+3
Change-Id: I7cce1769d3e3c2c70d18e247b1e1040b05715c20 Reviewed-on: https://code.wireshark.org/review/9448 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-01PMPROXY: avoid doing an invalid memory access when no token was foundPascal Quantin1-6/+7
Bug: 11320 Change-Id: Ie1fd3f1060e13cf742923aadebe375da4389422a Reviewed-on: https://code.wireshark.org/review/9447 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-01NAS EPS: upgrade dissector to v12.9.0Pascal Quantin1-3/+3
Change-Id: Ic1fa22dee21b71b523ba5fcfc1ea1bf4c8029e6f Reviewed-on: https://code.wireshark.org/review/9445 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-013GPP NAS: upgrade dissector to v12.10.0Pascal Quantin2-4/+34
Change-Id: Ia89e49d098f86450245c73c4d06a4359a25e3d53 Reviewed-on: https://code.wireshark.org/review/9444 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-01Sort smb2_ioctl_vals[] numerically.Guy Harris1-1/+1
Change-Id: I2d5fd1c640d3ac6fa60d84f2b8080eb7866b2641 Reviewed-on: https://code.wireshark.org/review/9443 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-01add WERR_INVALID_STATE & WERR_TIMEOUTGregor Beck1-0/+2
Change-Id: Ie42cca588c9d5e02279083817382ac77f4ed74d6 Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-on: https://code.wireshark.org/review/9439 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-01add function guid_cmp() to compare guidsGregor Beck2-0/+18
Change-Id: I6e34bcfb2205c1647e82dd396a13b0957532c4ae Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-on: https://code.wireshark.org/review/9438 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-01smb2: dissect FSCTL_PIPE_WAITGregor Beck1-0/+41
Change-Id: Iec4fe90d792f745d8c754afc9b18ca6f7a708caa Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-on: https://code.wireshark.org/review/9437 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-01proto.c : fix indentAlexis La Goutte1-1/+1
Change-Id: I74461666bcfc6e85a92409819e2c63811284e8f8 Reviewed-on: https://code.wireshark.org/review/9433 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-30Set the PHY value when providing our own metadata structure.Guy Harris1-0/+6
Bug: 11319 Change-Id: I8b746f7238729173b2ca23734e9f7fdbbe4f5110 Reviewed-on: https://code.wireshark.org/review/9232 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-30Use ws_fstat64() to determine the size of an open file.Guy Harris1-16/+19
fseek() to the end, followed by ftell(), is a bit of an odd way to get the file size. Use ws_fstat64() instead. Check that the file is a regular file, while we're at it. This means we don't have to check before opening. Bug: 11268 Change-Id: I31ee20dd5568d10541375cf97b286abfc1384d1c Reviewed-on: https://code.wireshark.org/review/9230 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-29ssl: test for file type before reading key filePeter Wu1-0/+7
ftell() is undefined for directories. In practice, it will report 0x7fffffffffffffff on an ext4 filesystem. Ensure that the given key file is not a directory. By the way, this is the only user of ftell that is affected. Bug: 11268 Change-Id: Iaecd42c9b60da9e7945703a794601773749f2d97 Reviewed-on: https://code.wireshark.org/review/9213 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-06-29Don't free col_item->col_data.Gerald Combs1-1/+1
It either points to col_item->col_buf (which we explicitly free) or to a static string. Change-Id: I4d6db3fa16e69a4321be9d01076026c024df9a00 Reviewed-on: https://code.wireshark.org/review/9219 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-29[GSM DTAP]: fix indent (use 4 spaces)Alexis La Goutte1-1/+1
Change-Id: I07fd87b4e72ac7309e320deab963017c96ba2c60 Reviewed-on: https://code.wireshark.org/review/9215 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-29[FIP] Use value_string_ext for fip_desc_types.AndersBroman1-2/+3
Change-Id: Ifb4ad35b2a9454366d58cc4bfc81f96630122565 Reviewed-on: https://code.wireshark.org/review/9216 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-29[GSM DTAP] Add Sequence number for Non call related SS messages.Anders1-1/+2
Change-Id: Iec97801e1eb6803c4168c2e302f84a7732654ecf Reviewed-on: https://code.wireshark.org/review/9214 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-29Take all epan_column_info members that always get allocated to "number of ↵Michael Mann4-256/+282
columns" to share their own data structure. Change-Id: Ib982662db6cf68730a7d121eac60d9bc5ae67429 Reviewed-on: https://code.wireshark.org/review/9195 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-28"Short preamble" is 802.11[bg]-only, so put it in the PHY-specifc info.Guy Harris3-44/+65
We're already only setting it for 11b and 11g; this makes it a bit cleaner, e.g. we don't need to say "oh, wait, we *don't* have short preamble" for 11n and 11ac. Change-Id: Idcf3e8c93d6a417f0319e4bd33247b98f07b6052 Reviewed-on: https://code.wireshark.org/review/9209 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-28If we don't know whether STBC is being used, we don't know NSTS.Guy Harris1-8/+13
If we don't know whether space-time block coding is being used, we don't know the number of space-time streams, so don't try to calculate it and don't put it into the protocol tree. Mark it as generated, while we're at it, as it's not a value from the radiotap header, and make it a guint. Change-Id: Ib0b14f2f4f94e042d034311e10bb96b9b29a9d3e Reviewed-on: https://code.wireshark.org/review/9206 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-28If we don't know whether STBC is being used, we don't know NSTS.Guy Harris1-8/+13
If we don't know whether space-time block coding is being used, we don't know the number of space-time streams, so don't try to calculate it and don't put it into the protocol tree. Change-Id: I7ffd1b0e79e45fee526305846aadca04eb135b11 Reviewed-on: https://code.wireshark.org/review/9205 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-28The two bits of NESS are numbers, not Booleans.Guy Harris1-4/+2
Found by Pascal Quantin. Change-Id: I843db0c1d28bcd4714799285da5e1ea8a81307a1 Reviewed-on: https://code.wireshark.org/review/9204 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-28We only have the short preamble flag if we have a Flags field.Guy Harris1-9/+32
Don't set PHDR_802_11_HAS_SHORT_PREAMBLE or phdr.short_preamble unless we have the flags bits from the Flags field. Discovered by Pascal Quantin by running valgrind on the capture from bug 11317. Change-Id: I7e91dea116f6cc977101b7b5e76067021f68a0bf Reviewed-on: https://code.wireshark.org/review/9203 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-28[Automatic update for 2015-06-28]Gerald Combs3-5/+141
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Idf976da88eab4126089b612084ce9d4a4643d80c Reviewed-on: https://code.wireshark.org/review/9201 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-28ISAKMP: consistently use two-space indentation (as per modelines). Also ↵Martin Mathieson1-1065/+1055
added one missing break Change-Id: I26f03b56765ffd69dab53988c8e35c7cf3f99f16 Reviewed-on: https://code.wireshark.org/review/9193 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-27Quick and dirty overflow checking.Guy Harris1-4/+29
We really need a better way to handle packet offset overflows. Change-Id: I6e476f7bc6ddac2c5515c4e09192d88f528ea091 Reviewed-on: https://code.wireshark.org/review/9194 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-27ipsec: correct some format specifiersMartin Mathieson1-9/+9
Change-Id: I340ab6186d5d5d9c5d0fa301a1b1e5824932d547 Reviewed-on: https://code.wireshark.org/review/9192 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-06-27bacapp: cleanup and remove some add_textEvan Huus1-69/+71
Change-Id: I991269db9c2705a4ac41a576000a612aa6de2242 Reviewed-on: https://code.wireshark.org/review/9186 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-27Avoid some Visual Studio Code Anaylzer warningsMartin Mathieson2-3/+3
Change-Id: I320386b02bea09658636a9281ee3cbba34a5e4cd Reviewed-on: https://code.wireshark.org/review/9188 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-27Handle the VHT flavor of the HT Control field.Guy Harris1-57/+266
The low-order bit of the field indicates whether it's the HT or VHT version. Show subfields as part of a 32-bit bitfield; few subfields begin and end on a byte boundary (the Link Adaptation Control field no longer does so; its low-order reserved bit became the VHT flag). Update references to the 11n spec. Update a comment. Change-Id: I9fcb99a5517afb319b67d4deb2355c7cb0be73b6 Reviewed-on: https://code.wireshark.org/review/9191 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-27(trivial) daap: remove if(tree) and return; at the end of a functionMartin Kaiser1-6/+3
Change-Id: I969efbaeda75d2790165a6cbc214f58f1bd0ba7f Reviewed-on: https://code.wireshark.org/review/9190 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-27Handle a "should not happen" case, to squelch compiler warnings.Guy Harris1-0/+4
Change-Id: Icb3497924c88963688d60a59c5873a271b7e4d21 Reviewed-on: https://code.wireshark.org/review/9187 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-27Use the PHY type in the radio information to recognize HT packets.Guy Harris2-34/+35
Rather than having a separate "802.11 HT" dissector, just look for the 802.11n (HT) PHY. (As a side-effect, This also causes PPI HT frames to have the radio information dissected by the wlan_radio dissector, as is the case with other 802.11 frames accompanied by radio information.) Change-Id: I854c42e19481a17767e64a3b92222b09dbaa02dd Reviewed-on: https://code.wireshark.org/review/9185 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-26RTP: create conversation when using heuristic dissectorPascal Quantin1-0/+24
This gives a chance to perform RTP reassembly when "Try to decode RTP outside of conversations" option is activated. Bug: 11310 Change-Id: Ic8bd9532a88a072c3cb1f1907cf7117b5072a954 Reviewed-on: https://code.wireshark.org/review/9175 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-26Those aren't booleans, they're counts of streams.Guy Harris1-2/+2
Change-Id: Id0520da614f239d3146f5c03ef1a930e8a0fcd94 Reviewed-on: https://code.wireshark.org/review/9184 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-26Clean up switch statement whitespace.Guy Harris1-32/+37
(Try to keep the same indentation style within a single switch statement, at least.) Change-Id: I5b349fd90881d1a1d2be377a291bfceda56476aa Reviewed-on: https://code.wireshark.org/review/9180 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-26Squelch a compiler warning.Guy Harris1-1/+1
It's a bogus warning, but not all compilers do enough dataflow analysis to figure that out. Change-Id: Iebc1fffab87e83b16210003b60aae2333e0b5ec9 Reviewed-on: https://code.wireshark.org/review/9179 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-26Use "Present"/"Absent" for VHT presence flags.Guy Harris1-9/+9
Change-Id: I1571cf52d240c5d32dd8db0af2f18b91cc6e6d34 Reviewed-on: https://code.wireshark.org/review/9178 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-26wmem: permit lookups in NULL trees (oops)Evan Huus1-1/+7
Change-Id: I222b95b48b7ac8debbd717b32dd471742222c16b Reviewed-on: https://code.wireshark.org/review/9177 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-26wmem: convert string trees to single-layerEvan Huus1-78/+92
The whole radix tree thing is kind of neat (and may even be more performant for short strings?) but it's really confusing to reason about and is terribly inefficient for long strings. Ping-Bug: 9078 Change-Id: I1bd333918a6e557801e82f4553d386120138065e Reviewed-on: https://code.wireshark.org/review/9165 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-26Fix handling of 11ac radio metadata.Guy Harris4-107/+371
Add more fields to the metadata to handle everything radiotap has, and show them. Call the FEC type field just "FEC", and have it be an integer field with 0 meaning BCC and 1 meaning LDPC, rather than a Boolean. 11ac doesn't have *an* MCS, it can have up to 4, one per user. Label the 11ac bandwidth values the same way we do in the radiotap dissector. Change-Id: I2c2415baff3e5d68d49dda497980e8271d26b1f6 Reviewed-on: https://code.wireshark.org/review/9176 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-26Added option in h245 preferences to print h245 messages content Michal Pazdera1-117/+105
into Information column in typical fashion (append) instead of just in reversed order (prepand) Change-Id: Id78c307fc6d34a378ac7b9335ac1e578837b08a6 Reviewed-on: https://code.wireshark.org/review/9170 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-26PTP: just return, don't throw an exceptionMartin Kaiser1-1/+1
Change-Id: Icaca74f7d5038b4e2e232fb499933219b322e02d Reviewed-on: https://code.wireshark.org/review/9159 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-26epl: Set Payload to remaining bytesRoland Knall1-2/+21
The payload dissection now only includes the remaining bytes, even if the actual number of payload bytes should be bigger. An expert Info is added, to inform the user, that the trace was truncated, but the payload is still given to a sub-dissector, as it may contain valid information Change-Id: Iefef78e7c7aed7f87e40875f345ff5debf364f3a Reviewed-on: https://code.wireshark.org/review/9124 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-05 11:34:42 +0000