Commit Graph

3032 Commits

Author SHA1 Message Date
Evan Huus 83da877fff Add back initializers dropped in g9356d5c689fa
They were actually necessary.

Bug:10224
Change-Id: I9973bf7bab670d12e5b90bb2a57e99f9125d6a07
Reviewed-on: https://code.wireshark.org/review/2632
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-24 22:28:11 +00:00
Joerg Mayer 836feeb559 Remove unneeded sys/types.h
Change-Id: I03cd66cb9a2d01ea40308b338955756d08a36516
Reviewed-on: https://code.wireshark.org/review/2604
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-24 02:08:07 +00:00
Guy Harris 6896def6da Get rid of some unused variables.
Change-Id: I2a806af639e5f0519ba93b0048ec7a4624fa33fc
Reviewed-on: https://code.wireshark.org/review/2567
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22 21:49:26 +00:00
Michael Mann 9356d5c689 convert to proto_tree_add_subtree[_format] for ASN.1 dissectors
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-22 21:08:21 +00:00
Evan Huus ce99d8a205 Fix leak in nbap init function
Change-Id: I9a70d4da936ad5fd847fc1ba0b29b7220030b977
Reviewed-on: https://code.wireshark.org/review/2558
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-22 20:23:52 +00:00
Evan Huus 37b903d7ab batch of tvb-length conversions
Change-Id: I76ca4d075756e3ac691070e0c05344a410ea2498
Reviewed-on: https://code.wireshark.org/review/2507
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-21 04:01:52 +00:00
Guy Harris ce3d2ff3de Rename dissector_add_handle() to dissector_add_for_decode_as().
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-20 16:43:56 +00:00
Evan Huus 980f5f6711 batch of tvb-length conversions
Change-Id: I5e40df8af6841e3dad71c41d7e43c7971611b15f
Reviewed-on: https://code.wireshark.org/review/2473
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-20 05:33:04 +00:00
Evan Huus 15a0a63156 batch of manual tvb_length conversions
Change-Id: Ifea45514bdba8be5f62b9dc560027077297f631e
Reviewed-on: https://code.wireshark.org/review/2456
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19 19:56:32 +00:00
Evan Huus 5ed05dd747 batch of manual tvb_length conversions
Change-Id: Ib3a1ddc4342a7a8648d6ed8bfcb35aa229c56a27
Reviewed-on: https://code.wireshark.org/review/2445
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 19:55:31 +00:00
Pascal Quantin 0a3b1d8beb Kerberos: fix dissection of packets when Record Mark is present
Bug: 10200
Change-Id: Ied8db64120131c029e276d66aeff8b81a45a7286
Reviewed-on: https://code.wireshark.org/review/2447
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-19 19:44:15 +00:00
Pascal Quantin d0ac937567 Revert "Update ASN.1 source files with the API changes done in g021e7af"
This reverts commit e308e7c4de.

Change-Id: I079616d63f643f79f1bc03ef5fdf724f36df4071
Reviewed-on: https://code.wireshark.org/review/2435
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-19 18:42:28 +00:00
Pascal Quantin 248a503a97 Update ASN.1 source files with the API changes done in g971ffd6
Change-Id: Iac4952f64622cd28941f582adf54ecf7843f8c28
Reviewed-on: https://code.wireshark.org/review/2395
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 18:05:57 +00:00
Pascal Quantin cc37b50334 Get rid of obsolete references to nettle
Bug: 2089
Change-Id: Ie3337a1b750d8d95f6291c77dfd19cd1b0c57e83
Reviewed-on: https://code.wireshark.org/review/2388
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 18:03:43 +00:00
Pascal Quantin f2dd6c0a6d SABP: fix an error spotted by pre-commit hook
Change-Id: I733e2e72b52293b3c7c15f4e0c240f7e01f4b98c
Reviewed-on: https://code.wireshark.org/review/2386
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 16:15:58 +00:00
Pascal Quantin e308e7c4de Update ASN.1 source files with the API changes done in g021e7af
Change-Id: I52ecfccbce423206242e3cf99401a8c9e1655d88
Reviewed-on: https://code.wireshark.org/review/2385
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 16:15:42 +00:00
Evan Huus e047e3a007 Convert tcap dissector to wmem
As far as I can tell these calls were just missed in the first initial pass,
they're not in a weird scope.

