Commit Graph

41516 Commits

Author SHA1 Message Date
John Thacker dcbe7b6c84 MP2T: Reassembly multiple transport streams between the same IPs properly.
Whether over RTP or just UDP, it's possible to get multiple simultaneous MP2T
transport streams between the same pair of IPs but on different ports. They
will not be part of the same reassembly. Thus the reassembly table functions
that use ports as well should be used to avoid ressembly errors and overlaps.
2020-10-15 08:56:11 +00:00
Nardi Ivan baebbbce4d QUIC: fix heuristic
In the heuristic function we don't know the length of the CID in the short
header, so we assume the worst case scenario compatible with packet length
(no more than 20 bytes)
2020-10-14 20:06:53 +00:00
Martin Mathieson d6a9bfa503 NRUP: Add missing SN field indicated by Report Delivered 2020-10-14 13:27:03 +00:00
Pascal Quantin 83af7b89fd 3GPP: add 5G-TMSI to 3gpp.tmsi common filter 2020-10-14 11:08:19 +02:00
Anders Broman e209253636 Create a cross protocol filter 3gpp.tmsi
It can be useful to track a "call" trough multiple protocols to make
that easier create a cross protocol filter, more may come.
2020-10-14 07:56:26 +00:00
Guy Harris 6e6233521a Have WTAP_ERR_INTERNAL include an err_info string giving details.
That way, users won't just see "You got an internal error", the details
will be given, so they can report them in a bug.
2020-10-14 04:51:45 +00:00
John Thacker 824eec89ca eassembly: Fix check for no data to prevent NULL deference
There's a check for adding a zero length fragment to a reassembly in progress,
but it accidentally checks fd_head->tvb_data (the reassembly in progress)
instead of fd_i->tvb_data (the new fragment) before calling tvb_get_data() on
fd_i->tvb_data. (Note that data / fd_head->tvb_data is created based on the
sum of the lengths of all the fd_i->tvb_data, so the former can only be NULL
if all the latter are, but it's possible for one fragment to be zero length
but not the entire reassembly. Thus this is the necessary and sufficient check.)
Fixes #15569
2020-10-14 03:31:48 +00:00
Guy Harris 7b5b6501f0 Revert "No need for a local lua_State * variable in file handler routines."
This reverts commit 873e079659.

That change didn't help what I wanted to do; there's another way to do
it.
2020-10-13 17:54:50 -07:00
Guy Harris 873e079659 No need for a local lua_State * variable in file handler routines.
Just use fh->L; the compiler will put that into a register if
appropriate.  This removes one side-effect from
INIT_FILEHANDLER_ROUTINE().
2020-10-13 13:30:52 -07:00
Thiyagarajan P c1950aa8cc ieee80211:Fix ieee80211_tag_beacon_timing() beacon timing element length check. 2020-10-13 19:33:09 +00:00
Joerg Mayer 743dcc7a41 packet-eap.c: Fix a typo in a comment 2020-10-13 13:29:40 +00:00
Nardi Ivan 051742fe1d STUN: add expert info for unknown attributes
This way, it is more simple to find them...
2020-10-13 06:36:10 +00:00
Martin Kaiser bd2c10de79 glusterfs: use a simpler way to read time fields
There's no need to parse the time fields ourselves.
proto_tree_add_item() supports the encoding that is used here.
2020-10-13 06:17:03 +00:00
Nardi Ivan 3f76684f91 CLASSIC-STUN: dissect the entire packet on first-pass
Request-response tracking of STUN messages encapsulated in CLASSIC-STUN
packets (via DATA attribute) doesn't work right now.

