Commit graph

3079 commits

Author SHA1 Message Date
Bill Meier
a379ac74d2 Fix spelling: cant-->can't, wont-->won't, etc
Change-Id: Ia6c3e7a25615bf8e052c3bacf096d76df775c9c2
Reviewed-on: https://code.wireshark.org/review/4126
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-16 15:31:58 +00:00
Martin Mathieson
64225639be Show RRC Release cause in the Info column
Change-Id: I138859ce735a9ff6541d6852dec29a13c1034c36
Reviewed-on: https://code.wireshark.org/review/4114
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-09-15 17:19:58 +00:00
Guy Harris
a41c1223cc Consistent white space.
Change-Id: I7c19a16a671db7b68ef2f680813a9a190ed1e13d
Reviewed-on: https://code.wireshark.org/review/4109
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-14 17:23:56 +00:00
Guy Harris
e74ae46002 Show BER identifiers and lengths in SNMP variable bindings.
If the user turns on the "show internal BER encapsulation tokens"
preference, show them the tokens inside SNMP variable bindings.

Change-Id: Ief9040f422cb214bbff8e4cfd45a2e05c7106480
Reviewed-on: https://code.wireshark.org/review/4105
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-14 09:57:41 +00:00
Guy Harris
21adbaa052 Don't use the captured length, and don't fetch the version until we need it.
The captured length reflects the way the capture was done; it should not
affect actual lengths used in the dissection.

Don't fetch the version until we need it; that lets us dissect more of
the packet if the previous change caused us to throw an exception trying
to fetch the version from the correct location rather than not throwing
an exception by fetching it from an incorrect location that happens to
be within the captured data.

Change-Id: I9f63afd4ef51f46c19b3afd2a651a5bb768fecaf
Reviewed-on: https://code.wireshark.org/review/4101
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-14 00:11:21 +00:00
Guy Harris
12778395d3 Clean up indentation.
Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156
Reviewed-on: https://code.wireshark.org/review/4100
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13 23:50:42 +00:00
AndersBroman
76d776ee8a Update to V12.2.0 (2014-06), remove deprecated APIs
Change-Id: Icfd140f39a440dda197c6e68a4cb7daec2ae0e09
Reviewed-on: https://code.wireshark.org/review/4066
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-10 17:06:58 +00:00
AndersBroman
4567134a56 Update to revission V12.2.0 (2014-06)
Remove soft deprecated APIs

Change-Id: I30adcb9f381c77142385c22fcc4a208169b0cf5e
Reviewed-on: https://code.wireshark.org/review/4062
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-10 15:56:05 +00:00
Bill Meier
93cc6f004f Fix some spelling & grammar.
Change-Id: Iedeaa411caa0823922dd79c27897a2349d4e6907
Reviewed-on: https://code.wireshark.org/review/4054
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-09 19:43:27 +00:00
Martin Mathieson
3f0483022b Try to fix build error by giving function a return type
Change-Id: I157b6309bc8cb0bef6fc0cd213fd4ec7e4c375ef
Reviewed-on: https://code.wireshark.org/review/4035
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-09-08 14:38:57 +00:00
Martin Mathieson
806981d156 Show band info for inter-freq entries in UE capabilities. Addresses Pascal's comments.
Change-Id: Ie60dc73e40a2ac1d80197fa712075ccff83cf797
Reviewed-on: https://code.wireshark.org/review/4032
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-09-08 14:12:28 +00:00
AndersBroman
07b003a98f Remove obsolete dissectors.
Change-Id: Icd480491670de9d8495a95861b18a8a5cb9724b4
Reviewed-on: https://code.wireshark.org/review/4006
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-06 09:52:01 +00:00
AndersBroman
a11b7bfc34 Use a common hf for international E164 numbers (MSISDN).
Change-Id: Ie0103c04033d7bf69c92947b789ba4f5a300a74b
Reviewed-on: https://code.wireshark.org/review/3863
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-01 05:07:20 +00:00
Stig Bjørlykke
437b448095 Mark Trap-PDU as obsolete for SNMP versions > 1
Change-Id: I967a1547eb97619042b620bb3d803a29cce9ebe1
Reviewed-on: https://code.wireshark.org/review/3920
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-30 09:54:05 +00:00
Guy Harris
a8523d7df4 At least some compilers don't allow warning pragmas inside functions.
So wrap the entire function in USES_APPLE_DEPRECATED_API/USES_APPLE_RST.