Close review from somebody else please to verify that!

Change-Id: Ic3188879124dcb8fdf42e79d200d4f244200aa7b
Reviewed-on: https://code.wireshark.org/review/2266
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17 00:06:17 +00:00
Evan Huus de00c49bd8 Convert a bunch of time_to_str functions to wmem
Change-Id: I24fe3cc4a3589dadc4528a77fe7ff13d06b1a983
Reviewed-on: https://code.wireshark.org/review/2245
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-16 17:26:25 +00:00
Evan Huus 39d7c9df0a Remove emem in SNMP UAT, use glib instead
Change-Id: Ieea8c09d6a82285b0ba20f669c35394fbf195f50
Reviewed-on: https://code.wireshark.org/review/2241
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 15:38:31 +00:00
AndersBroman af687c581f Fix
Warn Dissector bug, protocol LPP, in packet 1: proto.c:3403:
 failed assertion "DISSECTOR_ASSERT_NOT_REACHED"
redifine FT of NavModel-GLONASS-ECEF/gloP1

Change-Id: Id865c39b8d15528417075f9e7ed0378704aa98dc
Reviewed-on: https://code.wireshark.org/review/2132
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-11 12:30:06 +00:00
Michael Mann 73217d9f3f tvb_new_subset -> tvb_new_subset_length when length parameters are equal.
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is.

Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d
Reviewed-on: https://code.wireshark.org/review/1999
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-07 15:41:07 +00:00
Richard Sharpe 09b5361302 This fix now allows SASL/GSS-API with integrity only to be properly dissected
in that we now properly indicate the checksum and provide the wrapped token to
the LDAP dissector to dissect.

There is still a problem in that the wrong parts of the SASL packet can be
indicated when users click on some parts.

I am committing it for review and because it is much better than the current
code.

Bug:9398
Change-Id: I552fc249db26835b79abfc8793438a95f221663a
Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
Reviewed-on: https://code.wireshark.org/review/1905
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-04 04:27:13 +00:00
Richard Sharpe 88a64b9e2b Improve the fix by removing code that miss dissects SPNEGO stuff ... as well
as remove redundant stuff from the spnego.cnf file.

Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
Change-Id: I90a962a39dc4da0f13055c9b3893c26044f1fc97
Reviewed-on: https://code.wireshark.org/review/1809
Reviewed-by: Tomáš Kukosa <tomas.kukosa@unify.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-29 01:19:00 +00:00
Richard Sharpe 0ed2672abf Try to fix the problems with the SPNEGO negTokenInit differences in Microsoft implementations
Change-Id: Ifbfca88469a6bc479072c921deba280e667c7087
Reviewed-on: https://code.wireshark.org/review/1804
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-29 01:15:26 +00:00
Bill Meier 40a21bc99c packet-kerberos.c: Use tfs_set_notset in hf[] entry instead of a local version.
Change-Id: I00a3ae7afb46eb50d7477c22cfa340c705cbb34a
Reviewed-on: https://code.wireshark.org/review/1851
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-28 21:47:48 +00:00
Bill Meier d817b27d6d Update m3ap.cnf to match packet-m3ap.c change done in commit b40cb1ad
Change-Id: Ib94647edcdba8c71439d37a48e213c8a475c351e
Reviewed-on: https://code.wireshark.org/review/1850
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-28 20:48:22 +00:00
Bill Meier e5705070c8 packet-klerberos.c: Use typedef (true_false_string) to properly define a true_false_string.
Change-Id: Ic89e5add39b8b0b2c3db254292f12ce6ae25b73c
Reviewed-on: https://code.wireshark.org/review/1844
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-28 15:30:12 +00:00
Alexis La Goutte 281616f09b Fix build on my old Windows XP Buildbot (With VS2008EE) (Try 2...)
../../asn1/atn-ulcs/packet-atn-ulcs-template.c(126) : fatal error C1083: Cannot
open include file: 'stdint.h': No such file or directory

