osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
81,806 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

81806 Commits

Author SHA1 Message Date
Peter Wu 67d37da79a CMake: fix macOS build when both Qt5 and Qt6 are installed again 
See v3.5.0rc0-1614-g785657d9b8 for the earlier fix and context.

Fixes: v3.5.0rc0-2496-g9b78a42855 ("CMake: Fixup qtui's includes.")
 2021-07-22 13:25:02 +02:00
Alexis La Goutte 8bb7c1933d RADIUS: Update h3c dicto 
from FreeRadius Master)
 2021-07-22 05:37:52 +00:00
Martin Mathieson a39f31318b eCPRI: don't show UINT32 type of 4-byte hdr subtree. 2021-07-21 19:22:02 +00:00
Jaap Keuter 5c8ec13dfc MKA: Don't just pretend to dissect version 3, implement the addition 2021-07-21 20:28:34 +02:00
Evan Huus 8ee8808876 First pass pinfo->pool conversion, part 2 
Automated find/replace of wmem_packet_scope() with pinfo->pool in all
files where it didn't cause a build failure.
 2021-07-21 09:54:57 -04:00
Joakim Karlsson 9ed273e5da JSON: correction of 3gpp ueEpsPdnConnection 2021-07-21 13:09:42 +00:00
Martin Mathieson c9a7b4f8ba Add some comments and long text to eCPRI dissector. 
Looking at the handover between eCPRI and ORAN FH CUS
dissectors.  Not sure that preference for calling
ORAN and eCPRI's cursory handling of message types
0 and 2 are still appropriate.
 2021-07-21 12:53:41 +00:00
Joakim Karlsson 75f53899a9 GTPv2: Add dissect of EN-DC SON Configuration IE in F-Container 2021-07-21 11:49:10 +00:00
Gerald Combs 539ad8a91b CMake: Remove unneeded GLIB2_LIBRARIES. 
GLib is part of wsutil's link interface, so we don't need to link to it
explictly.
 2021-07-21 10:05:21 +00:00
Guy Harris e8a8fab18c text_import: create a wtap_block_t before calling wtap_block_add_...option. 
Those routines can't add an option if there's no block to add it to;
this meant that neither the direction nor the sequence number would be
set when importing a packet.
 2021-07-21 00:03:47 -07:00
Evan Huus d6d7dd1e56 First pass pinfo->pool conversion 
Automated find/replace of wmem_packet_scope() with pinfo->pool in all
files where it didn't cause a build failure.

I also tweaked a few of the docs which got caught up.
 2021-07-21 05:38:29 +00:00
Guy Harris ef542759d0 text_import: only add the packet flags if we have them. 
If we don't know the packet direction, don't bother adding the packet
flags option.

While we're at it, don't bother casting a guint64 to guint64.
 2021-07-20 14:45:52 -07:00
Gtker bb25eca4eb WOWW: Rename 'index' variables to 'idx' 
As discussed on the PR:
https://gitlab.com/wireshark/wireshark/-/merge_requests/3707#note_631240408
 2021-07-20 20:46:58 +00:00
Gtker 9161ba62eb WOWW: Remove template comments 2021-07-20 20:46:58 +00:00
Gtker 2c8d57db61 WOWW: Make saved original values use struct 2021-07-20 20:46:57 +00:00
Gtker cade03373e WOWW: Update documentation 2021-07-20 20:46:57 +00:00
Gtker b9a6268819 WOWW: Add better support out of order parsing 2021-07-20 20:46:57 +00:00
Gtker 3f4ac5539b WOWW: Move header decryption into separate function 2021-07-20 20:46:57 +00:00
Gtker e37f6599b0 WOWW: Remove and move declarations 2021-07-20 20:46:57 +00:00
Gtker 57f32d974e WOWW: Add all remaining opcodes for 1.12.x 
From Mangos Zero:
e45aa74e0f/src/game/Server/Opcodes.h (L53)
 2021-07-20 20:46:57 +00:00
Gtker 9e767608f7 WOWW: Make session key deduction work 
Detailed description in the comment at the top of the file.
 2021-07-20 20:46:57 +00:00
Gtker 92e62a74fd WOWW: Add working decryption 2021-07-20 20:46:57 +00:00
Gtker e1b3796419 WOWW: Add protocol 
The protocol is a continuation of the WOW protocol occuring between the
world server and the client (as opposed to the login server and the
client).

The first two opcodes are unencrypted and perform setup for the
encryption.
The encryption was setup in the WOW protocol through SRP6.
Using the session key for encryption like this is not part of the SRP6
protocol.
All other opcodes are encrypted using the session key, which will need
to be deduced first.
 2021-07-20 20:46:57 +00:00
Gtker 894b1eec6a WOW: Make username and realm names display as UTF-8 
Both CHALLENGE and REALM_LIST are UTF-8 strings:

https://wowdev.wiki/CMD_AUTH_LOGON_CHALLENGE_Client

https://wowdev.wiki/CMD_REALM_LIST_Server
 2021-07-20 20:46:57 +00:00
Joakim Karlsson 5e9ab5c579 CMake: add GCRYPT to sdjournal_LIBS 2021-07-20 19:04:38 +02:00
Evan Huus 57fcadf5af wimax: fix field abbrev 
Fixes pre-commit warning
"wimax.dcd.dl_burst_profile_multiple_fec_types doesn't match PROTOABBREV"

All the other fields of this dissector use `wmx` not `wimax`.
 2021-07-19 19:32:22 -04:00
David Perry dc7089e831 Carry drop count/packet ID/queue ID as options on packet block 2021-07-19 21:25:40 +00:00
Evan Huus c7ed8aa3ee Remove unused variables in sharkd_session.c 
The compiler pointed them out. I'm not sure what purpose they were meant
to serve originally but they're dead now.
 2021-07-19 11:03:52 -04:00
Gerald Combs 9d50e6e199 CMake: Don't define NEED_STRPTIME. 
We haven't needed it since 5bfc21cf9e.
 2021-07-19 03:53:32 +00:00
Gerald Combs 50da270b8a BLF: Fix Win32 compilation issues. 
Fix

```
wiretap\blf.c(368,73): error C2220: the following warning is treated as an error [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(368,73): error C2220:         unsigned char *compressed_data = g_try_malloc0(tmp.infile_length); [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(368,73): error C2220:                                                                         ^ [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(368,73): warning C4244: 'function': conversion from 'guint64' to 'gsize', possible loss of data [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(368,73): warning C4244:         unsigned char *compressed_data = g_try_malloc0(tmp.infile_length); [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(368,73): warning C4244:                                                                         ^ [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(375,59): warning C4244: 'function': conversion from 'guint64' to 'gsize', possible loss of data [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(375,59): warning C4244:         unsigned char *buf = g_try_malloc0(tmp.real_length); [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(375,59): warning C4244:                                                           ^ [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(654,23): warning C4018: '<': signed/unsigned mismatch [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(654,23): warning C4018:     if (object_length < (data_start - block_start) + sizeof(blf_ethernetframeheader_t)) { [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(654,23): warning C4018:                       ^ [build\wiretap\wiretap.vcxproj]
  busmaster.c
wiretap\blf.c(733,23): warning C4018: '<': signed/unsigned mismatch [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(733,23): warning C4018:     if (object_length < (data_start - block_start) + sizeof(blf_ethernetframeheader_ex_t)) { [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(733,23): warning C4018:                       ^ [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(818,23): warning C4018: '<': signed/unsigned mismatch [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(818,23): warning C4018:     if (object_length < (data_start - block_start) + sizeof(canheader)) { [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(818,23): warning C4018:                       ^ [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(859,27): warning C4018: '<': signed/unsigned mismatch [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(859,27): warning C4018:         if (object_length < (data_start - block_start) + sizeof(canheader) + payload_length_valid + sizeof(can2trailer)) { [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(859,27): warning C4018:                           ^ [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(894,23): warning C4018: '<': signed/unsigned mismatch [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(894,23): warning C4018:     if (object_length < (data_start - block_start) + sizeof(canheader)) { [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(894,23): warning C4018:                       ^ [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(966,23): warning C4018: '<': signed/unsigned mismatch [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(966,23): warning C4018:     if (object_length < (data_start - block_start) + sizeof(canheader)) { [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(966,23): warning C4018:                       ^ [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(1045,23): warning C4018: '<': signed/unsigned mismatch [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(1045,23): warning C4018:     if (object_length < (data_start - block_start) + sizeof(frheader)) { [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(1045,23): warning C4018:                       ^ [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(1126,23): warning C4018: '<': signed/unsigned mismatch [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(1126,23): warning C4018:     if (object_length < (data_start - block_start) + sizeof(frheader)) { [build\wiretap\wiretap.vcxproj]
wiretap\blf.c(1126,23): warning C4018:                       ^ [build\wiretap\wiretap.vcxproj]
```
 2021-07-18 17:05:31 -07:00
Developer Alexander 1f12e1d267 json: fix buffer overflow in string_unescape() 
Fixes a potential buffer overflow issue in string_unescape() with a redesign
to be more robust against invalid input.

It makes use of wmem_strbuf API now.

Closes #17475
 2021-07-18 20:02:52 +00:00
Gerald Combs 96c29704c8 [Automatic update for 2021-07-18] 
Update manuf, services enterprise numbers, translations, and other items.
 2021-07-18 09:29:30 +00:00