Change-Id: I6ae3e8ecc40bc407e6f7156ccc5d9dd8c51d650d
Reviewed-on: https://code.wireshark.org/review/3885
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-27 22:06:39 +00:00
Guy Harris
c7ce0e0c22 Be more selective about turning off deprecation warnings.
Only turn them off in the vicinity of those nasty cross-platform APIs.

(This also checks in the generated Kerberos dissector, which we forgot
to do in the last checkin.)

Change-Id: I5dc9162ff64afe764e37866706590ed2ed965acb
Reviewed-on: https://code.wireshark.org/review/3882
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-27 21:49:02 +00:00
Guy Harris
d04ec412d6 Use FreeRADIUS's warning pragma controls to suppress Apple complaints.
Apple would really rather that you use their Shiny Happy Frameworks
rather than those crufty old cross-platform APIs.  We are a
cross-platform program, and will use platform-specific APIs only if
there's enough benefit to doing so - and, in this case, that means
"using the platform-specific APIs on OS X and the other APIs on other
platforms", so that's two code paths to maintain, so "enough benefit"
has to outweigh the issues with that.

Change-Id: I370ba469a6f5892143d72179d15c9fe22d664fdf
Reviewed-on: https://code.wireshark.org/review/3881
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-27 21:17:37 +00:00
Jeff Morriss
863b6646d6 Replace a couple of implementations of unpack_digits() with tvb_bcd_dig_to_wmem_packet_str().
Change-Id: Ic9e740345fb3a748f6df4f624441bb947bbd9429
Reviewed-on: https://code.wireshark.org/review/3797
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-22 20:24:47 +00:00
Jeff Morriss
a3d8f31ad0 Add a function to dissect an E.164 (MSISDN) number in UTF8 format and use it
in the Diameter dissector.

This new API adds a filter for the MSISDN as well as a subtree and filter for
the Country Code.

Change-Id: Ibcbf4b5f72178b7e4af63efa7496188d608a9de7
Reviewed-on: https://code.wireshark.org/review/3760
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-21 13:01:22 +00:00
AndersBroman
93da6170e3 Remove unused hf and deprecated API
Change-Id: I5196f2be4b15704517ff1dc8bfacc6f9b52ecd71
Reviewed-on: https://code.wireshark.org/review/3720
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 14:07:06 +00:00
AndersBroman
50413192e3 Use the E212 function to dissect IMSI correct the filter Id string in
E212.

Change-Id: I203502b39d4ef216282d305f90c930aca84241bf
Reviewed-on: https://code.wireshark.org/review/3718
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 13:46:00 +00:00
AndersBroman
1cdef1d98a Implement a common function to dissect IMSI and use it GSM MAP as a start.
- remove soft deprecated APIs and unused hf.