The reason for this is that req-resp tracking is usually performed on
first-pass, but CLASSIC-STUN attributes are not dissected on first-pass
(on wireshark, at least). So the encapsulated STUN messages are never
elaborated on first pass, either.
2020-10-13 05:30:44 +00:00
Martin Kaiser 724a288560 qnet6: use a simpler way to read a time field
Fix yet another occassion where we can call proto_tree_add_item() directly
instead of parsing the time field ourselves.
2020-10-13 05:07:35 +00:00
Edward Smith e96a1082c0 GFP: Handoff to MPEG2TS dissector when UPI is DVB-ASI 2020-10-12 19:56:20 +00:00
Nardi Ivan 354bbbe7cb STUN: add support for MS-TURN Multiplexed Channel
MS-TURN Multiplexed TURN Channels have a slightly different header format
compare to standard TURN Channels: see MS-TURN 15.1, section 2.2.3
https://docs.microsoft.com/en-us/openspecs/office_protocols/ms-turn/65f6ef76-a79d-42a4-a43f-dac56d4a19ac
2020-10-12 19:32:14 +00:00
Richard Smith b287e7165e GQUIC: make sure our tag offset advances.
Make sure gquic tag offset advances so that we don't infinitely loop.
2020-10-12 19:07:17 +00:00
Joerg Mayer f1e28064ec Cisco ACI specific protocol enhancements
Add Ethertype for Cisco ACI ARP gleaning and dissect its payload
Improve some Cisco ACI vendor specific DHCP options
Update mcp after looking at knet_parser.py
Update lldp after looking at knet_parser.py

Also reorder some ETHERTYPEs by value
2020-10-12 18:38:08 +02:00
Stig Bjørlykke a750cab655 thread: Add check for valid CoAP info
Add a check for valid CoAP info in dissect_thread_coap() before use.
It may happen that this is NULL because setting a decode_as rule
for application/octet-stream will also catch other packets.
2020-10-12 12:30:31 +00:00
Anders Broman 073055c1bc Diameter: Handle (IP)address type E164 as string
The Diameter type Address hase a two byte address type family field
previously only IPv4 and IPv6 was handled. Add handling of E.164 when
encoded as a string.
2020-10-12 11:25:37 +02:00
Guy Harris 5dd6fc9459 Add proto_tree_add_item_ret_ipv4().
Change some guint32's to ws_in4_addr while we're at it.
2020-10-11 17:54:58 -07:00
Guy Harris 41c7b848d0 Fix some error messages. 2020-10-11 13:46:02 -07:00
Martin Mathieson 6894bccf03 check_tfs.py: Also match case insensitively
Fix up some issues where the words were the same except for
captitalisation.
2020-10-11 18:46:31 +00:00
Martin Mathieson 6af49f0537 Make NRUP work as a separate protocol.
It is called as a protocol by GTP  as before, but making it separate
and findable by name protocol allows for that layer to be logged and
dissected separately.
2020-10-11 18:19:47 +00:00
Guy Harris d3f2fa4019 tn3270: add new URL for the 3270 data stream spec. 2020-10-10 17:28:56 -07:00
Pascal Quantin f1eb3953f0 RRC: upgrade dissector to v16.1.0 2020-10-10 19:06:41 +02:00
Anders Broman 6dada3acf2 SNMP: Use BASE_SHOW_ASCII_PRINTABLE for octet strings
Closes #16900
2020-10-10 13:28:06 +00:00
Alexis La Goutte 85c03c37b5 ebhscr: fix conflict
'ebhscr.sts' exists multiple times with incompatible types: FT_NONE and FT_UINT16
2020-10-09 13:01:51 +00:00
Alexis La Goutte 32a06d76d1 kafka: fix uninitialized value
found by clang analyzer
2020-10-09 08:16:02 +02:00
Francisco Jose Alvarez 4189581cc9 ieee80211: Fix dissect_hs20_osu_provider() return parameter
With the current return parameter of dissect_hs20_osu_provider() function, the dissector only show the first
osu_provider of the list. Changing the return end by return offset, the
dissector show all osu_provider of the list.
2020-10-08 18:23:56 +00:00
Pascal Quantin 21c3bdff06 NR RRC: upgrade dissector to v16.2.0 2020-10-08 10:24:28 +02:00
Pascal Quantin 39744b8edf DVB-S2-TABLE: fix test on hand_over_type variable
Closes #16894
2020-10-08 04:21:47 +00:00
Jason Cohen 48ff4ae387 Disable greedy heuristic dissectors by default
Exablaze and Metamako ethernet trailer dissector heuristics are not
specific enough to limit the data they comsume and identiy as the
respective trailers.  Disable by default.

