Commit graph

3242 commits

Author SHA1 Message Date
Michael Mann
a8ff1e2778 Create very basic "generic" stat tap API to create a "GUI" independent table.
A few sample tap/dissectors (ANSI/A, ANSI MAP) are also included to test the API.  The "GUI output" is a bit raw and could use some "prettying up", but all the basic hooks are there.

Telephony "stat grouping" needs to be better alphabetized to properly populate menu (on GTK, probably Qt)

Change-Id: I98514171f69c4ab3a304dccb26c71d629703c9ab
Reviewed-on: https://code.wireshark.org/review/9110
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-03 23:08:28 +00:00
Michal Pazdera
51d2eefc95 Added option in h245 preferences to print h245 messages content
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-26 17:42:02 +00:00
Pascal Quantin
29aecdf032 RRC: remove non ASCII characters from ASN.1 description
Change-Id: I7edb23651caa5ccf8e9989069803a8800e358670
Reviewed-on: https://code.wireshark.org/review/9172
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-26 15:50:36 +00:00
Pascal Quantin
a124424422 CredSSP: update template after the API change done in gcdc7d25
Change-Id: I548870ba423c7c3b714047f9f02c6cfb9a6a0661
Reviewed-on: https://code.wireshark.org/review/9156
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-25 21:30:57 +00:00
Martin Kaiser
585f944f65 acse: don't THROW() an exception from a dissector
we already have an expert info, we can simply exit

Change-Id: I8adbfb084991195152a02bbef64c38c5aa9e841e
Reviewed-on: https://code.wireshark.org/review/9113
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-25 01:02:24 +00:00
Alexis La Goutte
3f6af3b4a0 P1: fix 'dissect_p1_T_report_type' defined but not used [-Wunused-function]
Change-Id: Idee443cd35846bb197070cff5fb37e3904afb856
Reviewed-on: https://code.wireshark.org/review/8757
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-23 17:36:33 +00:00
Michael Mann
6fe3f2c693 Use RTD functionality for H.225
This got missed in the initial refactoring.

Change-Id: I98dcc0816e065efab9b497f753c8d2d388349ff3
Reviewed-on: https://code.wireshark.org/review/9044
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-23 13:08:57 +00:00
Martin Mathieson
61e127a8ca RANAP: call nsap properly when bindingID is included in transport address
Change-Id: I45fed890cc2f7f5d106bbb7b35038d8db141fa4e
Reviewed-on: https://code.wireshark.org/review/9036
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-06-23 04:52:08 +00:00
Alexis La Goutte
475a232a5b PKCS12: fix unused function 'dissect_AuthenticatedSafe_PDU' [-Wunused-function]
Change-Id: Iaaaaffc8a271ac844b745d1b9265eb06df2efe9c
Reviewed-on: https://code.wireshark.org/review/9003
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-22 17:01:52 +00:00
Vasil Velichckov
eb2dffa56c GSM MAP: Fix decoding of IPv6 addresses
From 3GPP 23.003

The GSN Address is composed of the following elements:
1) The Address Type, which is a fixed length code (of 2 bits) identifying the type of address that is used in the
Address field.
2) The Address Length, which is a fixed length code (of 6 bits) identifying the length of the Address field.
3) The Address, which is a variable length field which contains either an IPv4 address or an IPv6 address.
Address Type 0 and Address Length 4 are used when Address is an IPv4 address.
Address Type 1 and Address Length 16 are used when Address is an IPv6 address.
The IP v4 address structure is defined in RFC 791 [14].
The IP v6 address structure is defined in RFC 2373 [15].

Currently the Wireshark decodes IPv6 addresses as IPv4

This commit reverts parts of commit 1cdef1d98a

Change-Id: I4905d4cf559abcb42b9dfe3652667d2ff96dd444
Reviewed-on: https://code.wireshark.org/review/8984
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-22 06:00:14 +00:00
Alexis La Goutte
31f54593dc PKCS12: fix warning about unused parameter when don't build with LIBGCRYPT
Change-Id: I7cc47f811d6c090aa2be54d3d92361966d011ccd
Reviewed-on: https://code.wireshark.org/review/9002
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-21 22:43:16 +00:00
Michael Mann
6de6f7f0f8 Further refactor SRT stats.
Create "common" SRT tap data collection intended for all GUIs.   Refactor/merge functionality of existing dissectors that have SRT support (AFP, DCERPC, Diameter, FC, GTP, LDAP, NCP, RPC, SCIS, SMB, and SMB2) for both TShark and GTK.

