osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
51,883 Commits 26 Branches 0 Tags 795 MiB
Commit Graph

19756 Commits

Author SHA1 Message Date
Evan Huus 1828c34519 Ensure ieee802154_packet struct is initialized. 
A malformed capture could cause the zbee-nwk-gp and 6lowpan heuristics to be
called with an incompletely-initialized structure, leading to valgrind errors.

Change-Id: Iaea6daecdca6856466b58071f095930e68c6e159
Closes-Bug: #9735
Reviewed-on: https://code.wireshark.org/review/418
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
 2014-02-27 03:34:46 +00:00
Guy Harris 9733917e28 Sherman, set the Wayback Machine for 1997. 
The URLs for the CRC-10 code are dead; use Wayback Machine URLs.

Change-Id: I3924e9cabb3b49b0e1abb31fbffa9b89f95cd0ce
Reviewed-on: https://code.wireshark.org/review/419
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2014-02-27 00:59:23 +00:00
Bill Meier 1dff4e309d Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate dissectors. 
Change-Id: I0e779b2ac2f608356649c5bbfca438141070dea4
Reviewed-on: https://code.wireshark.org/review/412
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
 2014-02-26 19:38:21 +00:00
Bill Meier 0d2f290d48 Create/use an extended value_string. 
Change-Id: I1cd20d68ebb50d11ecfa00bf76e9be7c47a45860
Reviewed-on: https://code.wireshark.org/review/410
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
 2014-02-26 18:29:15 +00:00
Bill Meier 15a3a4436e (Minor) Use col_add_str() iso col_set_str(). 
Change-Id: I3d430e7e6a6bbdcb518f0110bd81ab32f88c17f0
Reviewed-on: https://code.wireshark.org/review/409
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
 2014-02-26 18:28:33 +00:00
Bill Meier 5ae7c2ffc0 Create/use some extended value-strings. Do some whitespace changes. 
Change-Id: Iee5cb12d3b6669c7e45e18352ebcd151db721ad3
Reviewed-on: https://code.wireshark.org/review/408
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
 2014-02-26 18:27:46 +00:00
Guy Harris ea1d5c151e Use proto_tree_add_item() for most string encodings. 
We support ISO 8859-1 and 8859-8, so use proto_tree_add_item() for them.
That leaves only EUC-KR.

Change-Id: Ie61f69af43be03e5abeb84b95601a407900fb79b
Reviewed-on: https://code.wireshark.org/review/403
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2014-02-26 10:17:22 +00:00
Guy Harris 85885f4509 Use tvb_get_string_enc(..., ENC_ASCII|ENC_NA) for 8-bit encoding. 
If there are 8-bit "extended ASCII" encodings, either one should be
wired in or there should be a preference for them.

Change-Id: Id62381b2579e8edf3719bd92959821c21f7ba223
Reviewed-on: https://code.wireshark.org/review/402
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2014-02-26 10:14:09 +00:00
Pascal Quantin 985d334f9b Replace tabs by spaces 
Change-Id: Ib7b97c415fdf924783637bfe566f1e7d21e28369
Reviewed-on: https://code.wireshark.org/review/401
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-02-26 09:23:23 +00:00
Stefan Metzmacher b84d6bebcb packet-smb-direct: register as a infiniband subdissector 
This is implemented based on the documentation, I sadly don't
have a capture to verify this.

Change-Id: Ia7dc371cb5b17ea42be0e686c97797f8c06ccabd
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/358
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-02-26 09:14:57 +00:00
Stefan Metzmacher 8242756aed packet-infiniband: pass a struct infinibandinfo to subdissectors 
Change-Id: I187a1a91f34b1b758cad03bd9902ba132272cd3a
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/357
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-02-26 09:12:20 +00:00
Stefan Metzmacher f012f1d087 packet-smb-direct: only handle RDMA_SEND_* messages 
Change-Id: I08fa1092e2722c108bf6f847f8fc230f131e584b
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/356
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-02-26 09:09:26 +00:00
Stefan Metzmacher 6efd2c732a packet-iwarp-ddp-rdmap: pass struct rdmapinfo with opcode to the subdissectors 
Change-Id: I51bb8a3047bbc16d55d0c089fe869c7534d4c0b5
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/355
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-02-26 09:08:47 +00:00
Guy Harris 98cc3d61dc We don't use EBCDIC_to_ASCII(), so we don't need to include <epan/charsets.h>. 
Change-Id: Ief609f48493f406ba0818ed3e6febe9a8ef0aaf2
Reviewed-on: https://code.wireshark.org/review/400
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2014-02-26 07:57:22 +00:00
Guy Harris f8f4ebbc91 Use tvb_get_string_enc() to get UCS-2 strings. 
Also, note that the "8-bit" encoding is "user-defined".

