aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2014-06-24OSPF Cleanup. Remove unnecessary TFS declarationsAnish Bhatt1-248/+84
Change-Id: I9b4205f6d579ea9e707d83baf81f77393e3098b4 Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/2478 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-24Ensure proto_item from subtree is initializedMichael Mann1-0/+4
bug:10223 Change-Id: I40ed92bcf436723ad3927a93181f7c732cf4690f Reviewed-on: https://code.wireshark.org/review/2623 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-24MBIM: add an option to force SMS PDU decoding format if ↵Pascal Quantin1-4/+26
MBIM_DEVICE_CAPS_INFO message was not captured Change-Id: Iff78a00b463a7a33e1705c76ea49618af532f3aa Reviewed-on: https://code.wireshark.org/review/2621 Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-24proto_tree_add_uint() takes a value, not an encoding, as an argument.Guy Harris1-1/+1
Change-Id: Ie2c0523e32b54cd13506501d98215934a8d1304e Reviewed-on: https://code.wireshark.org/review/2611 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24usb iso urbs on linux can't possibly contain a setup packetMartin Kaiser1-68/+55
see mon_bin_event() in the linux kernel where the setup_flag is set only for control urbs clean up various things related to this assertion: remove type_2 parameter show the iso descriptors in any case calculate the end offset correctly, the end offset is the byte after the iso data Change-Id: Iebfbe6443c224a958a1697563aa8fb853d7aa8c2 Reviewed-on: https://code.wireshark.org/review/2541 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-24Remove unneeded include <sys/stat.h>Joerg Mayer2-4/+0
Change-Id: I3be8f29d2b4fba2cb1d7ee2f29bdb27e42dd40a5 Reviewed-on: https://code.wireshark.org/review/2607 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-24Remove unneeded sys/types.hJoerg Mayer2-13/+6
Change-Id: I03cd66cb9a2d01ea40308b338955756d08a36516 Reviewed-on: https://code.wireshark.org/review/2604 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-24Restore correct tree assignment.Michael Mann1-1/+1
Change-Id: Id06bd486114a80fb899f8dc148d48928e99e775e Reviewed-on: https://code.wireshark.org/review/2602 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-23ssl: fix ClientKeyExchange, fix TLSv1.2 SKE for DHPeter Wu4-1393/+570
Since DTLS and TLS do not differ in handling ClientKeyExchange and ServerKeyExchange, its dissection got moved to ssl-utils. The code is based on the SSL dissector, with header field names adjusted to the DTLS ones (those got capitalized). Besides a version difference (for signatures), the header field and function names, the DTLS and SSL code are equal (this is verified). This patch refactors the dissectors for DHE_RSA and ECDHE to make use of a common function to dissect the signed_params field. All offset tracking is also removed in favor of exception handling by the proto_tree_add_item function. Occurrences of proto_tree_add_uint are also replaced by proto_tree_add_item for simplicity. After those changes, the SKE dissector for DH key exchanges is updated to handle the mandatory signature field in TLSv1.2, using the newly added function. (bug 9208) Another bug occurred after the length check removal, pre-TLS and OpenSSL's old DTLS implemenation do not include a vector length in the CKE. This is now also fixed. (bug 10222) Other minor changes: comments added/corrected, renamed keyex_dh -> keyex_dhe (includes DHE_RSA and DHE_DSS). Bug: 9208 Bug: 10222 Change-Id: I76e835d56a65c91facce46840d79c1c48ce8d5dd Reviewed-on: https://code.wireshark.org/review/2542 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-23Remove some unneeded includesJoerg Mayer1-8/+0
Change-Id: I4327ead0451244daa0d876ae3a770cbbf80760c8 Reviewed-on: https://code.wireshark.org/review/2590 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-23Have individual programs get libpcap and libz version info.Guy Harris1-2/+2
That way, the code that constructs the runtime version string doesn't itself have to call libpcap and libz, and could be usable in programs that don't call them. While we're at it, add "with" to the run-time version information for GnuTLS and libgcrypt, to match the compile-time version information, and add the version information from libwireshark to TShark. Change-Id: I3726a027d032270b032292da9314c1cec535dcd2 Reviewed-on: https://code.wireshark.org/review/2587 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-23Initialize whole buffer in GPRS Mobility and Session Management dissectorPascal Quantin1-1/+1
Bug: 10216 Change-Id: I572a7a6ce0f816063f02397b667dd46c990cf73e Reviewed-on: https://code.wireshark.org/review/2583 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-23[WIP] qt: Add support for Polish languageMichal Labedzki1-0/+1
Change-Id: Ib63937e741b737f171a9b383a9cbabb55dfdd8ef Reviewed-on: https://code.wireshark.org/review/2553 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-23Replace AF_ values by COMMON_AF_ values.Joerg Mayer1-16/+5
Remove no longer needed system includes Change-Id: Id9ffffaa7da5185041db63fa7611d348a1cc4b68 Reviewed-on: https://code.wireshark.org/review/2577 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-23Add all AF_ types for Windows that are in WinSock.h or WinSock2.hJoerg Mayer1-1/+27
Change-Id: Ia45f4aaea75d8cb08bb9016f9147f47db4434b06 Reviewed-on: https://code.wireshark.org/review/2576 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-23Revert "Optimize sip_is_known_sip_header()"Evan Huus6-788/+294
This reverts commit c9a5fbeb1da9b5566ac9ac36bfdcdee6172ef5c8. Change-Id: Ic2e5d531f719ed1107ef7bb1de12175d4601fd6d Reviewed-on: https://code.wireshark.org/review/2574 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-23Revert "Cheat and try to fix the generated file manually."Evan Huus1-25/+5
This reverts commit 9079e3ad1d32c594309a52ccef5936d11a93a55d. Change-Id: I0430408e139ff8de068c970d02e36122552614fe Reviewed-on: https://code.wireshark.org/review/2575 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-23Cheat and try to fix the generated file manually.AndersBroman1-5/+25
Change-Id: Iabf1821aa0ef676ac4d1d7f2983460b2e671a98a Reviewed-on: https://code.wireshark.org/review/2573 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-23Optimize sip_is_known_sip_header()Jakub Zawadzki6-294/+788
Profling SIP shows that gperf generated hashing code, is 3 times faster than using GHashTable & g_str_hash/_equal() This result in about 1% improve of whole dissection (sip traffic with filter). Change-Id: Id6bf64bacd872e2d1c30a1b6356db444b25ba326 Reviewed-on: https://code.wireshark.org/review/2116 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-23Fix a typo.AndersBroman1-1/+1
Change-Id: I6874a6f4a340c2b8e82d1ca5333cbeb31ff27f2d Reviewed-on: https://code.wireshark.org/review/2570 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-23Add col_append_lstr(), speedup column generation for TCP.Jakub Zawadzki3-5/+63
When dissecting with columns TCP dissector spends around 1/4 time in col_append_fstr(), add col_append_lstr() and do formatting by ourselves. Change-Id: If90bc26242761884b4991e8db0db62c8f9e32690 Reviewed-on: https://code.wireshark.org/review/2527 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-22Get rid of set-but-not-used variable.Guy Harris1-2/+1
Change-Id: Ic0f2c79b4bd9fc737bf33ef64512f4142d74de6b Reviewed-on: https://code.wireshark.org/review/2568 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22Get rid of some unused variables.Guy Harris3-5/+2
Change-Id: I2a806af639e5f0519ba93b0048ec7a4624fa33fc Reviewed-on: https://code.wireshark.org/review/2567 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22Make dissect_lltd() a new-style dissector and register it as such.Guy Harris1-14/+14
Presumably that was the intent. Change-Id: Icf8529a23a9a36e7f12e446d67f3867771b221d8 Reviewed-on: https://code.wireshark.org/review/2566 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22convert to proto_tree_add_subtree[_format] for ASN.1 dissectorsMichael Mann26-556/+401
Change-Id: I753ca95e2e1b38bad2c09955317e648c525e40ef Reviewed-on: https://code.wireshark.org/review/2509 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-22LLTD dissectorMichael Mann3-0/+993
bug: 6071 Change-Id: If7b544a762df10ffc13aeaf8886cf74a1757c37c Reviewed-on: https://code.wireshark.org/review/2512 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-22convert to proto_tree_add_subtree[_format]Michael Mann34-956/+604
Change-Id: Ib60ca75b7da8cfa21cfe2999c9b9448a02c332df Reviewed-on: https://code.wireshark.org/review/2560 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-22Initialize whole buffer in GTP dissectorEvan Huus1-1/+1
Bug:10216 Change-Id: Ib7de616d50937eb43b16daa4067ee0de9edc8ec7 Reviewed-on: https://code.wireshark.org/review/2562 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-22Fix leak in nbap init functionEvan Huus1-2/+2
Change-Id: I9a70d4da936ad5fd847fc1ba0b29b7220030b977 Reviewed-on: https://code.wireshark.org/review/2558 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-22Fix a leak in the SCTP dissectorEvan Huus1-29/+44
use wmem instead of glib Change-Id: I326d2dd71b13ae45b4434c86fdacf9f3cec6c069 Reviewed-on: https://code.wireshark.org/review/2557 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-22Logcat: Set data-text-lines dissectors for logMichal Labedzki1-2/+12
Some binary logcat packets has more then one line, show them in a convenient form. Change-Id: I008aac6fe5589f2b10db51f7221853f9d79bbc7a Reviewed-on: https://code.wireshark.org/review/2549 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-06-22Bluetooth: A2DP: Fix fuzz failtureMichal Labedzki1-6/+19
Fix invalid structure casting by using defaults values, this also fix DecodeAs for A2DP. Do the same for VDP. Change-Id: I360787af648ed65205eb54732ab6d88f8532cf15 Reviewed-on: https://code.wireshark.org/review/2551 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-06-22Bluetooth: Complete sessionsMichal Labedzki9-33/+199
Some interfaces support multiple Bluetooth adapters with events like add/remove. We must support that to distinquish adapters streams in case that new adapter has the same id that old one. Next one is create session for "Connection Handle", so next layer will now when it is connected and disconnected. This is also used to distinguish streams. Change-Id: I9e062c8e4cc9c033b75f1a596e8351a215169843 Reviewed-on: https://code.wireshark.org/review/2548 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-06-22When setting entry_tree, set entry_item as well.Guy Harris1-2/+2
Hopefully, this will fix the warnings from the buildbot that entry_item was used without being set. Change-Id: Ibfd921bfbbad68cd8eafd1e3ad3d178cfca03d6e Reviewed-on: https://code.wireshark.org/review/2547 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22[Automatic manuf, services and enterprise-numbers update for 2014-06-22]Gerald Combs2-12/+187
Change-Id: Idb1ac02fe97a2d6b3603467d482a9a9040843704 Reviewed-on: https://code.wireshark.org/review/2543 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-22convert to proto_tree_add_subtree[_format]Michael Mann11-235/+140
Change-Id: I358bfaa4e5d40cd01b766f614f8bd0dbaf611dd0 Reviewed-on: https://code.wireshark.org/review/2508 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-22minor cleanupsMartin Kaiser1-12/+5
Change-Id: Ieaa0fa5cdbe8dc8f50cf5b9ee432c786a8f9fc9a Reviewed-on: https://code.wireshark.org/review/2540 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-22the tree that we use in the iso transfer function in is the urb_treeMartin Kaiser1-8/+6
Change-Id: Ia32c2f24df9392d1102fa1121ac93b1071bae7ca Reviewed-on: https://code.wireshark.org/review/2538 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-22no need to check the parent tree when we create the iso descriptor treeMartin Kaiser1-12/+11
Change-Id: I6cbc5047b8d58ecbe41bf5392d31dc0adc81d5d5 Reviewed-on: https://code.wireshark.org/review/2537 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-22rename the ti variableMartin Kaiser1-4/+4
Change-Id: Iec3bdfcb3cb14e97045789aec1e11288357d379d Reviewed-on: https://code.wireshark.org/review/2536 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-22create the iso descriptor tree's title in a simpler wayMartin Kaiser1-8/+4
Change-Id: I4e60295208c2ac35a452f5fb3dffd090cc151473 Reviewed-on: https://code.wireshark.org/review/2535 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-22create a new function that dissects the usb linux iso transferMartin Kaiser1-102/+118
(just copied the existing code) Change-Id: Ia6dd9be9b39c3c16408e22181225c18d56ac6016 Reviewed-on: https://code.wireshark.org/review/2534 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-22Add a routine to return a version string including VCS information.Guy Harris1-1/+1
Add a routine get_ws_vcs_version_info() that, for builds from a tree checked out from Wireshark's version control system, returns a string that includes both the Wireshark version number and an indication of what particular VCS version was checked out, and just returns Wireshark's version number for other builds. Use that routine rather than manually gluing VERSION and the Git version number together. ("vcs", not "git", just in case we do something bizarre or mercurial some day. :-)) Change-Id: Ie5c6dc83b9d3f56655eaef30fec3ec9916b6320d Reviewed-on: https://code.wireshark.org/review/2529 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Check constraints for OSPFv2 LSAs:Anish Bhatt1-7/+41
1 Router LSA: >= 24 bytes (>= 0 link descriptor(s) required) 2 Network LSA: >= 28 bytes (>= 1 router-ID(s) required) 3 Summary LSA: >= 28 bytes (>= 1 TOS metric block(s) required) 4 Summary LSA: >= 28 bytes (>= 1 TOS metric block(s) required) 5 AS-External LSA: >= 36 bytes (>= 1 TOS forwarding block(s) required) 7 NSSA LSA: >= 36 bytes (>= 1 TOS forwarding block(s) required) 9 Opaque Link LSA: >= 20 bytes 10 Opaque Area LSA: >= 20 bytes 11 Opaque AS LSA: >= 20 bytes as described in Bug 6302 for all other types including unknown, check for minimum length of 20 Change-Id: I93451d99a93213b4ded8157cecd54b0a6221d351 Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/2292 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-21batch of tvb-length conversionsEvan Huus25-155/+152
Change-Id: I76ca4d075756e3ac691070e0c05344a410ea2498 Reviewed-on: https://code.wireshark.org/review/2507 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-20Add .rc files to the sources to have them included in the buildJoerg Mayer1-0/+1
Change-Id: I84dda519e617b24d92fcf374670a4a6ee6f488ee Reviewed-on: https://code.wireshark.org/review/2506 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-20TCP: update the list of options and put Kind and Length items in the right ↵Pascal Quantin1-49/+98
subtree Bug: 10211 Change-Id: Ide37f2a2b33f0d6d7cdff897eed02a8c1ea24f7d Reviewed-on: https://code.wireshark.org/review/2488 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-20Revert part of svn revision 52045 (git b38ee917)Stig Bjørlykke2-79/+128
This fix does change the format printed for values using bitmasks (because the bit values are printed first) and is not always wanted in this dissectors (because of readability). We should have a better way of doing what I want in this dissectors, so I'll have a look at this later. Change-Id: I2477aa6b1d0c42a7ad5848bba3cb74dce3bba1f0 Reviewed-on: https://code.wireshark.org/review/2485 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-06-20Rename dissector_add_handle() to dissector_add_for_decode_as().Guy Harris124-172/+178
Hopefully that name makes it clear what the routiner's purpose is, and will encourage people to use it rather than using dissector_add_uint() with a bogus integer value. Change-Id: Ic5be456d0ad40b176aab01712ab7b13aed5de2a8 Reviewed-on: https://code.wireshark.org/review/2483 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20remove duplicate offset=0Martin Kaiser1-2/+0
Change-Id: I6653b733dfd2c587909371e50fd0c2efc4649dcd Reviewed-on: https://code.wireshark.org/review/2482 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>