SMB and DCERPC "tap packet filtering" were different between TShark and GTK, so I went with GTK filter logic.
CAMEL "tap packet filtering" was different between TShark and GTK, so GTK filtering logic was pushed to the dissector and the TShark tap was left alone.

Change-Id: I7d6eaad0673fe628ef337f9165d7ed94f4a5e1cc
Reviewed-on: https://code.wireshark.org/review/8894
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-21 03:35:13 +00:00
Bill Meier
d47a6865d9 [rtse] Convert tabs to spaces to match editor modelines
Change-Id: I03c7decacd4def0552f461c81c4e634a85380438
Reviewed-on: https://code.wireshark.org/review/8986
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-19 19:32:05 +00:00
Etienne Millon
a0b0f37a62 PKCS12: fix a duplicate OID
The value for OID 1.2.840.113549.1.12.1.6 was copy-pasted from the line above.
Its correct definition can be found in  RFC7292, whose relevant parts are in
pkcs12.asn.

Note that the capitalization is not consistent in the RFC (pbeWith/pbewith).
I used the same convention.

Change-Id: I702c2b698660a7ea8df043775d37cadfa6d3ca72
Reviewed-on: https://code.wireshark.org/review/8928
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-06-16 09:21:39 +00:00
Pascal Quantin
093aebf5ee H248: fix V712 warning reported by PVS-Studio
Be advised that compiler may delete this cycle or make it infinity. Use volatile variable(s) or synchronization primitives to avoid this.

Change-Id: I39104ec09f4c12994d62ed23e7a0cc00829b1255
Reviewed-on: https://code.wireshark.org/review/8818
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-07 18:59:49 +00:00
Alexis La Goutte
97255b3a7c P1: fix request for implicit conversion from 'gpointer' to 'struct p1_address_ctx_t *' not permitted in C++ [-Wc++-compat]
Change-Id: I43364dda21abe3281fbd15ad953232093bb1fffa
Reviewed-on: https://code.wireshark.org/review/8756
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-06-04 11:01:16 +00:00
Mikhail Koreshkov
db3c821084 Q955.3 MLPP Dissector
Added ASN.1 dissector for MLPP (Multi-Level Precedence and Preemption)
protocol Q955.3

Change-Id: Ic1c855dfbf1fb1295a43cfe3a5ad7087b5b89c12
Reviewed-on: https://code.wireshark.org/review/8689
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>
2015-05-30 11:08:00 +00:00
Jeff Morriss
e47c4d5775 NULL terminate the list of hfs given to proto_tree_add_bitmask*().
This fixes a number of recent fuzz failures.

Bug: 11195
Change-Id: Ifa6cc380fd3f610469d3c795e234e6986cfaf674
Reviewed-on: https://code.wireshark.org/review/8699
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-30 05:47:57 +00:00
Michael Mann
a25c46bc7b Remove proto_tree_add_text from some dissectors.
Change-Id: Id7ef95a56d9d8cc01f9a1a4556ad056b8bb7f8bc
Reviewed-on: https://code.wireshark.org/review/8654
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 15:20:46 +00:00
Graham Bloice
2fde6ffc8f Fix out of tree builds
Stop out of tree builds picking up the in-tree version and config.h

Change-Id: Icadc46cab66db72af2d475eac31b28d0ca10df90
Reviewed-on: https://code.wireshark.org/review/8204
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>
2015-05-25 10:42:59 +00:00
Stig Bjørlykke
a34d696377 p1: Fixed do_address for extension attributes
This is not an optimal solution, but fixes the reported problem.
The do_address functionality should probably be rewritten to
only use pinfo for storing data.

Bug: 11210
Ping-Bug: 8515
Change-Id: I2625cc4044ab93b6e943a3c2d2ffd1b26149da29
Reviewed-on: https://code.wireshark.org/review/8585
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22 16:11:45 +00:00
Stig Bjørlykke
f1ea2fae57 p1: Handle OrganizationalUnitName
Added back code removed in commit for bug 8515.

Bug: 11210
Change-Id: I23bf56f88d8a1320da8404a82a8d9d3aacc3dace
Reviewed-on: https://code.wireshark.org/review/8537
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-19 12:13:48 +00:00
Guy Harris
acf7985f73 Define the SHA-1 digest length in wsutil/sha1.h and use it.
Hopefully that'll make it a little easier to make sure that we're not
overflowing arrays.