Change-Id: Ic4786873150d837d8793d2d3d20af50cd0003cc7
Reviewed-on: https://code.wireshark.org/review/399
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2014-02-26 07:50:57 +00:00
Stefan Metzmacher fcb0837d0c packet-smb: register a dissector on top of smb_direct 
Change-Id: I316b958c6a91dc333bcdb468368f2c19fe8845d6
Old-Change-Id: I26a3088df12de9d74cf6c224b938003417b758f5
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/58
Reviewed-by: Evan Huus <eapache@gmail.com>
(cherry picked from commit d0d83e5b85)
Reviewed-on: https://code.wireshark.org/review/389
 2014-02-25 22:00:04 +00:00
Stefan Metzmacher 5d0be58cb5 packet-smb2: register a dissector on top of smb_direct 
Change-Id: I6a87c57d513af9c8ce9dff783988f7242f5257d0
Old-Change-Id: If52130f7f9e9783a8ecc8b8b3c01d86a02e4f946
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/57
Reviewed-by: Evan Huus <eapache@gmail.com>
(cherry picked from commit cd9f6e077f)
Reviewed-on: https://code.wireshark.org/review/390
 2014-02-25 21:59:58 +00:00
Stefan Metzmacher 8fe9187b98 packet-smb-direct.c: add initial implementation 
See [MS-SMBD] http://msdn.microsoft.com/en-us/library/hh536346.aspx

Change-Id: If2cf719bdf5da82bc5f5e086dd69d02caff2166a
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/55
Reviewed-by: Evan Huus <eapache@gmail.com>
 2014-02-25 21:58:26 +00:00
Stefan Metzmacher 9db0e02fb3 packet-kerberos: remember in what frame a key was learned 
Change-Id: Icd05d4941fdacac44094fafbad07f08ec4cbe976
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/364
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 2014-02-25 21:47:27 +00:00
Alexis La Goutte 34933eb805 802.11 : Add channel number custom (to display info when report channel number is 0 or 255) 
Fix also indent for other custom...

Change-Id: Ic95b65d5217a0d1e967892ac2694f3ba749242fb
Reviewed-on: https://code.wireshark.org/review/379
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 2014-02-25 20:16:14 +00:00
Alexis La Goutte f5ebc083c6 802.11: Regulatory Class => Operating Class (changed in 802.11-2012) 
Fix also typo for hf_ieee80211_tag_measure_request_regulatory_class wrong hf name...

Change-Id: I49e582c7683e58abb8785958dcc043789fd79a26
Reviewed-on: https://code.wireshark.org/review/378
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 2014-02-25 20:15:53 +00:00
Michael Pergament 2da9162402 Enhance BGP Dissector 
Add 
* BGP MPLS Based Ethernet VPN dissector (draft-ietf-l2vpn-evpn-05)
* PMSI Tunnel Attribut dissector (RFC6514)

Change-Id: I02caa67fc371bbc9666f343e20fa678e8b029a59
Reviewed-on: https://code.wireshark.org/review/296
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 2014-02-25 20:12:13 +00:00
Guy Harris 75015e4351 Can't register in a non-existent dissector table. 
This will have to wait until the SMB Direct dissector is actually
committed.  There's no point in getting a bunch of "OOPS: dissector
table "smb_direct" doesn't exist" messages every time you run Wireshark
or TShark.

Change-Id: I9772eb3f119822fbeaa78876570798d49bb4cab9
Reviewed-on: https://code.wireshark.org/review/382
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2014-02-25 19:55:25 +00:00
Guy Harris 1084b88719 Fix indentation. 
Change-Id: I2105c24a196ddd108925fd3ea29180aa8245dc1b
Reviewed-on: https://code.wireshark.org/review/381
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2014-02-25 19:04:28 +00:00
Guy Harris 1b046b76f3 The UMTS GTP QoS Profile is a UTF-8-encoded string. 
So use tvb_get_string_enc() with ENC_UTF_8|ENC_NA.