Change-Id: Id3c3082fe91a79e44abbfd4e2b2f1fc7d5c183d4
Reviewed-on: https://code.wireshark.org/review/1814
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-27 11:46:53 +00:00
Evan Huus 08ce84ebbe Grab-bag of dead initializers and two actual bugs.
All caught by cppcheck. The two (semi)-interesting bugs are:
- in asn1/atn-cpdlc/packet-atn-cpdlc-template.c where the break statement should
  have been inside the brace, causing potential control-flow weirdness with
  exceptions
- in epan/dissectors/packet-ieee80211.c where the bounds check for tag_len did
  not match the expert info given

Change-Id: Ie173fb8d917aabb9b4571435d671d6f16e1c7569
Reviewed-on: https://code.wireshark.org/review/1793
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-25 18:12:00 +00:00
AndersBroman 2cfda31ff0 Change the signature of dissector_try_heuristic() to return hdtbl_entry
which can be used to call the found heuristic dissector on the next pass.

Introduce call_heur_dissector_direct() to be used to call a heuristic
dissector which accepted the frame on the first pass.

Change-Id: I524edd717b7d92b510bd60acfeea686d5f2b4582
Reviewed-on: https://code.wireshark.org/review/1697
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-21 20:17:29 +00:00
Guy Harris b8f0e8cf03 Eliminate some calls to tvb_get_ptr().
Change-Id: I1c5e10467d68ed7372dfaa9109b350238418ffc1
Reviewed-on: https://code.wireshark.org/review/1645
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-15 02:31:14 +00:00
Martin Mathieson d7befa8b26 Fix copy-and-paste error with cause value_strings, and change indentation to match generated code
Change-Id: I629f010f2430c5765c1adb41c57e6ea26d92b049
Reviewed-on: https://code.wireshark.org/review/1615
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-05-12 21:45:35 +00:00
Pascal Quantin 54be3eaaec TCAP: set a fence on info column after calling sub dissector
Bug: 10091
Change-Id: I7af57345e31209fb4dd02cdab7960c44c69dc0a5
Reviewed-on: https://code.wireshark.org/review/1555
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-08 10:50:59 +00:00
Pascal Quantin 4eaf1c82c5 MAC LTE: get extended BSR sizes configuration from RRC
Change-Id: I09afa7c17be5e0ed902a2c2f5ea9989df3380615
Reviewed-on: https://code.wireshark.org/review/1550
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-08 06:29:21 +00:00
AndersBroman 09a9c86473 Add the possibillity to add a string to the termination id.
Change-Id: I3b48b28273a8c1a1558045d2a4ab5104160840de
Reviewed-on: https://code.wireshark.org/review/1510
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-05 15:51:18 +00:00
Martin Mathieson 1ddce8bb4c Have RRC tell MAC about RAPID ranges so it can show for RAPIDs seen
Change-Id: Ie9adbe3015c63e53997068053b6f8ec224a5bf82
Reviewed-on: https://code.wireshark.org/review/1474
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-05-03 21:39:20 +00:00
Pascal Quantin b588511c9c T38: fix access to uninitialised variables
Bug: 10050
Change-Id: I7bc2d1b99bcb1241705a2561d9360a006fb9cb47
Reviewed-on: https://code.wireshark.org/review/1382
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-27 12:15:21 +00:00
Pascal Quantin 7acaf8552b Kerberos: ensure that private data elements are stored in separate variables
Bug: 10028

Change-Id: I599cd5475d19b64c0d5b9d31d7054a3befc84af2
Reviewed-on: https://code.wireshark.org/review/1348
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-04-25 14:23:37 +00:00
Pascal Quantin 853e391dfa Kerberos: use dissect_kerberos_ADDR_TYPE (removes an unused function warning)
Change-Id: I87d9c88d9db06c8f7dedd6e39152c39c13f8d32d
Reviewed-on: https://code.wireshark.org/review/1314
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-23 22:12:35 +00:00
Stig Bjørlykke 4eb4bae413 Add check for no kerberos keytab file.
Avoid printf warnings when loading a capture with kerberos packets
when not having configured a keytab file.