Evan Huus f54493278f Delete various unused fields 
Discovered during the build failure of
https://gitlab.com/wireshark/wireshark/-/merge_requests/3695
 2021-07-17 16:35:41 -04:00
Jaap Keuter 490017ea7f XML: don't try to hide the UTF-8 Byte Order Mark 
Closes #17489
 2021-07-17 08:52:42 +00:00
Developer Alexander 2051cadf99 can: Optimized column info for better readability 
Column info is tuned for better readability. It containes CAN ID and Length.
The same applies to protocol item within protocol tree.

Entire packet data (payload) should not be printed to column info by default.
So this behaviour is removed.
 2021-07-17 07:15:27 +00:00
Guy Harris c64a9bbde7 erf: make a copy of the first SHB comment. 
We free it, but what wtap_block_get_nth_string_option_value() returns is
what's stored in the block, and it might get freed up out from under us.
Save a copy of it, so that when we free it, we're not double-freeing.
 2021-07-16 15:59:58 -07:00
Dr. Lars Völker 27c72d1edc LIN: Fix ID parsing (bugfix) 2021-07-16 17:56:46 +02:00
Dr. Lars Völker 73bb25bbc9 BLF: fix clang warnings 2021-07-16 14:45:21 +00:00
Dr. Lars Völker c22846d898 ISO15765: Add support for the new CAN API 
This patch allows to register single IDs for CAN.
 2021-07-16 10:09:44 +00:00
Arkady Gilinsky 4742371c97 oampdu: Add Network port declaration and it's parsing to GetRequest packets 
* Declarations were added according to CableLab specification

Signed-off-by: Arkady Gilinsky <8351139-ark-g@users.noreply.gitlab.com>
 2021-07-16 09:44:54 +00:00
Dr. Lars Völker 4cb4217dfd TECMP: Adding a filter for Channel ID names 
This patch allows adding a channel name column or use a filter for it.
 2021-07-16 09:28:45 +00:00
Dr. Lars Völker e0055d0698 Signal-PDU: Add support for the new CAN API 
This patch directly registers configured CAN IDs.
 2021-07-16 09:12:18 +00:00
Gerald Combs 6cb4f17828 NSIS: Add DPI awareness 
Set `ManifestDPIAware true` in the NSIS installer and uninstaller. Note
that this trades a better appearance on HiDPI displays for some
oddly-sized controls.
 2021-07-16 08:43:31 +00:00
Dr. Lars Völker 102a952533 CAN: Adding support for more specific tables (2) 
This patch changes TECMP, 1722, and caneth to use the new
socketcan_call_subdissectors method.
 2021-07-16 08:27:11 +00:00
Jaap Keuter fba16c88f4 JUNIPER: Set proper item length for protocol layer 2021-07-16 08:10:34 +00:00
Dr. Lars Völker 796819c955 BLF: Support for BLF file format 
This patch adds first support for the BLF file format.
 2021-07-16 07:37:43 +00:00
Gerald Combs feea07528a docbook: Fix our admon image widths. 
Set a minimum width for our admonition graphics. Otherwise some browsers
make them tiny. Fixes #17473.

Fix was done via

420a8a3d7c

which also pulls in upstream CSS fixes.
 2021-07-16 07:00:45 +00:00
Gerald Combs a2718d0d22 CMake: Remove no-longer-used checks. 
The following commits removed code that required the following defines,
so remove them:

c0711693ab HAVE_GETOPT_H (Partial; still required by CMake)
2925fb0850 HAVE_MKSTEMPS
0c889d6f5c HAVE_SYS_IOCTL_H
0c889d6f5c HAVE_SYS_SOCKIO_H
0c889d6f5c HAVE_STRUCT_SOCKADDR_SA_LEN
9c5049a80b HAVE_STRUCT_STAT_ST_FLAGS
 2021-07-15 15:03:53 -07:00
Evan Huus f58850d207 tcp: switch packet_scope to pinfo->pool 
Per mailing list discussion:
https://www.wireshark.org/lists/wireshark-dev/202107/msg00030.html

Long-term we want to get rid of the wmem_*_scope globals in favour of
passing wmem pools around. Step one is to replace all reasonable uses of
wmem_packet_scope() with pinfo->pool which has effectively the same
lifespan. This converts the TCP dissector as a proof of concept. TCP is
a common enough protocol this should stress-test the idea fairly well.
 2021-07-15 18:14:16 +00:00
Arkady Gilinsky 96c0700c62 wireshark(HEAD): oampdu: Fix: do not stop GetReq packet parsing for Object 0 
* The next_byte variable is taken before the pointer moved forward, this lead
   to stop parsing get request packets when object is 0. This commit fixes it.

Signed-off-by: Arkady Gilinsky <8351139-ark-g@users.noreply.gitlab.com>
 2021-07-15 13:01:38 +00:00