Fixes: #16898
2020-10-08 03:36:05 +00:00
Jeff Widman 46c9f2579d typo: is require --> is required 2020-10-07 17:32:54 -07:00
Pascal Quantin 7924aaae00 LTE RRC: update message identifier value_string array 2020-10-07 21:30:08 +00:00
Pascal Quantin 1fd8174965 NGAP: dissect some PWS related fields 2020-10-07 23:00:26 +02:00
Martin Mathieson 3160f11af2 NGAP: Change "encyption" -> "encryption". 2020-10-07 20:20:38 +00:00
Pascal Quantin 1fd6a542fe LTE RRC: upgrade dissector to v16.2.0 2020-10-07 17:17:02 +00:00
Martin Mathieson 9c8eece68a MC-NMF: Fix a couple of spelling errors. 2020-10-07 17:21:55 +01:00
Pascal Quantin 1afe9a96d4 BGP: remove useless assignments
Closes #16896
2020-10-07 10:42:14 +00:00
Pascal Quantin 926d6e3799 E212: fix a test when checking MCC digits
Closes #16895
2020-10-07 10:18:05 +00:00
Jim Young da8f6e318e file-pcapng - Dissect the Darwin flags option 2020-10-07 09:03:15 +00:00
Gerald Combs 9875011fda Update some field names to match what's in RFCs.
Update some field names and capitalization in the IPv4, IPv6, ICMPv4,
and TCP dissectors to match the names documented in their respective
RFCs. This is in no way comprehensive, but it ensures that the packet
diagram more closely matches the RFC diagrams for those protocols.

(I haven't found a document that explitly says so, but protocol field
names in IETF RFCs seem to follow Chicago Manual of Style capitalization
recommendations in section 3.4 of the RFC Style Guide[1] for the most
part.)

[1]https://tools.ietf.org/html/rfc7322#section-3.4
2020-10-07 08:01:51 +00:00
Vadim Yanitskiy 35c69efaf4 BSSAP: fix dissection of Control Channel bits in DLCI
According to 3GPP TS 48.006, section 9.3.2, Data Link Connection
Identifier (DLCI) is coded as follows:

  .... .SSS - SAPI value used on the radio link;
  CC.. .... - control channel identification:
    00.. .... - indicates that the control channel is not further specified,
    10.. .... - represents the FACCH or the SDCCH,
    11.. .... - represents the SACCH,
    other values are reserved.

The following values in value_string 'bssap_cc_values':

  { 0x80,     "FACCH or SDCCH" },
  { 0xc0,     "SACCH" },

are valid before applying CC_MASK (0xc0) mask, but not after.
2020-10-06 19:52:36 +00:00
Ed 2402521a69 SCTP: update PPI values 2020-10-06 19:19:09 +00:00
Nardi Ivan fbdf48e024 STUN: add an option to auto-detect STUN protocol version
Commit 3a5d0569d7 added support for different STUN protocol versions;
a global preference allows the user to select the desired flavour.

Unfortunately, it is pretty common to have different flavours in the same
capture file, or even in the same packet (with STUN messages encapsulated
in a TURN tunnel), so a global preference applied to the entire file might
not provide enough flexibility.

Add a basic auto-detect algorithm to identify the STUN version specific to
each STUN message (the users will still have the option to force a global
version)
2020-10-06 13:46:55 +00:00
Pascal Quantin 0abf89ce4f MC-NMF: change get_size_length() signature to get rid of multiple casts 2020-10-06 14:31:12 +02:00
Pascal Quantin b74077c717 MC-NMF: add some missing casts to please MSVC 2020-10-06 13:51:42 +02:00
Uli Heilmeier 557a64d9a9 MC-NMF/MS-NNS: New dissector .NET Message Framing Protocol
New dissector for MC-NMF (.NET Message Framing Protocol) and
MS-NNS (.NET NegotiateStream Protocol).

TLS implementation is not tested due to the lack of a sample capture.

Fixes: wireshark/wireshark#16861
2020-10-06 07:15:55 +02:00