Change-Id: Id00c3dd35f3fc65f543bc29df6d35515c45fe7e1
Reviewed-on: https://code.wireshark.org/review/3715
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 12:27:29 +00:00
Alexis La Goutte
67682557e6 Kerberos : Fix indent (use tabs) and add modelines info
Change-Id: I7965332ee474d10c90dfb2ef63a66f610cd6fc71
Reviewed-on: https://code.wireshark.org/review/3655
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-18 00:56:56 +00:00
Alexis La Goutte
fc752f7047 Fix warning: no previous prototype for ... [-Wmissing-prototypes]
Change-Id: Ic3152356c51ebe554e2356a360df5b0c23d89d63
Reviewed-on: https://code.wireshark.org/review/3632
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16 11:38:23 +00:00
Alexis La Goutte
acf39ff724 SNMP : Continue to fix indent (use tab)
Change-Id: I6b92deb2dbf9b9c4be7fd75d6d788755524a7483
Reviewed-on: https://code.wireshark.org/review/3570
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-13 07:40:08 +00:00
Alexis La Goutte
38418210e3 SNMP: Remove some unused hf field
Change-Id: I33c89d07af6658569df3a9a094e2865e28ed0acb
Reviewed-on: https://code.wireshark.org/review/3569
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-13 07:38:09 +00:00
Alexis La Goutte
cb44442dfc SNMP: fix mixed indent (use tab)
Change-Id: I19fde26bf7d1d2b19fcb56573f6e0814d1a7b8ab
Reviewed-on: https://code.wireshark.org/review/3551
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-11 14:44:08 +00:00
Alexis La Goutte
4c131ced56 SNMP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I00d66ff57fd3ea1ede692c85b2ae0286c30557b7
Reviewed-on: https://code.wireshark.org/review/3550
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-11 14:43:32 +00:00
Alexis La Goutte
db7143d906 SNMP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ifd4fef4ff7cc5a3197a802e0da5851370ddcd715
Reviewed-on: https://code.wireshark.org/review/3549
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-11 14:42:20 +00:00
Pascal Quantin
6034a6005d CredSSP: update ASN.1 source file with the change done in gd2396d2
Change-Id: I87d0f212f485b9e28fa00101eec9e3c07bc57c67
Reviewed-on: https://code.wireshark.org/review/3528
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-10 08:45:53 +00:00
Pascal Quantin
2f0278c42b ULP: upgrade to approved version 2.0.2
Change-Id: Icf09e430a1732708ddd9e7abb49f7b1a6225afde
Reviewed-on: https://code.wireshark.org/review/3526
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-09 21:47:53 +00:00
Роман Донченко
dc748b1e7f Now that Python is mandatory on Windows, remove checks for it from nmakefiles
Change-Id: I2ca6abb372ec4bda0af1aa40089082533a61df3a
Reviewed-on: https://code.wireshark.org/review/3392
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-09 20:23:39 +00:00
Pascal Quantin
ddeac70a5a LTE RRC: fix dissection of CDMA System Time broken in gcd02af5
Also put back initial text indentation

Change-Id: I6fe207086018a806a258b1de2888ac0b9310aac6
Reviewed-on: https://code.wireshark.org/review/3524
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-09 16:26:44 +00:00
Michael Mann
cd02af56a1 Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors.
This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions.

Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree.

Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141
Reviewed-on: https://code.wireshark.org/review/3500
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-09 01:57:08 +00:00
Stig Bjørlykke
6fd6955a24 The -k flag has been removed from Makefile.common
Change-Id: Ib7399c4b5457c5810df3ce2160a56813785b11ec
Reviewed-on: https://code.wireshark.org/review/3498
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-08-08 09:21:37 +00:00
AndersBroman
892703f918 The heuristic for T.125 per is too week and we do not have a PER dissector
for T.125 so remove the test.
Remove unused hf entries.
Fixes bug 10350.