Use tvb_reported_length() while we're at it.

Change-Id: I75bfa9abb23ca411dca5844dd56fe062d16319e0
Reviewed-on: https://code.wireshark.org/review/380
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2014-02-25 19:00:03 +00:00
Stefan Metzmacher cd9f6e077f packet-smb2: register a dissector on top of smb_direct 
Change-Id: If52130f7f9e9783a8ecc8b8b3c01d86a02e4f946
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/57
Reviewed-by: Evan Huus <eapache@gmail.com>
 2014-02-25 17:58:54 +00:00
Stefan Metzmacher d0d83e5b85 packet-smb: register a dissector on top of smb_direct 
Change-Id: I26a3088df12de9d74cf6c224b938003417b758f5
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/58
Reviewed-by: Evan Huus <eapache@gmail.com>
 2014-02-25 17:58:34 +00:00
Stefan Metzmacher 04bd19d3c2 packet-dcerpc-nt.c: fix a crash bug 
Change-Id: Ia8d167afc79c4fa1b2fa05b78152120203462b67
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/362
Reviewed-by: Evan Huus <eapache@gmail.com>
 2014-02-25 17:56:09 +00:00
Bill Meier 93fe4d53e2 Remove trailing whitespace. 
Change-Id: Ia03a1cd4590aceda30ead4aa93ad413d90c6aea6
Reviewed-on: https://code.wireshark.org/review/372
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
 2014-02-25 16:36:38 +00:00
Alexis La Goutte 7db4bedadf Fix packet-devicenet.c:619:17: error: will never be executed [-Werror,-Wunreachable-code] 
Change-Id: I3e7cc60e1844dcb1eab87060f6338bd4ba08e9b3
Reviewed-on: https://code.wireshark.org/review/322
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 2014-02-25 15:42:16 +00:00
Alexis La Goutte d3e03e97f0 Fix packet-ieee80211.c:13115:7: error: will never be executed [-Werror,-Wunreachable-code] 
Change-Id: I0a87e6a2e9a819148a816ad1bc9da008b8cc1518
Reviewed-on: https://code.wireshark.org/review/324
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 2014-02-25 15:37:53 +00:00
Alexis La Goutte 7af7c87898 Fix packet-ipv6.c:585:13: error: will never be executed [-Werror,-Wunreachable-code] 
Change-Id: Ic2696aac59e001db1e4f62942680150a065ebbb1
Reviewed-on: https://code.wireshark.org/review/326
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 2014-02-25 15:34:47 +00:00
Alexis La Goutte 42188b997b Fix packet-ip.c:579:9: error: will never be executed [-Werror,-Wunreachable-code] 
Change-Id: Id368fdb7025260cb1fc261f844eae8c018c65edd
Reviewed-on: https://code.wireshark.org/review/325
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 2014-02-25 15:32:50 +00:00
Guy Harris 42ce748ebc Just use proto_tree_add_item() for an EBCDIC string. 
Change-Id: Ic385926b5f4110253e3ab47984589d646707afa0
Reviewed-on: https://code.wireshark.org/review/353
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2014-02-25 10:00:55 +00:00
Pascal Quantin 92a369eaf4 Remove a few wrong use of tvb_get_string() 
Change-Id: I7095e12439fd8c0c5cd3ce14d19662efa3fd841f
Reviewed-on: https://code.wireshark.org/review/339
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-02-25 07:47:57 +00:00
Alexis La Goutte 53deb521e7 Neighbor report (802.11k) may be have no subelement (len == 13) 
Fix some malformed frame from sample on Bug 9724

Change-Id: I0874c2aab57799426f13e18123b05a7e73c6a75f
Partialy-Bug:9724
Reviewed-on: https://code.wireshark.org/review/340
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 2014-02-25 05:57:17 +00:00
Pascal Quantin 58db464aff Remove executable bit from a few files 
Change-Id: Ib9be221e3d325379c8b665ab73d976254bb23bb6
Reviewed-on: https://code.wireshark.org/review/342
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-02-24 22:34:26 +00:00
Alexis La Goutte b7bd4ff7ae Fix -Wunused-const-variable found by Clang 
Change-Id: I57cfafea0e3110553ef03a34baad217f8109942d
Reviewed-on: https://code.wireshark.org/review/320
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 2014-02-24 20:42:44 +00:00
Tobias Brunner bf43e31e8c Use correct hash algorithms in ISAKMP (IKEv2) dissector 
Change-Id: Ia448f3cc5f5ffc8eafad73fdb0c3f3dd647342ef
Reviewed-on: https://code.wireshark.org/review/335
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 2014-02-24 17:48:32 +00:00
Pascal Quantin dd4e5fcbdd NAS EPS: fix dissection of CS service notification message 
Fixes bug 9789