Change-Id: I770df045ef9a45fd486c1271ea424b3334bb39d2
Reviewed-on: https://code.wireshark.org/review/8370
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-09 23:36:11 +00:00
Martin Mathieson
9f613e3305 RRC: add domain and release cause information to the INFO column.
Change-Id: If0bee7f283d6c4dd44618221d528fb55e30f510a
Reviewed-on: https://code.wireshark.org/review/8353
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-09 07:16:41 +00:00
Mark Cunningham
5d20b5880d kerberos encryption types (etype) additions + cleanup
source http://www.iana.org/assignments/kerberos-parameters/kerberos-parameters.xhtml and referenced RFCs

Change-Id: I898218c3ef75da21130f3f6c83848c0fca095acf
Reviewed-on: https://code.wireshark.org/review/8300
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-05-05 18:59:36 +00:00
Pascal Quantin
aa3870f54d C12.22: check c1222_baseoid_len before doing a memcpy
Should fix the following runtime error reported by Joerg:
../../asn1/c1222/packet-c1222-template.c:1427:3: runtime error: null pointer passed as argument 1, which is declared to never be null
../../asn1/c1222/packet-c1222-template.c:1427:3: runtime error: null pointer passed as argument 2, which is declared to never be null

Change-Id: I2f952815ed81e47b504e6479835a357b7656828e
Reviewed-on: https://code.wireshark.org/review/8251
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-01 07:59:20 +00:00
Guy Harris
b849726351 Fix some cases where we're shifting a signed 1 left.
Shift 1U instead, to make sure it's unsigned; the result of, for
example, the result of shifting a signed value left is undefined if the
value times 2^{shift count} doesn't fit in the *signed* type of the
shifted value.  That means, in particular, that the result of shifting 1
left by {number of bits in an int - 1} is undefined.  (In *practice*,
it'll probably be -2^32, with the bit you want set, but that's not
guaranteed, and GCC 5.1 seems not to like it.)

Make some other left-hand operands of <<, and some variables holding
results from shifts of that sort, unsigned, while we're at it.

Change-Id: Ie72a9d0d518f59b35948267d10c80735d162e8bb
Reviewed-on: https://code.wireshark.org/review/8264
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-01 06:50:36 +00:00
Michael Mann
0b97f0dcf3 Add tshark -z "ldap,srt"
Bug: 9363
Change-Id: Ic64716ef0156607ca40773cef8e76fc4a0825b3c
Reviewed-on: https://code.wireshark.org/review/8196
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-27 23:18:50 +00:00
Martin Mathieson
3059f4f12d S1AP: Add missing protocol IE declaration for E-UTRAN-Trace-ID
Change-Id: I03caf29a5a1889884837fccf366cb35d0ccd6281
Reviewed-on: https://code.wireshark.org/review/8213
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-27 15:54:59 +00:00
AndersBroman
af11fde75d [RANAP] Heuristics does not work with lenght detremant of 2 bytes.
Change-Id: Ib26b9d66e690770a27d63f75f4c9a935fc93b2b0
Reviewed-on: https://code.wireshark.org/review/8209
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-27 11:27:28 +00:00
Pascal Quantin
2318bd92b3 LPP: fix a typo in the protocol abbreviation
Bug: 11141
Change-Id: I2bd00a84dd59bbcfc67bf6b8286cb49fd9ff01f9
Reviewed-on: https://code.wireshark.org/review/8175
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-23 13:11:59 +00:00
Michael Mann
8d6324f759 Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list]
Part 2 of a few

Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4
Reviewed-on: https://code.wireshark.org/review/8165
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 23:24:45 +00:00
Evan Huus
263564f175 sv: remove #if0'd code
we can always get it back from git if we want