Change-Id: If28de7877388c669082f8c8a21dd63107d417fbf
Reviewed-on: https://code.wireshark.org/review/3458
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-06 13:36:44 +00:00
Joerg Mayer
f38c7d6bbd Copy over autofoo change: No more .h file.
Change-Id: I283ffccd0b3e1f10a9fbf85e033c5e07cd426bbe
Reviewed-on: https://code.wireshark.org/review/3305
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-31 21:59:03 +00:00
Guy Harris
7e2dc50891 Nobody uses packet-t125.h, so don't bother building it, and delete it.
Change-Id: I10f8889a64024114106cd8058525cb21c6078279
Reviewed-on: https://code.wireshark.org/review/3284
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31 07:53:08 +00:00
Joerg Mayer
54c55bbdf6 Add a missed -template.h file
Change-Id: I83f4680b3b258daf0fdad9f896be5f854b8dc3de
Reviewed-on: https://code.wireshark.org/review/3282
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-31 05:56:28 +00:00
Guy Harris
791d93a259 Add more files to the distribution.
If it's checked into asn1 or a subdirectory thereof, put it into the
distribution.  (If it's not useful, why is it in Git?)

Change-Id: I4dac8a0d19a770db1513729cf71069a37f1d83fc
Reviewed-on: https://code.wireshark.org/review/3276
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31 04:31:10 +00:00
Guy Harris
4d90d6e38d Add some files under asn1 to the distribution.
Include CMakeLists.txt files and the gnm subdirectory, along with the
top-level Makefile.inc and Makefile.preinc files.  Don't explicitly
include Custom.make, as automake does that automatically given that it's
included by asn1/Makefile.am.

Add some files to EXTRA_DIST lists.

Move some .asn files to EXTRA_DIST; they don't need to be in SRC_FILES,
as SRC_FILES always includes EXTRA_DIST, and they *do* need to be in
EXTRA_DIST so that they're in the distribution.

Change-Id: Id91df577260fa57028d40fe098be1d79c59398e6
Reviewed-on: https://code.wireshark.org/review/3273
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-30 23:42:55 +00:00
Bill Meier
9ed99d5c4e Strip some trailing whitespace; Fix some indentation; Add editor-modelines as needed.
Change-Id: I943153e28f468070d86535abad7be032e1386118
Reviewed-on: https://code.wireshark.org/review/2994
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-11 03:20:54 +00:00
Pascal Quantin
cfee2019c6 LTE RRC: upgrade dissector to v11.8.0
Change-Id: I2bb0861029d0d30ae372b0b8085fbedeb4932217
Reviewed-on: https://code.wireshark.org/review/2949
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-08 22:06:46 +00:00
Pascal Quantin
ac52c06038 RRC: fix ASN.1 description by manually adding CR5591
Without it, dual-band DF-3C feature does not work

Change-Id: I95d4a7320b77c6093f5d51efdbb2b21af0deab11
Reviewed-on: https://code.wireshark.org/review/2942
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-08 15:17:17 +00:00
Pascal Quantin
55ce1bc6a6 Upgrade LPP dissector to v11.5.0
Change-Id: I8c51cebec5b234b9d0667aaf3f70b0a48bb842f6
Reviewed-on: https://code.wireshark.org/review/2933
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-08 06:30:33 +00:00
Peter Wu
f2b4daf400 Add printf-format annotations, fix garbage
The WRETH dissector showed up some garbage in the column display. Upon
further inspection, it turns out that the format string had a trailing
percent sign which caused (unsigned)-1 to be returned by
g_printf_string_upper_bound (in emem_strdup_vprintf). Then ep_alloc is
called with (unsigned)-1 + 1 = 0 memory, no wonder that garbage shows
up. ASAN could not even catch this error because EP is in charge of
this.

So, start adding G_GNUC_PRINTF annotations in each header that uses
the "fmt" or "format" paramters (grepped + awk). This revealed some
other errors. The NCP2222 dissector was missing a format string (not
a security vuln though).

Many dissectors used val_to_str with a constant (but empty) string,
these have been replaced by val_to_str_const. ASN.1 dissectors
were regenerated for this.

Minor: the mate plugin used "%X" instead of "%p" for a pointer type.

The ncp2222 dissector and wimax plugin gained modelines.

Change-Id: I7f3f6a3136116f9b251719830a39a7b21646f622
Reviewed-on: https://code.wireshark.org/review/2881
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-06 23:00:40 +00:00
Pascal Quantin
e39e44df24 GSM MAP: ensure that p2p_dir is always initialized before calling GSM SMS dissector
Bug: 10234
Change-Id: Ie340b849015febe46f91836440d44d4cfde005a4
Reviewed-on: https://code.wireshark.org/review/2695
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-29 17:56:35 +00:00
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