Change-Id: I26ed1e9d8bb5b662af97d19f64b5f4b39374a5ee
Reviewed-on: https://code.wireshark.org/review/330
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-02-23 22:42:56 +00:00
Pascal Quantin a8676c2fd7 Fix dissection of BCD numbers 
Do not use of tvb_get_string(): what we really want is the byte string, not an ASCII string

Change-Id: I8b9a8b7ccacbdaf6d9525771ff8ed883ba01ad34
Reviewed-on: https://code.wireshark.org/review/329
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-02-23 22:41:45 +00:00
Pascal Quantin 1678b0a825 Remove deprecated TVB APIs 
Change-Id: I87216c3bd2061c12ce486c752d4381ab722db95e
Reviewed-on: https://code.wireshark.org/review/328
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-02-23 22:28:40 +00:00
Evan Huus ce932fb0b5 Add some simple ISAKMP heuristics 
Hopefully fixes bug 9800.

Change-Id: I69e1a0e39763a6e25eb18aed6b4a6a6217e22d14
Reviewed-on: https://code.wireshark.org/review/312
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
 2014-02-22 19:17:17 +00:00
Alexis La Goutte 88c34ec6c8 Fix Called function pointer is null (null dereference) found by Clang 
../../asn1/h248/packet-h248-template.c:1222:31: warning: Value stored to 'prop' is never read
        if (!prop->dissector) prop = &no_param;

Change-Id: I6d380fbb5fef9dc548385b0b470aea1cb3c34df1
Reviewed-on: https://code.wireshark.org/review/301
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 2014-02-22 16:43:50 +00:00
Hadriel Kaplan cfeae2f86c Fix clang warning regarding null pointer use in packet-sip.c. 
In malformed sip-sec header fields, missing spi-c/spi-s values will
cause thie 'value' pointer to remain NULL, leading to bad things.
This fix checks for that and adds an expert warning about malformed
sip-sec mechanism.

Change-Id: Ia7d1741fc8d829dd14e5c68f21fa99282eddbeab
Reviewed-on: https://code.wireshark.org/review/299
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 2014-02-22 16:43:32 +00:00
Guy Harris 504eee7c23 Cleanup the automatically-generated fields to match the rest. 
Change-Id: I217d5c390c806dfa28c7e9ff155ef927ed2a9111
Reviewed-on: https://code.wireshark.org/review/303
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2014-02-21 23:56:08 +00:00
Alexis La Goutte 1b210e967c Fix Dead Store (Dead assignement/Dead increment) warning found by Clang 
Change-Id: I05ca21d94bbaa8c92a33f02ceb100c206c198052
Reviewed-on: https://code.wireshark.org/review/298
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 2014-02-21 20:50:14 +00:00
Alexis La Goutte e009dc9843 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang 
Change-Id: Ic3a240a2e751700f653287dd84fe58016adab9e2
Reviewed-on: https://code.wireshark.org/review/297
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 2014-02-21 20:49:35 +00:00
Matthieu Texier e1b265596b Moving custer list/cluster id attribut to items 
Change-Id: If23c530b10c67613311aa8a8a1b1a8acf95f3c48
Reviewed-on: https://code.wireshark.org/review/294
Reviewed-by: Evan Huus <eapache@gmail.com>
 2014-02-21 16:56:02 +00:00
Roland Knall 95190e4bd6 EPL + openSAFETY: Better handling of guint in EPL 
This is a permanent solution for bug #9786. guint overflows
 are now prevented, and the remaining length is queried from
 tvb and taken into consideration.

 As a side-effect, the fix brought up two bugs in the openSAFETY
 dissector, which where fixed as well.

 Upd: Remove stdio.h and fix one encoding error found by
 fix-encoding-args.pl

Change-Id: Ic2d478a8ea15b0bcfd2536a074c217daf610fe08
Reviewed-on: https://code.wireshark.org/review/291
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
 2014-02-21 16:45:31 +00:00