Change-Id: I61911628541cf4ed4be20e736e41fbaa58978d75
Reviewed-on: https://code.wireshark.org/review/8124
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-20 08:32:15 +00:00
AndersBroman
1785d42061 Remove depricated API tvb_length -> tvb_reported_length
Change-Id: I78b1d2accf4fd0b37eaa16cb8bf515422565e98a
Reviewed-on: https://code.wireshark.org/review/8011
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-10 13:19:33 +00:00
AndersBroman
c2a1d8feed Replace deprecated API tvb_length -> tvb_reported_length
Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e
Reviewed-on: https://code.wireshark.org/review/8004
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 12:38:04 +00:00
AndersBroman
5fa267e870 REplace deprecated API tvb_length -> tvb_reported_length
Change-Id: I6090055a9c31f6787626b810de655d1cc71b99de
Reviewed-on: https://code.wireshark.org/review/8002
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 12:03:23 +00:00
AndersBroman
99e7395e9e Replace deprecated API tvb_length... with tvb_reported_length...
Change-Id: I44732d2743ba461d1791bb3795b0aef5a314bc1f
Reviewed-on: https://code.wireshark.org/review/8001
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 11:41:32 +00:00
AndersBroman
f6a183d034 Replace deprecated tvb_length with tvb_reported_length.
Change-Id: I45d2ae41da823c50ba383a8e2aaec570ee3ad842
Reviewed-on: https://code.wireshark.org/review/7979
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-08 08:18:50 +00:00
Robert P
686d3ef1a8 PKCS1: fix a typo for OID 1.3.132.0.35
Bug: 11106
Change-Id: Ied414b8e0bae8f34445f4d36bc6dfcc96b4a7456
Reviewed-on: https://code.wireshark.org/review/7941
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-06 16:52:08 +00:00
AndersBroman
b9cf389e43 [S1AP] Display the decimal value for TAC.
Change-Id: I12127b5f7e53e2d47a42ad54d4e952f6a184d7b6
Reviewed-on: https://code.wireshark.org/review/7883
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-03 15:12:11 +00:00
Pascal Quantin
edf62d1e3e LTE RRC: fix a typo introduced in g9aa624d
Change-Id: Ia1bb68c64ca4cb820790dc84abee9cc222a1d0e4
Reviewed-on: https://code.wireshark.org/review/7874
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-01 10:46:37 +00:00
Pascal Quantin
9aa624d117 LTE RRC: upgrade dissector to v12.5.0
Change-Id: I9e3dfb17b4b7f96be999ccea88fec754a936d312
Reviewed-on: https://code.wireshark.org/review/7869
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-31 21:40:10 +00:00
Pascal Quantin
8cc297c355 LPP: upgrade dissector to v12.4.0
Change-Id: Ie09ab1002ccc3f275828615755b3130bfbb14fdc
Reviewed-on: https://code.wireshark.org/review/7852
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-30 11:53:58 +00:00
Vincent Helfre
8874653a1c RRC: add a missing mask forgotten in gf3d1e3c
Change-Id: Ib62e15d17ea576f2180ac92d217869768225905d
Reviewed-on: https://code.wireshark.org/review/7850
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-29 18:51:12 +00:00
Vincent Helfre
f3d1e3c660 RRC: add dissection of ims-Information IE
Bug: 11096
Change-Id: I348726dcd3b62f75db67e63c07bcdc79e86657a7
Reviewed-on: https://code.wireshark.org/review/7842
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>
2015-03-29 15:36:44 +00:00
Peter Wu
cc4bce537b ftsanity.py: make it work with modern tshark
Broken since 4ac2441d7c ("Coalesce "-G
fields2" and "-G fields3" into "-G fields").

This patch fixes Python3 compatibility, fixes handling of the changed
output and option and prints the faulting line on assertion error. It
also updates two dissectors which had tabs in their description,
breaking the output.

Tested with Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3.

Change-Id: Ifcd0d0eb092b357eca357cd53f2e1348ebf8885c
Reviewed-on: https://code.wireshark.org/review/7791
Reviewed-by: Gilbert Ramirez <gram@alumni.rice.edu>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-24 05:13:46 +00:00
Pascal Quantin
8f9e543d4e LTE RRC: enhance dissection of Extended Access Barring Category
Change-Id: I6e13ae8c4e95f5915541bc33d89faa61dade2058
Reviewed-on: https://code.wireshark.org/review/7674
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-13 20:37:31 +00:00
Jeff Morriss
283336508e Don't pass a t4-non-ecm-sig-end to the tap if we didn't see the start of the
data: the invalid frame number will crash Wireshark.

Bug: 10885
Change-Id: I3ae278b77a9449136fbaaac52f2bbaa8a510bf76
Reviewed-on: https://code.wireshark.org/review/7651
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-12 16:35:36 +00:00
Gerald Combs
cac102eee3 Change a lot of http:// URLs to https://.
Most of our sites are now HTTPS-only. Update URLs accordingly. Update
other URLs while we're at it. Remove or comment out dead links.

Change-Id: I7c4f323e6585d22760bb90bf28fc0faa6b893a33
Reviewed-on: https://code.wireshark.org/review/7621
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-10 19:30:50 +00:00
Pascal Quantin
7f61e90eeb SPNEGO: fix compilation without Kerberos
Remove a dead increment while we are at it

Change-Id: I4a453bbd959e71ff6e85be06d079176abdc33a95
Reviewed-on: https://code.wireshark.org/review/7622
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-10 19:04:38 +00:00