Change-Id: I0950daa18c42f4687d29101fac74f6f6bd6071b1
Reviewed-on: https://code.wireshark.org/review/1300
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-23 19:28:24 +00:00
Pascal Quantin abbcaabccc Kerberos: use auto generated code for ADDR-TYPE instead of a hand made value_string array
Change-Id: I74089fe609368fdd582aef1f2cb00a3905e0641b
Reviewed-on: https://code.wireshark.org/review/1301
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-23 15:22:02 +00:00
Pascal Quantin 11b78ffbfa Kerberos: put PDU dissection under Kerberos tree and remove duplicate PDU name
Change-Id: Id4824ad3a7bca1959579e5fd0a17a67c6bcda174
Reviewed-on: https://code.wireshark.org/review/1293
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-23 08:03:57 +00:00
Pascal Quantin 490a8a6148 Kerberos: define HostAddress/addr-type as a FT_UINT32 field
Fixes part of bug 10019

Change-Id: Id367d6c86533c840ea2ff40ef96b1c1854b96150
Reviewed-on: https://code.wireshark.org/review/1288
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-22 22:08:30 +00:00
AndersBroman 3b4a591f75 Update to latsest spec. number while we are at it(no change).
Change-Id: I5064bbbd1d4961cbff6202967cbd2ee66f7a2c0b
Reviewed-on: https://code.wireshark.org/review/1235
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-21 16:08:47 +00:00
Guy Harris 6c6aeb1841 Fix various white space issues and typoes and regenerate SABP dissector.
Change-Id: Ic036dcbb36b2f0e1eda46062867b762d150b78e0
Reviewed-on: https://code.wireshark.org/review/1232
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-21 00:48:40 +00:00
Stig Bjørlykke 1fb902f217 Use new BER functions in kpasswd.
Added RFC 3244 ChangePasswdData to the kerberos dissector.

This is the last dissector using the "old BER" functions.

Change-Id: I1d79047103c07c268d08e652745391f1ac37c82c
Reviewed-on: https://code.wireshark.org/review/1198
Reviewed-by: Tomáš Kukosa <tomas.kukosa@unify.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 21:42:51 +00:00
Alexis La Goutte d35f09761e Add kerberos-exp.cnf to asn1 gitignore
Change-Id: I48e225a6a68675afe6cacf57e5f3aa6b2eaaa407
Reviewed-on: https://code.wireshark.org/review/1201
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 21:40:05 +00:00
Alexis La Goutte be76ba5f0d Fix warning found by -Wunused-const-variable (Clang 3.5)
../../asn1/kerberos/packet-kerberos-template.c:1076:27: error: unused variable 'w2k_pac_types' [-Werror,-Wunused-const-variable]
../../asn1/kerberos/packet-kerberos-template.c:1089:27: error: unused variable 'krb5_princ_types' [-Werror,-Wunused-const-variable]
../../asn1/kerberos/packet-kerberos-template.c:1146:27: error: unused variable 'krb5_encryption_types' [-Werror,-Wunused-const-variable]
../../asn1/kerberos/packet-kerberos-template.c:1184:27: error: unused variable 'krb5_checksum_types' [-Werror,-Wunused-const-variable]
../../asn1/kerberos/packet-kerberos-template.c:1222:27: error: unused variable 'krb5_ad_types' [-Werror,-Wunused-const-variable]
../../asn1/kerberos/packet-kerberos-template.c:1239:27: error: unused variable 'krb5_transited_types' [-Werror,-Wunused-const-variable]
../../asn1/kerberos/packet-kerberos-template.c:1244:27: error: unused variable 'krb5_address_types' [-Werror,-Wunused-const-variable]
../../asn1/kerberos/kerberos.cnf:153:27: error: unused variable 'kerberos_Applications_vals' [-Werror,-Wunused-const-variable]

Change-Id: Ie842d236628efb46450f3e6c23b5590b2e622c25
Reviewed-on: https://code.wireshark.org/review/1199
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-04-18 20:12:51 +00:00
Alexis La Goutte acd640c861 Fix mix tab and space
Change-Id: Ife12c5118dcd70ba6b2540d53697f7c9cc9207c9
Reviewed-on: https://code.wireshark.org/review/1196
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-18 19:22:14 +00:00
AndersBroman dea68bf00f Switch to using the ASN1 based kerberos dissector.
Change-Id: Ib8945cdad149b71e3f79bd88032fd10f55ba556d
Reviewed-on: https://code.wireshark.org/review/1174
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-17 08:29:39 +00:00