Michael Mann
8ba9710ceb
Add Bluetooth HID dissector ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7710 )
...
with some minor corrections done to the patch.
svn path=/trunk/; revision=44841
2012-09-10 14:19:07 +00:00
Anders Broman
179e7bb4b6
From Michal Labedzki:
...
Bluetooth: Use correct names for ACL dissector
Dissector name is "bthci_acl" so use it for convention.
Also some cosmetic alignments
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7639
svn path=/trunk/; revision=44837
2012-09-10 12:12:05 +00:00
Anders Broman
7727889fe4
From Michal Labedzki:
...
Bluetooth: Use correct names for SCO dissector
Dissector name is "bthci_sco" so use it for convention.
Also some cosmetic alignments.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7639
svn path=/trunk/; revision=44836
2012-09-10 12:08:27 +00:00
Anders Broman
1460bb5352
From Michal Labedzki:
...
Bluetooth: Fix registering DUN and SPP
Use correct variable instead of used by HFP.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7639
svn path=/trunk/; revision=44835
2012-09-10 12:07:45 +00:00
Anders Broman
d94a139780
From Michal Labedzki:
...
Fix casting to make compilator happy again.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7639
svn path=/trunk/; revision=44833
2012-09-10 11:49:01 +00:00
Anders Broman
ad3f60afb8
From Michal Labedzki on behalf of Tieto Corporation:
...
Bluetooth: Update SDP headers to latest ASSIGNED NUMBERS
Based on value provided by Bluetooth SIG:
https://www.bluetooth.org/Technical/AssignedNumbers/service_discovery.htm
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7639
svn path=/trunk/; revision=44831
2012-09-10 11:30:13 +00:00
Alexis La Goutte
e486f63a47
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
...
Enhance DNS Dissector
Fix indent (remove tabs)
svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
Alexis La Goutte
5d7c6dc0da
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
...
Enhance DNS Dissector
Add new DNS type : TLSA/DANE (52) RFC6698
The DNS-Based Authentication of Named Entities (DANE) Transport Layer Security (TLS) Protocol: TLSA
svn path=/trunk/; revision=44829
2012-09-10 09:14:53 +00:00
Anders Broman
77f4036dd6
Add dissection of Vendor id to CISCO AVP dissection.
...
svn path=/trunk/; revision=44827
2012-09-10 08:26:22 +00:00
Pascal Quantin
0a1c9c7b8b
From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7707 :
...
Fix dissection of small Homeplug AV frames
svn path=/trunk/; revision=44823
2012-09-09 20:10:14 +00:00
Gerald Combs
2fc104ad34
[Automatic manuf, services and enterprise-numbers update for 2012-09-09]
...
svn path=/trunk/; revision=44819
2012-09-09 14:03:32 +00:00
Evan Huus
7ad756e9c2
From Martin Kupec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7658
...
Manually expand some of the macros in packet-llrp.c that were only being used
in one place. Makes for a more traditional set of hf_ registrations.
svn path=/trunk/; revision=44817
2012-09-09 01:39:27 +00:00
Guy Harris
c16ff99f81
Make register_all_wiretap_modules() and register_all_codecs() static;
...
they're only used internally to epan/plugins.c.
svn path=/trunk/; revision=44815
2012-09-08 17:16:51 +00:00
Evan Huus
d574361f5c
Use g_hash_table_new_full() instead of g_hash_table_new() for subdissector
...
registration tables, and use g_free as the value_destroy_func. This saves us
from manually freeing the value when we remove an item, and prevents us from
leaking memory when we accidentally overwrite an existing item.
svn path=/trunk/; revision=44814
2012-09-08 15:03:07 +00:00
Guy Harris
4c77fc1fca
Include wspython if we *do* have libpy, not if we *don't*.
...
svn path=/trunk/; revision=44809
2012-09-07 19:40:10 +00:00
Alexis La Goutte
01079fba93
From Owen Kirby via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7704
...
IANA assignments for 6LoWPAN-ND
draft-ietf-6lowpan-nd-21 has entered the RFC editor's queue, and has been
officially assigned values for the ICMPv6 message and option type codes ( as
seen at http://www.iana.org/assignments/icmpv6-parameters/icmpv6-parameters.xml
)
This patch replaces the old placeholder values for the 6LoWPAN-ND types with
the official IANA assignments.
svn path=/trunk/; revision=44808
2012-09-07 11:54:25 +00:00
Anders Broman
fdba4d5f3b
packet-l2tp.c: In function 'dissect_l2tp_cisco_avps':
...
packet-l2tp.c:864: warning: unused parameter 'pinfo'
svn path=/trunk/; revision=44807
2012-09-07 10:40:10 +00:00
Anders Broman
f359ed7a74
Split out dissection of vendor AVP:s
...
svn path=/trunk/; revision=44806
2012-09-07 10:27:38 +00:00
Anders Broman
cc6d4341e6
From Mike Morrin:
...
Interface based on header type rather than MCS.
passes in the header type for EGPRS packets.
This makes sense because in a real protocol stack, the header type is encoded
in the burst stealing bits, allowing the header can be decoded, giving the CPS
IE, which then allows the data blocks to be decoded, so wireshark now follows
the same practice.
I found that there was a (previously overlooked) alignment error in decoding
the last octet of some headers due to the last "octet" having less than 8 bits,
and both the protocol stacks I have here assume that the left-hand bits are
missing (as per the figures in 44.060). I corrected this by making a small
extension to the NULL encoding in packet-csn.[ch] to allow a NULL field to
consume more than 0 bits.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7615
svn path=/trunk/; revision=44805
2012-09-07 07:43:13 +00:00
Anders Broman
ef3bcb9c84
Revert 44804 as it fails on most OSX and Windows buildbots
...
svn path=/trunk/; revision=44804
2012-09-07 05:41:54 +00:00
Jeff Morriss
6dc8a84eab
From pi-rho via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7403 :
...
Correct a logic error which filtered out the Python-related library symbols
when Python is enabled.
Actually expose some Python-related symbols (which get filtered out if it's
not enabled).
svn path=/trunk/; revision=44803
2012-09-07 02:20:29 +00:00
Jeff Morriss
aa5d9d78dd
From Robert Bullen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7683 :
...
The reassembled fragments tree in the Packet Details view is awesome, but it
lacks one thing: a field that exposes the reassembled data.
tcp.data already exists for exposing a single TCP segment's payload as a byte
array. It would be handy to have something similar for a single application
layer PDU when TCP segment reassembly is involved. I propose
tcp.reassembled.data, named and placed after the already existing field
tcp.reassembled.length.
My primary use case for this feature is outputting tcp.reassembled.data with
tshark for further processing with a script.
The attached patch implements this very feature. Because the reassembled
fragment tree code is general purpose, i.e. not specific to just TCP, any
dissector that relies upon it can add a similar field very cheaply. In that
vein I've also implemented ip.reassembled.data and ipv6.reassembled.data, which
expose reassembled fragment data as a single byte stream for IPv4 and IPv6,
respectively. All other protocols that use the reassembly code have been left
alone, other than inserting NULL into their initializer lists for the newly
introduced struct field reassemble.h:fragment_items.hf_reassembled_data.
svn path=/trunk/; revision=44802
2012-09-07 02:09:59 +00:00
Jeff Morriss
8ba24b5530
From Aditya Ambadkar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7046 :
...
Fix CID 703472 and (external) fuzz failure 7567:
The dissect_subtlv_interface_parameters is missing the handling of BFD 2..4.
For the crash patch, we decided to add the bfd2..4 in dissect_tlc function(in
the diff). We plan to open a separate bug to fix
dissect_subtlv_interface_parameters to make it handle BFD2..4. (Thanks to Arun
Arunachalam for this analysis)
From me: fix up some indentation and replace tabs with spaces (for consistency).
svn path=/trunk/; revision=44801
2012-09-07 01:35:16 +00:00
Gerald Combs
8fde28534d
Fall back to using the parent tree if the AVP tree isn't set.
...
svn path=/trunk/; revision=44795
2012-09-06 22:34:02 +00:00
Anders Broman
cab3f8337b
packet-l2tp.c:880:9: error: unused variable 'rhcode' [-Werror=unused-variable]
...
svn path=/trunk/; revision=44794
2012-09-06 21:56:34 +00:00
Anders Broman
e9b50ed117
Use proto_add_item
...
svn path=/trunk/; revision=44793
2012-09-06 21:22:59 +00:00
Pascal Quantin
1c2f498a82
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7697 :
...
Fix dissection of release 98 and release 99 QoS profiles (bug introduced in r43312)
svn path=/trunk/; revision=44792
2012-09-06 20:58:32 +00:00
Alexis La Goutte
fc5c9f7853
From Masashi Honma via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7691
...
TKIP dissection : wrong IS_TKIP macro
In [1] "11.4.2.2 TKIP MPDU formats", we could see below sentence.
"WEPSeed[1] is not used to construct the TSC, but is set to (TSC1 | 0x20) &
0x7f."
But the IS_TKIP macro only checks (WEPSeed[1] & 0x20).
So sometimes IS_TKIP macro mis-dissects a CCMP frame as a TKIP frame.
This patch changes IS_TKIP macro to do more better check.
[1] IEEE Std 802.11.-2012
#BACKPORT(1.8, 1.6)
svn path=/trunk/; revision=44790
2012-09-06 08:55:16 +00:00
Alexis La Goutte
2cb7032b59
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=44789
2012-09-06 08:49:47 +00:00
Alexis La Goutte
3b413e581e
Prefer proto_tree_add_item (when it is possible)
...
svn path=/trunk/; revision=44788
2012-09-06 08:48:34 +00:00
Anders Broman
57c03ff5b3
From Chris Elston:
...
Add support for control message authentication checking for IP encapsulated L2TPv3 packets.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7700
svn path=/trunk/; revision=44786
2012-09-06 08:03:15 +00:00
Pascal Quantin
d2715d3b5f
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7701 :
...
Do sanity check on option length earlier
svn path=/trunk/; revision=44785
2012-09-05 21:23:50 +00:00
Martin Kaiser
cc9feb9857
fix compilation on Win7x64 (I hope)
...
svn path=/trunk/; revision=44783
2012-09-05 20:31:52 +00:00
Martin Kaiser
45af5d6a2d
add modelines for the ftp dissector
...
svn path=/trunk/; revision=44782
2012-09-05 20:08:09 +00:00
Martin Kaiser
fd919c30cb
from Alexander Koeppe
...
ftp PASV and PORT commands: mark ip address and port in data view
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7693
svn path=/trunk/; revision=44781
2012-09-05 19:51:57 +00:00
Pascal Quantin
e6538311a6
Replace process_RequestOperation macro by a real function to speedup compilation time
...
svn path=/trunk/; revision=44779
2012-09-05 12:45:54 +00:00
Anders Broman
881a115a88
Update value_strings
...
svn path=/trunk/; revision=44778
2012-09-05 11:54:09 +00:00
Pascal Quantin
03e43c76b3
From Harald Welte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7696 :
...
packet-gsm_abis_om2000: Add support for MO IF bytes 2 and 3
svn path=/trunk/; revision=44777
2012-09-05 10:16:24 +00:00
Pascal Quantin
088e40446a
From Harald Welte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7695 :
...
Fix minor inconsistency in packet-gsm_abis_om2000.c
svn path=/trunk/; revision=44776
2012-09-05 09:54:42 +00:00
Anders Broman
1be02f5226
From Jared August:
...
PTPv2: Added IEEE C37.238 TLV support
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7694
svn path=/trunk/; revision=44775
2012-09-05 07:40:36 +00:00
Pascal Quantin
5cdcf9c280
Add dissection of SIP Servers option to DHCPv4 (RFC 3361)
...
svn path=/trunk/; revision=44773
2012-09-04 20:43:24 +00:00
Guy Harris
e79e7c59f8
Use libwireshark's xDLC handling functions and macros to process the
...
control field. This means processing the AX.25 header data in one pass.
The field after the control field is the "protocol identifier" field,
not the "packet identifier" field.
svn path=/trunk/; revision=44772
2012-09-04 20:42:21 +00:00
Pascal Quantin
86888580d6
Fix compilation with gcc
...
svn path=/trunk/; revision=44771
2012-09-04 18:26:18 +00:00
Pascal Quantin
05c440b622
Set SVN properties
...
svn path=/trunk/; revision=44770
2012-09-04 18:14:20 +00:00
Michael Mann
2b4bcea631
Add GED125 dissector
...
Bug 2692 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2692 )
svn path=/trunk/; revision=44769
2012-09-04 17:54:27 +00:00
Alexis La Goutte
3ccb64d490
Add modelines for DNS dissector
...
svn path=/trunk/; revision=44767
2012-09-04 08:19:08 +00:00
Jörg Mayer
7aa18f37cd
Small whitespace changes
...
svn path=/trunk/; revision=44763
2012-09-04 00:42:07 +00:00
Martin Kaiser
a31e9fc2cc
unify the handling for all DVB/MPEG sections
...
don't initialize pointer where it's not required
remove unnecessary 'if (tree)' checks
svn path=/trunk/; revision=44762
2012-09-03 21:25:07 +00:00
Martin Kaiser
677d843489
highlight only the actual bytes of EIT, SDT, TDT, TOT and BAT
...
minor whitespace cleanup
skip initialization and 'if (tree)' where it's not required
svn path=/trunk/; revision=44761
2012-09-03 21:18:50 +00:00
Martin Kaiser
2558013747
fix a typo in dvb service descriptor
...
svn path=/trunk/; revision=44760
2012-09-03 21:11:01 +00:00
Jeff Morriss
4c0b20f3bb
(Attempt to) fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7411 :
...
Use LIBGCRYPT_CFLAGS if we have it.
svn path=/trunk/; revision=44758
2012-09-03 19:53:35 +00:00
Jeff Morriss
f90f3f3438
Don't fetch the value twice (unsigned integer case). Fix a cut-n-pasteo.
...
svn path=/trunk/; revision=44757
2012-09-03 19:33:45 +00:00
Martin Kaiser
d522ab8a42
add modelines for dvb sections
...
svn path=/trunk/; revision=44756
2012-09-03 18:50:21 +00:00
Martin Kaiser
a3bd9a410e
add editor modelines (that match the current indentation style)
...
svn path=/trunk/; revision=44755
2012-09-03 18:37:03 +00:00
Pascal Quantin
965a2f6904
Add missing newline at end of file
...
svn path=/trunk/; revision=44753
2012-09-03 17:11:55 +00:00
Jakub Zawadzki
78019edc99
cinfo.columns_changed is only used by ui/gtk, move it to cfile structure.
...
svn path=/trunk/; revision=44750
2012-09-03 15:12:49 +00:00
Pascal Quantin
01b374b714
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7666 :
...
Check that DRDA command has a minimum length of 10 bytes to prevent a potential infinite loop
svn path=/trunk/; revision=44749
2012-09-03 12:48:57 +00:00
Jakub Zawadzki
5ad3e5331e
MT: move global frame_end_routines to packet_info.
...
svn path=/trunk/; revision=44748
2012-09-03 12:00:40 +00:00
Jakub Zawadzki
1db996e051
MT: move global field_info_tmp to tree_data_t
...
svn path=/trunk/; revision=44747
2012-09-03 12:00:08 +00:00
Ronnie Sahlberg
b9d4af9675
SCSI: lots of MMC improvements and prettifications
...
svn path=/trunk/; revision=44745
2012-09-02 21:46:50 +00:00
Ronnie Sahlberg
fb44903de7
SCSI: Improve decoding of GET_EVENT_STATUS_NOTIFICATION
...
svn path=/trunk/; revision=44744
2012-09-02 20:02:29 +00:00
Evan Huus
9c924315b6
Use parentheses to clarify ambiguous operator precedence.
...
svn path=/trunk/; revision=44743
2012-09-02 17:12:12 +00:00
Evan Huus
d936fe6cf0
Fix compile with gcc. Mostly removing unused parameters and code.
...
Change one tvb_get_bits8 to tvb_get_bits16 since the queried length is
9 bits long (should this be added to checkAPI somehow?)
svn path=/trunk/; revision=44742
2012-09-02 16:46:39 +00:00
Anders Broman
12e5e625a6
From Mike Morrin:
...
Enhancemnt to GSM RLCMAC dissection adding dissection of data block headers
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7615
svn path=/trunk/; revision=44741
2012-09-02 15:05:43 +00:00
Gerald Combs
9008400689
[Automatic manuf, services and enterprise-numbers update for 2012-09-02]
...
svn path=/trunk/; revision=44738
2012-09-02 14:03:30 +00:00
Michael Mann
7da7443c00
length check "heuristics" for FF dissector (UDP + TCP)
...
Fix compiler error
"Fix" WTP+WSP packets incorrectly dissected as Foundation FieldBus packets https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4822
svn path=/trunk/; revision=44735
2012-09-02 02:28:55 +00:00
Guy Harris
980968ea29
Include packet-6lowpan.h in the release tarball.
...
svn path=/trunk/; revision=44732
2012-09-01 19:42:53 +00:00
Evan Huus
46a2eeecaf
Add expert warning when we get a mysql EOF marker and the
...
connection is in a state where we're not expecting one.
svn path=/trunk/; revision=44731
2012-09-01 16:20:43 +00:00
Evan Huus
fc4d43ec42
Add modelines and make indentation consistent.
...
svn path=/trunk/; revision=44730
2012-09-01 15:12:43 +00:00
Evan Huus
5745bb4382
Remove duplicate assignment (caught by cppcheck).
...
svn path=/trunk/; revision=44729
2012-09-01 15:00:49 +00:00
Evan Huus
ae3ff16465
Fix C++-style comment caught by checkAPI.
...
svn path=/trunk/; revision=44725
2012-09-01 13:02:14 +00:00
Anders Broman
89f2554ef1
Revert
...
length check "heuristics" for FF dissector (UDP + TCP)
"Fix" WTP+WSP packets incorrectly dissected as Foundation FieldBus packets https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4822
As it fails with
cc1: warnings being treated as errors
packet-ff.c: In function 'dissect_ff_tcp':
packet-ff.c:13061: warning: passing argument 7 of 'tcp_dissect_pdus' from incompatible pointer type
svn path=/trunk/; revision=44724
2012-09-01 12:06:58 +00:00
Anders Broman
e128334750
From Owen Kirby:
...
6LoWPAN: Automatic context detection and draft-ietf-6lowpan-nd-19 updates.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7521
svn path=/trunk/; revision=44723
2012-09-01 11:54:16 +00:00
Anders Broman
4b6ad1d9d7
From Michael Mann:
...
length check "heuristics" for FF dissector (UDP + TCP)
"Fix" WTP+WSP packets incorrectly dissected as Foundation FieldBus packets https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4822
svn path=/trunk/; revision=44722
2012-09-01 11:37:42 +00:00
Anders Broman
c44a7fba0d
From Litao Gao:
...
Implementation of IRemoteSCMActivator::RemoteCreateInstance and some minor bug fix
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7673
svn path=/trunk/; revision=44721
2012-09-01 11:22:29 +00:00
Anders Broman
607d32b00d
From David Ward: OSPF dissector: add filters for v3 LS Type field. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7684
...
svn path=/trunk/; revision=44720
2012-09-01 07:42:07 +00:00
Anders Broman
de809cc9e3
From Chris Elston:
...
Added L2TPv3 control message authentication checking
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7680
svn path=/trunk/; revision=44711
2012-08-31 09:39:52 +00:00
Anders Broman
1a8065acdc
From Chris Elston:
...
Split md5_hmac for incremental use
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7680
svn path=/trunk/; revision=44710
2012-08-31 09:29:34 +00:00
Anders Broman
f32baca6e1
From Chris Elston:
...
Split sha1_hmac for incremental use.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7680
svn path=/trunk/; revision=44709
2012-08-31 09:25:36 +00:00
Chris Maynard
3e976d69d1
tools/checkhf.pl reported 3 unused hf entries. Commented them out for now.
...
BTW:
tools/checkAPIs.pl reports 109 useless add_text()'s vs. 346 add_<something else>() calls (31.50%), under 50% threshhold, but not really that great.
tools/checkfiltername.pl reports 42 errors.
svn path=/trunk/; revision=44706
2012-08-30 20:36:53 +00:00
Jeff Morriss
3268b5b215
Remove trailing space in some hf names.
...
Add some hf names (some entries had only a space for a name).
Remove non-ASCII chars and C++/C99-style comments.
svn path=/trunk/; revision=44705
2012-08-30 20:22:09 +00:00
Pascal Quantin
fc83e532db
Display hf_dns_rr_opt_client_addr as FT_BYTES
...
svn path=/trunk/; revision=44704
2012-08-30 19:13:38 +00:00
Anders Broman
e94d8a0b7e
Add Japanese ISUP variant(not all IE's)
...
IE dissection code from Brian Mceniery.
svn path=/trunk/; revision=44703
2012-08-30 18:40:49 +00:00
Alexis La Goutte
a09f80e8be
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552
...
Add support for EDNS0 option from draft-vandergaast-edns-client-subnet-01
From me
* use/prefer proto_tree_add_item
* use switch() for optcode (may be there is other optcode later...)
svn path=/trunk/; revision=44702
2012-08-30 17:03:50 +00:00
Chris Maynard
733baac21e
Fix Session ID parsing. Patch from Fransesco Fondelli via bug 6881.
...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6881
svn path=/trunk/; revision=44701
2012-08-30 15:23:54 +00:00
Pascal Quantin
0e79405e0d
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7679 :
...
Do not try to set IR header length when the profile is unknown
svn path=/trunk/; revision=44700
2012-08-30 12:08:53 +00:00
Evan Huus
baf111a23c
Add casts to fix compilation with GCC.
...
Remove * from gconstpointers, they are already pointer types.
Add modelines to packet.c and clean up indentation a bit.
svn path=/trunk/; revision=44698
2012-08-29 22:19:29 +00:00
Jakub Zawadzki
2ec7c89c33
Fix memleak.
...
svn path=/trunk/; revision=44697
2012-08-29 22:14:55 +00:00
Michael Mann
e5e09f7016
Fix Bug 7348 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7348 )
...
svn path=/trunk/; revision=44696
2012-08-29 21:23:07 +00:00
Chris Maynard
cc3c9ba3e5
Allow wpa-psk decryption keys to be successfully entered.
...
Problems reported on ask.wireshark.org here:
1) http://ask.wireshark.org/questions/13951/invalid-key-format-wireshark-182
2) http://ask.wireshark.org/questions/13688/error-updating-record-invalid-key-format
#BACKPORT (to 1.8)
svn path=/trunk/; revision=44694
2012-08-29 16:15:01 +00:00
Pascal Quantin
a5c0d49ac2
Remove useless include (GeoIP initialization was removed from epan_init() in r43604)
...
svn path=/trunk/; revision=44692
2012-08-28 15:14:30 +00:00
Jakub Zawadzki
0e382b6668
Yet another case of bug #7316 (r42989) and bug #7668 (r44688)
...
Use correct field type for ccp.opt.oui
svn path=/trunk/; revision=44689
2012-08-28 09:10:34 +00:00
Jakub Zawadzki
d35ef03b15
Fix bug #7668
...
Use correct field type for lcp.opt.oui
svn path=/trunk/; revision=44688
2012-08-28 08:44:41 +00:00
Evan Huus
cb5a320d22
Fix a dead store and a few duplicate 'break' statements as caught by
...
clang and cppcheck.
svn path=/trunk/; revision=44687
2012-08-28 02:08:42 +00:00
Evan Huus
f3ca6e55ef
Remove variadic macro that accidentally made it in a while back.
...
svn path=/trunk/; revision=44686
2012-08-28 02:01:25 +00:00
Bill Meier
99173bf797
Fix 2 memory leaks;
...
Essentially: 'fid' & 'fragment' hash tables can be global (i.e., need not be 'per call')
thus removing g_malloc'd storage never freed because it was pointed to in
se_alloc'd structs.
Fixes Bug #4134 : https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4134
Also: fix a compile error when compiling with '#define DEBUG_DESEGMENT'
svn path=/trunk/; revision=44685
2012-08-27 16:17:38 +00:00
Pascal Quantin
74a43c3ada
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7622 :
...
Fix dissection of a few TDS fields (line number in ERR and MSG token, user type in RESULTS token, row count in DONE token) when the TDS version is >= 7.2.
Add a mechanism to memorize the TDS 7.X version in the conversation based on the TDS version found in LOGIN ACK token. This version is used for dissection when a TDS version is not set in preferences (TDS protocol type set to "not specified").
svn path=/trunk/; revision=44684
2012-08-27 11:47:37 +00:00
Jörg Mayer
df49549abf
Infrastructure for tcp decoding - nothing done to actually
...
decode the contents
svn path=/trunk/; revision=44683
2012-08-27 07:46:23 +00:00
Bill Meier
cbd2a8ff25
Fix two minor memory leaks.
...
svn path=/trunk/; revision=44682
2012-08-26 23:44:25 +00:00
Bill Meier
89c5e9796f
Fix 'Warn Dissector bug, protocol IAX2, in packet 62: proto.c:4406: failed assertion "fixed_item->parent == tree"'
...
svn path=/trunk/; revision=44681
2012-08-26 23:24:27 +00:00
Anders Broman
2aa9312c14
From Ilarion Ishkulov Multisegment PDUs are not reassembled properly with TCP dissector https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7544
...
svn path=/trunk/; revision=44680
2012-08-26 16:39:11 +00:00
Gerald Combs
d0c229641f
[Automatic manuf, services and enterprise-numbers update for 2012-08-26]
...
svn path=/trunk/; revision=44676
2012-08-26 14:03:31 +00:00
Jörg Mayer
15ee8b256a
Extend a comment.
...
svn path=/trunk/; revision=44675
2012-08-26 03:17:53 +00:00
Pascal Quantin
1c76cb5fef
From Sylvain Munaut via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7664 :
...
packet-gmr1_bcch: Add guards in the SI1/2 choice of segment
Although the CSN1 dissector itself will just stop if there is
no matching segment, it will leave the choice field uninitizalized
and so when we use it to fill some other text, it crashes ...
To protect against that, we put a last choice entry that will always
match. As a bonus, it triggers an explicit error in CSN so you
know something is wrong.
svn path=/trunk/; revision=44674
2012-08-25 21:31:29 +00:00
Pascal Quantin
f783da2d6d
From Sylvain Munaut via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7664 :
...
packet-gmr1_bcch: Whitespaces fixes
svn path=/trunk/; revision=44673
2012-08-25 21:19:47 +00:00
Pascal Quantin
6c12a7ffdc
From Sylvain Munaut via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7664 :
...
packet-gmr1_rr: Add support for "Assignment Command 1" messages
svn path=/trunk/; revision=44672
2012-08-25 21:16:08 +00:00
Pascal Quantin
88911f9102
From Sylvain Munaut via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7664 :
...
packet-gsmtap: Call GMR-1 RACH dissector when appropriate
svn path=/trunk/; revision=44671
2012-08-25 21:09:49 +00:00
Pascal Quantin
cd1ceaa04a
From Sylvain Munaut via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7664 :
...
Add GMR-1 RACH dissection
svn path=/trunk/; revision=44670
2012-08-25 21:04:48 +00:00
Pascal Quantin
502b9b06c5
Update protocol name to match the changes done in r44661
...
svn path=/trunk/; revision=44668
2012-08-25 13:54:39 +00:00
Pascal Quantin
7da4784b25
Following r44648, revert part of r44162 and followups so as to have a top level gsm_a filter name
...
svn path=/trunk/; revision=44667
2012-08-25 13:32:41 +00:00
Bill Meier
5452b8a20c
Extern (and use) extended value string instead of the associated value string array.
...
svn path=/trunk/; revision=44665
2012-08-25 01:20:32 +00:00
Michael Mann
030604ec29
cleanup g_malloc memory leaks
...
svn path=/trunk/; revision=44664
2012-08-25 00:55:46 +00:00
Bill Meier
2c32d31858
value_sring fixes;
...
- fix dup: use correct value for an entry (typo);
- comment out 2nd entry of a dup pair: 2 cases
svn path=/trunk/; revision=44663
2012-08-25 00:54:04 +00:00
Michael Mann
c7cbfac88d
cleanup some unnecessary g_malloc calls
...
svn path=/trunk/; revision=44662
2012-08-25 00:39:17 +00:00
Michael Mann
95d14df10a
effectively revert r44161, having the display filters favor '.' over '_'
...
svn path=/trunk/; revision=44661
2012-08-24 23:27:24 +00:00
Bill Meier
0035a9076b
Force extended value string linear search (not binary search) in one case:
...
Fixed: { -2, -1, 0, 1, 3} (note gap) used a binary search (which would fail);
Note: { -2, -1, 0, 1, 2 ,3 } (no gap) allowed; will still do a direct access;
Also: Add a comment to README.developer extended value string section.
svn path=/trunk/; revision=44659
2012-08-24 20:44:33 +00:00
Bill Meier
478199f349
Replace dup value_string array entry with correct entry; (dup was typo)
...
svn path=/trunk/; revision=44657
2012-08-24 20:07:52 +00:00
Bill Meier
4794f67904
Allow extended value string binary search (istead of linear search): re-order value_srring array entries slightly.
...
svn path=/trunk/; revision=44656
2012-08-24 19:49:53 +00:00
Michael Mann
6f8f3fdd42
match display filter prefix for all filters
...
svn path=/trunk/; revision=44653
2012-08-24 02:48:36 +00:00
Michael Mann
49ae61370e
Adding period to proto filter name for being part of the "diameter" grouping.
...
svn path=/trunk/; revision=44652
2012-08-24 02:17:42 +00:00
Michael Mann
4d80811c3e
minor display filter field typos
...
svn path=/trunk/; revision=44651
2012-08-24 02:04:10 +00:00
Michael Mann
14f3f8c55a
Add period separator for "base" proto filter name.
...
svn path=/trunk/; revision=44650
2012-08-24 02:02:22 +00:00
Jeff Morriss
64fa3d4036
Don't call dissect_custom_message() when it's not initialized.
...
svn path=/trunk/; revision=44646
2012-08-23 19:07:24 +00:00
Bill Meier
c591c6dd56
Comment out all but first value_string array entries with dup values:
...
kept: first dup since that's the one which would
be found with a linear search.
svn path=/trunk/; revision=44642
2012-08-23 17:30:42 +00:00
Bill Meier
7cd408ebf4
Replace dup value (typo ?) with what seems to be the correct value.
...
svn path=/trunk/; revision=44640
2012-08-23 17:24:46 +00:00
Bill Meier
2c616e40af
Fix incorrect value (typo) in value-string array.
...
svn path=/trunk/; revision=44639
2012-08-23 17:22:13 +00:00
Bill Meier
4922d9ed17
Comment out dups (many of which are marked "deprecated" in packet-x11-keysymdef.h)
...
svn path=/trunk/; revision=44638
2012-08-23 17:18:26 +00:00
Bill Meier
7641d97020
Cleanup: Whitespace and long lines;
...
Also: remove a few boilerplate comments.
svn path=/trunk/; revision=44637
2012-08-23 17:11:36 +00:00
Bill Meier
da57a45b8c
value-string arrays - allow "direct" access: fix dup val & fill in a "gap".
...
svn path=/trunk/; revision=44636
2012-08-23 15:38:03 +00:00
Bill Meier
8753b28b5a
Fix extended value-string linear search: Move out-of-order value-string array entry.
...
svn path=/trunk/; revision=44635
2012-08-23 12:53:36 +00:00
Bill Meier
98774f5734
Fix extended value-string linear search: remove 2 dups from value-string array.
...
svn path=/trunk/; revision=44634
2012-08-23 12:51:32 +00:00
Jörg Mayer
dd659430a3
Replace hand crafted be-le conversion by its glib counterpart.
...
That way processor specific optimizations may be picked up.
svn path=/trunk/; revision=44631
2012-08-23 12:20:25 +00:00
Jörg Mayer
b43901043a
Remove commented out rules
...
Whitespace fixes
svn path=/trunk/; revision=44629
2012-08-23 10:34:45 +00:00
Jörg Mayer
5c1392f035
Update spec link to version 2.1
...
svn path=/trunk/; revision=44627
2012-08-23 09:45:15 +00:00
Jörg Mayer
c35eb920fe
Add comment where to find the specification
...
svn path=/trunk/; revision=44626
2012-08-23 09:40:08 +00:00
Jörg Mayer
96aa6f41fb
Add link to version 1 specification.
...
Remote trailing whitespcace.
svn path=/trunk/; revision=44625
2012-08-23 09:31:57 +00:00
Guy Harris
e835108dda
Get rid of unnecessary function pointer - just directly call the
...
function in the switch statement. This keeps us from calling through an
uninitialized pointer for custome parameter numbers other than
LLRP_VENDOR_IMPINJ (as warned of by at least some compilers).
svn path=/trunk/; revision=44624
2012-08-23 04:45:56 +00:00
Evan Huus
272a95a9d6
From Martin Kupec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7658
...
Major enhancements to the LLRP dissector.
svn path=/trunk/; revision=44621
2012-08-23 03:03:54 +00:00
Evan Huus
2af3ce88bd
From Martin Kupec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7658
...
Don't pass string-related encoding flags to get_uint_value() when handling
FT_UINT_STRING fields. This was causing all such fields with non-ASCII
encodings to use little-endian encoding, even when OR-ed with ENC_BIG_ENDIAN.
(not actually the topic of the above bug, but discovered during LLRP protocol
testing, which was the topic of the above bug)
svn path=/trunk/; revision=44619
2012-08-23 02:48:26 +00:00
Guy Harris
c2a8aa2bee
Put the state of flags in the hop_flags field into the summary line.
...
Note in the introductory comment what "LISP" refers to, for the benefit
of those of us who grew up thinking it stood for "LISt Processing".
svn path=/trunk/; revision=44617
2012-08-22 21:01:46 +00:00
Pascal Quantin
ae7d61bd1c
Try to make Ubuntu buildbot happy
...
svn path=/trunk/; revision=44615
2012-08-22 20:15:54 +00:00
Martin Mathieson
7e88a07e71
proto_item_append_string() doesn't work this case, so stop using it.
...
I am tempted though to chage proto_item_append_string() just be like
proto_item_append_text() without the call to g_vsnprintf(), which is the
expensize part I was hoping to avoid.
svn path=/trunk/; revision=44614
2012-08-22 19:01:01 +00:00
Pascal Quantin
7210419f96
From Loránd Jakab via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7654 :
...
Add features to the Locator/ID Separation Protocol (LISP) dissector
svn path=/trunk/; revision=44613
2012-08-22 16:37:41 +00:00
Anders Broman
2b905a1b6a
Add French National parameter https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7656
...
svn path=/trunk/; revision=44612
2012-08-22 13:35:20 +00:00
Evan Huus
51fa4645a0
From Teguh via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7657
...
Replace the last instance of gnutls_datum with gnutls_datum_t. The former
is deprecated, and the latter is already being used elsewhere in the file.
svn path=/trunk/; revision=44611
2012-08-22 00:53:13 +00:00
Martin Mathieson
d847bc85a5
Delete the ROHC from here as it is superceded by packet-rohc.c
...
svn path=/trunk/; revision=44610
2012-08-21 21:37:31 +00:00
Martin Mathieson
1470f4a6b7
Call proto_item_append_string() rather than proto_item_append_text()
...
when there are no specifiers.
svn path=/trunk/; revision=44609
2012-08-21 21:36:59 +00:00
Martin Mathieson
f6b1932a8a
Use tvb_get_stringz() rather than tvb_get_const_stringz(). I know that
...
these strings will be in a single, contiguous tvb...
svn path=/trunk/; revision=44607
2012-08-21 17:17:53 +00:00
Martin Mathieson
973be664bb
Use proto_item_append_string() rather than proto_item_append_text() with
...
%s.
svn path=/trunk/; revision=44606
2012-08-21 17:12:13 +00:00
Pascal Quantin
f2fbb79c49
Add dissection of locationInformation IE in Ericsson proprietary extension
...
svn path=/trunk/; revision=44605
2012-08-21 15:14:50 +00:00
Pascal Quantin
9f3c1253f7
Fix filter names for Ericsson proprietary extensions
...
svn path=/trunk/; revision=44604
2012-08-21 10:40:04 +00:00
Pascal Quantin
91a531739f
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7648 :
...
Add support for Ericsson proprietary extensions to GSM MAP dissector
svn path=/trunk/; revision=44603
2012-08-21 09:32:04 +00:00
Pascal Quantin
dfc983d9ce
Remove unused hf_gsm_map_imsi_digits entry and fix filter name for hf_gsm_map_TBCD_digits (which is also used for IMEI, ASCI call reference, MS Group ID and MS Long Group ID on top of IMSI)
...
svn path=/trunk/; revision=44596
2012-08-20 12:47:47 +00:00
Pascal Quantin
45a25dbf9e
Avoid defining 2 entries with incompatible types (FT_BYTES vs FT_NONE) and same filter
...
svn path=/trunk/; revision=44595
2012-08-20 09:28:01 +00:00
Sake Blok
66115d1200
Enhance the http dissector to correctly reassemble http
...
headers when the first tcp segment does not contain a
full line.
svn path=/trunk/; revision=44593
2012-08-19 23:52:37 +00:00
Gerald Combs
44cb77d8de
Handle double-clicks in the tree.
...
svn path=/trunk/; revision=44592
2012-08-19 23:52:08 +00:00
Anders Broman
22c537a5f9
Try to fix the buildbot
...
svn path=/trunk/; revision=44588
2012-08-19 21:08:54 +00:00
Pascal Quantin
c48bc11626
Apply the speed improvement from r44578 to 64bits variant and length determinant decoding.
...
Compute the buffer size so that it can contain the field name and the bit string display.
svn path=/trunk/; revision=44586
2012-08-19 18:15:20 +00:00
Gerald Combs
b2803dcce7
[Automatic manuf, services and enterprise-numbers update for 2012-08-19]
...
svn path=/trunk/; revision=44582
2012-08-19 14:03:36 +00:00
Martin Kaiser
85c1776429
highlight only the bytes that actually belong to the CAT
...
svn path=/trunk/; revision=44579
2012-08-19 12:53:13 +00:00
Martin Mathieson
55e386dd5d
Calling g_strlcat() for every bit of a constrained integer was really
...
slow. Track the index and write the characters directly (while still
carefully checking that we don't spill the buffer).
svn path=/trunk/; revision=44578
2012-08-19 03:55:51 +00:00
Martin Mathieson
053c3e7e24
Correct a number in a value_string.
...
Spotted in a profile that match_strval_ext() was calling
match_strval_linear() a lot (this value_string has 1476 entries - it was
epensive!).
Found error by adding temp debug to _match_strval_ext_init() - do we
ever expect the entries not to be in order? Am wondering if the warning
should be committed.
svn path=/trunk/; revision=44576
2012-08-19 02:27:13 +00:00
Martin Mathieson
cc0130e809
Save time by not appending byte values to the SDU item if will be hidden anyway (as happens
...
when RLC dissector is called).
svn path=/trunk/; revision=44574
2012-08-19 01:56:39 +00:00
Michael Mann
6c0e747f61
use session allocated memory for rtp_add_address/srtp_add_address hash tables
...
svn path=/trunk/; revision=44571
2012-08-19 00:21:26 +00:00
Pascal Quantin
5bce9d0d7d
Move deciphering routine in a function and adapt it for unacknowledged mode
...
svn path=/trunk/; revision=44568
2012-08-18 20:25:54 +00:00
Michael Mann
296871713f
make hash key session scoped
...
cleanup g_snprintf
svn path=/trunk/; revision=44565
2012-08-18 19:22:22 +00:00
Michael Mann
493516fd6c
Convert GString to emem_strbuf_t in packet-gadu-gadu.c
...
Required an additional function, ep_strbuf_append_unichar, in emem module
svn path=/trunk/; revision=44564
2012-08-18 19:20:31 +00:00
Guy Harris
ff6a33fdb4
Mark a parameter as unused.
...
Clean up indentation and get rid of trailing white space.
svn path=/trunk/; revision=44562
2012-08-18 06:53:39 +00:00
Guy Harris
549d81fe37
epan/dissectors/packet-ansi_map.c shouldn't be edited - it's generated
...
from the files in asn1/ansi_map. Update packet-ansi_map-template.c to
reflect the use of session-scope-allocated data for the saved invoke
data, and regenerate the dissector - which means that
TransactionId_table_cleanup() still exists, and is still used, it just
frees only the hash table key, which is g_strdup()ed, not the value,
which is automatically freed when the session-scope-allocated data is
all freed.
svn path=/trunk/; revision=44561
2012-08-18 06:33:08 +00:00
Guy Harris
c3caa3ba4f
epan/dissectors/packet-ansi_tcap.c shouldn't be edited - it's generated
...
from the files in asn1/ansi_tcap. Update packet-ansi_tcap-template.c to
reflect the use of session-scope-allocated data for the saved invoke
data, and regenerate the dissector - which means that
TransactionId_table_cleanup() still exists, and is still used, it just
frees only the hash table key, which is g_strdup()ed, not the value,
which is automatically freed when the session-scope-allocated data is
all freed.
svn path=/trunk/; revision=44560
2012-08-18 06:20:32 +00:00
Michael Mann
14a6d40267
Use capture scoped memory for hash table functionality
...
svn path=/trunk/; revision=44559
2012-08-18 02:55:18 +00:00
Michael Mann
db98d944e5
Use capture scoped memory for hash table functionality
...
svn path=/trunk/; revision=44558
2012-08-18 02:54:06 +00:00
Michael Mann
5672bee3a8
Fix bug 7650 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7650 )
...
prefs.gui_colorized_fg and prefs.gui_colorized_bg not properly integrated into newer preference architecture
svn path=/trunk/; revision=44557
2012-08-18 02:47:37 +00:00
Pascal Quantin
6d711993f7
Squelch a few "dereferencing type-punned pointer" warnings when compiling with GCC 4.1.3
...
svn path=/trunk/; revision=44553
2012-08-17 17:29:51 +00:00
Ronnie Sahlberg
a6c45b0582
iSCSI: DATA-IN only contain LUN and TTT iff the A-bit is set
...
svn path=/trunk/; revision=44550
2012-08-17 03:51:43 +00:00
Bill Meier
98eab94319
Cleanup:
...
- remove/rework some 'if (tree)' usage so that:
. col_...() not called under same;
. dissection doesn't change depending upon same;
- simplify some code;
- use consistent indentation & whitespace formatting.
svn path=/trunk/; revision=44546
2012-08-16 23:52:27 +00:00
Bill Meier
a9bb084310
Fix (minor ?) memory leak;
...
General cleanup:
- use expert...() instead of a 'printf()';
- #include <stdio.h> only if debug enabled;
- remove unneeded variable initializations;
- localize some variables;
- reformat hf[] entries;
- use consistent whitespace formatting.
svn path=/trunk/; revision=44545
2012-08-16 19:58:29 +00:00
Bill Meier
1b8e41afab
General cleanup of whitespace formatting.
...
svn path=/trunk/; revision=44543
2012-08-16 18:06:57 +00:00
Bill Meier
cf706ca547
From Stefan Metzmacher: Updates for the SMB2/3
...
This patches add some missing things for SMB2/3 and support for decryption
of SMB3 traffic
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7645
From me: Change an initializer from C99 to C89 style (since the
Microsoft compiler doesn't support C99).
svn path=/trunk/; revision=44542
2012-08-16 17:03:07 +00:00
Bill Meier
832b999c2c
- Don't call col...() under 'if (tree)';
...
- Move proto_reg_handoff...() to the end of the file;
- Remove some uneeded variable initialization;
- Use consistent indentation (e.g., no 4 space tabs) and whitespace formatting.
svn path=/trunk/; revision=44541
2012-08-16 15:53:39 +00:00
Michael Mann
3329b7f0a7
restore tvb_ensure_bytes_exist checks. There are better ways to do this, but for now, keep the buildbots happy.
...
Also some other cleanup noticed while trying to fix buildbot fuzz failure.
svn path=/trunk/; revision=44540
2012-08-16 13:58:12 +00:00
Bill Meier
9c7f4006c0
Add editor modelines;
...
Do minor whitespace reformatting.
svn path=/trunk/; revision=44539
2012-08-16 13:51:54 +00:00
Bill Meier
51cc4887d2
col_...() and expert...() fcns should not be under 'if (tree)';
...
'tab-width/tabstop/tabSize' in editor modelines should really always be 8;
svn path=/trunk/; revision=44538
2012-08-16 13:44:40 +00:00
Bill Meier
f3fe778851
'tab-width/tabstop/tabSize' in editor modelines should really always be 8;
...
Also:
- In one case #include <epan/prefs.h> not needed;
- Do some minor whitespace reformatting.
svn path=/trunk/; revision=44537
2012-08-16 13:17:48 +00:00
Pascal Quantin
12a705af47
Miscellaneous changes:
...
- move channel information before header dissection
- add channel information to TM and RLC Control PDUs
- take into account rlc information in rlc_is_ciphered function
- update function prototypes according to the coding rules used in packet-rlc.c
svn path=/trunk/; revision=44535
2012-08-15 21:45:32 +00:00
Pascal Quantin
e5b7968030
Fix some headers fields that were wrongly marked as 64 bits instead of 32 bits
...
svn path=/trunk/; revision=44533
2012-08-15 20:43:00 +00:00
Martin Kaiser
c6cf211ccf
dissect ake_send_pairing_info message
...
svn path=/trunk/; revision=44528
2012-08-15 19:40:22 +00:00
Martin Kaiser
af9a518763
move hdcp2 dissector to a separate file
...
use hdcp2 for protocol name, info column and filter names
(actually, hdcp and hdcp2 have nothing in common -
hdcp2 was a complete redesign to fix security issues in hdcp)
svn path=/trunk/; revision=44527
2012-08-15 19:22:05 +00:00
Martin Kaiser
168a40cb4d
hdcp2: dissect ake_no_stored_km message
...
svn path=/trunk/; revision=44526
2012-08-15 18:58:07 +00:00
Michael Tüxen
91f65904c2
Recommit:
...
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=44502
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=44511
and do some whitespace cleanups while there.
svn path=/trunk/; revision=44522
2012-08-15 16:02:01 +00:00
Michael Mann
3d40a7b94f
Updated MPLS dissectors display filters per checkfiltername.pl
...
Tried to provide consistency with MPLS dissector filter names
svn path=/trunk/; revision=44521
2012-08-15 15:52:27 +00:00
Michael Tüxen
171e2abe13
Get it compiling.
...
svn path=/trunk/; revision=44518
2012-08-15 15:28:26 +00:00
Michael Mann
3082032be6
convert GStrings to more "ephemeral friendly" use.
...
svn path=/trunk/; revision=44515
2012-08-15 13:56:59 +00:00
Michael Mann
a3db9aedfb
bugfix minor memory leaks with GString use
...
svn path=/trunk/; revision=44514
2012-08-15 13:55:29 +00:00
Pascal Quantin
870b536e6c
Fix field type for some 64 bits header fields
...
svn path=/trunk/; revision=44513
2012-08-15 13:42:46 +00:00
Michael Tüxen
54e5d13d4b
Move registration to a better place.
...
svn path=/trunk/; revision=44511
2012-08-15 06:14:10 +00:00
Pascal Quantin
d34ca4d69d
From Jan de Jongh via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7624 :
...
dissect_per_constrained_integer_64b fails for 64 bits
svn path=/trunk/; revision=44510
2012-08-14 22:12:31 +00:00
Chris Maynard
03a9a37863
Don't add proto_bssap to the tree twice, once as a hidden item and once using proto_tree_add_text(). Instead use proto_tree_add_protocol_format(). Problem reported here: http://article.gmane.org/gmane.network.wireshark.user/14509
...
svn path=/trunk/; revision=44509
2012-08-14 21:58:36 +00:00
Michael Tüxen
08280810b7
Register DIAMETER/DTLS/SCTP.
...
svn path=/trunk/; revision=44502
2012-08-14 20:53:39 +00:00
Jeff Morriss
70851c9765
Register for Diameter's SCTP PPID.
...
svn path=/trunk/; revision=44501
2012-08-14 20:44:58 +00:00
Michael Tüxen
e7a645ad9f
Update SCTP PPIDs.
...
This also fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7635
svn path=/trunk/; revision=44500
2012-08-14 20:31:49 +00:00
Michael Mann
c3f223d356
Bug 3725 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3725 )
...
Have giop dissector use more ephemeral memory.
Update idl2wrs dissector generator accordingly.
svn path=/trunk/; revision=44498
2012-08-14 18:33:58 +00:00
Michael Mann
5dd7371960
more ephemeral memory cleanup
...
svn path=/trunk/; revision=44496
2012-08-14 17:58:41 +00:00
Jakub Zawadzki
bc67498fb4
cleanup get_column_format_matches()
...
fmt_list[format] is set to TRUE on begin of function as 'obvious' thing to do
svn path=/trunk/; revision=44494
2012-08-14 16:58:34 +00:00
Michael Mann
4108285179
fix subtle g_strdup_printf() memory leaks with ephemeral memory
...
svn path=/trunk/; revision=44491
2012-08-14 16:29:38 +00:00
Michael Mann
c7a6af44bb
convert g_strdup_printf() to ep_strdup_printf()
...
svn path=/trunk/; revision=44490
2012-08-14 16:13:18 +00:00
Michael Mann
f929edfe09
Have strings use ephemeral memory. This dissector appears to need a massive overhaul to using proto_tree_add_item, but for now I'll settle for using ephemeral memory.
...
svn path=/trunk/; revision=44488
2012-08-14 15:36:13 +00:00
Evan Huus
6960a27c75
From Bodo Petermann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7632
...
Fix dissection of ISUP message Generic Numbers with no digits.
svn path=/trunk/; revision=44487
2012-08-14 11:58:20 +00:00
Graham Bloice
5a93983e41
Various DNP3 cleanups and fixes:
...
1. Fix time displayed in object values when using relative time from a CTO.
2. Fix some text for IIN flags regarding Outputs in local control
3. Try out DNP3 as a heuristic dissector.
svn path=/trunk/; revision=44486
2012-08-14 11:52:46 +00:00
Graham Bloice
c0ed3ba818
Added proto_tree_free to the libwireshark expoert definitions for use in plugins
...
svn path=/trunk/; revision=44485
2012-08-14 11:24:22 +00:00
Gerald Combs
a9f5507086
Keep field_info_tmp from being prematurely freed. Better fix for bug 7621.
...
svn path=/trunk/; revision=44478
2012-08-13 22:43:17 +00:00
Martin Kaiser
aeb9a630d8
use correct protocol id for hdcp2
...
svn path=/trunk/; revision=44477
2012-08-13 21:02:47 +00:00
Gerald Combs
7950fc1c94
Add length checks to make sure we don't underflow an integer. Make
...
sure we allocate and copy the same amount of data. Fixes bug 7621.
svn path=/trunk/; revision=44476
2012-08-13 19:30:42 +00:00
Bill Meier
a9424a9284
From Tobias Rutz; Minor updates.
...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7518
svn path=/trunk/; revision=44475
2012-08-13 18:54:58 +00:00
Jörg Mayer
a55aba13a2
- dissect_skype -> dissect_skype_udp
...
- track conversations to record the global src and dst addresses
for later crc and rc4
svn path=/trunk/; revision=44473
2012-08-13 18:07:28 +00:00
Jörg Mayer
a866adef25
- One of the unknown values is probably the (global) destination address
...
- Update comments
svn path=/trunk/; revision=44472
2012-08-13 16:52:12 +00:00
Jörg Mayer
606cd90224
Fix typo in comment
...
svn path=/trunk/; revision=44469
2012-08-13 16:20:42 +00:00
Evan Huus
ad759c88f8
Safely handle empty OIDs and other weird cases where we can't find a sub-id.
...
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7219
svn path=/trunk/; revision=44460
2012-08-12 21:04:39 +00:00
Bill Meier
38b39b6b77
Add 'fragment_table_destroy()'
...
svn path=/trunk/; revision=44459
2012-08-12 20:53:17 +00:00
Gerald Combs
517ef559c2
Fix a copy/paste error which triggered bug
...
svn path=/trunk/; revision=44456
2012-08-12 15:48:36 +00:00
Jakub Zawadzki
0cf7f5087d
Revert r41311, fix bug #7581
...
svn path=/trunk/; revision=44454
2012-08-12 15:08:00 +00:00
Gerald Combs
645d61c2e7
[Automatic manuf, services and enterprise-numbers update for 2012-08-12]
...
svn path=/trunk/; revision=44450
2012-08-12 14:03:33 +00:00
Evan Huus
3db7e4c5ae
Create a function for dissecting address blocks, and use it in
...
several places.
svn path=/trunk/; revision=44449
2012-08-12 13:45:02 +00:00
Evan Huus
7120972f9e
Add modelines. Make sure all #defines are prefixed by the dissector
...
name to avoid collisions.
svn path=/trunk/; revision=44448
2012-08-12 12:54:47 +00:00
Pascal Quantin
765c81a932
Revert r44441: pinfo may be NULL only when pi is not NULL
...
svn path=/trunk/; revision=44445
2012-08-11 17:57:18 +00:00
Jörg Mayer
f0486d582a
After commit r44435: pinfo -> NULL
...
svn path=/trunk/; revision=44441
2012-08-11 07:10:40 +00:00
Gerald Combs
72ddab2c98
Instead of calling DISSECTOR_ASSERT() whenever we get an invalid length,
...
add an expert item. For unusable lengths throw ReportedBoundsError but
try to continue on otherwise.
Based on a patch from Mike Morrin in bug 3884.
svn path=/trunk/; revision=44439
2012-08-10 23:05:04 +00:00
Bill Meier
638d74d43f
Use val_to_str_const() where appropriate;
...
Also (for a few files):
- create/use some extended value strings;
- remove unneeded #include files;
- remove unneeded variable initialization;
- re-order fcns slightly so prefs_reg_handoff...() at end, etc
svn path=/trunk/; revision=44438
2012-08-10 22:55:02 +00:00
Gerald Combs
e6ffe7b59b
Add a missing NULL check pointed out by Jakub.
...
svn path=/trunk/; revision=44437
2012-08-10 22:52:04 +00:00
Bill Meier
23ed5c6320
Bug fixes and general cleanup;
...
- untermintated range-string array can/will cause crash
(e.g. 'tshark -G values');
- remove all 'if (tree)':
calling col_...() and sub-dissectors under 'if (tree)' not OK;
- simplify code for heuristic test;
- find_dissector() calls need to be done only once
(not on each prefs callback);
- do some whitespace/indentation changes.
svn path=/trunk/; revision=44436
2012-08-10 22:20:28 +00:00
Gerald Combs
cd3cca7edc
Make the corresponding packet_info available to each tree item. This
...
lets us pass a NULL pinfo to expert_add_info_format() and
expert_add_undecoded_item(), which makes it possible to use those
routines deep in the bowels of many dissectors. As a proof of concept
remove the recent pinfo additions to packet-afp.c. This should also make
it easier to fix bug 3884.
svn path=/trunk/; revision=44435
2012-08-10 20:33:01 +00:00
Pascal Quantin
f464eb4b58
Fix missing dissection of HSDSCH-Paging-System-InformationFDD (bug introduced in r44037) and HSDSCH-MACdPDUSizeFormat (bug introduced in r44423).
...
While we are at it, fix a few typo errors.
svn path=/trunk/; revision=44434
2012-08-10 18:41:40 +00:00
Bill Meier
7f4dcbb055
Subdissectors & etc shouldn't be under 'if (tree)';
...
Use val_to_str_const() as appropriate.
svn path=/trunk/; revision=44429
2012-08-10 17:41:48 +00:00
Bill Meier
2d81e31f18
General cleanup:
...
- Add svn:keywords and svn:eol-style properties;
- col_...() and expert...() shouldn't be done under 'if (tree)';
- #if 0 an unused value-string;
- Use val_to_str_const as appropriate;
- Do some reformatting (whitespace changes).
svn path=/trunk/; revision=44426
2012-08-10 17:03:59 +00:00
Anders Broman
3cf2df1ef5
Try to make the buildbot happy.
...
svn path=/trunk/; revision=44425
2012-08-10 15:59:35 +00:00
Anders Broman
0e68cac192
From Jacob Nordgren and Rishie Sharma:
...
RLC: changed so reassembly fail flag is set per channel instead of globally.
RLC: added reset channel function
Added support for reconfigurin HSDSCH flows, and E-DCH flows (just needs to figure out when it should become active for 'overloaded' ports), also changed slightly how ehs headers are configured in nbap.
Removed extra (debugging) port in nbap
This is the last patch set for a while.
svn path=/trunk/; revision=44423
2012-08-10 15:22:50 +00:00
Jeff Morriss
9802b80159
From Stephen Donnelly via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7563 :
...
Remove another invalid array write.
svn path=/trunk/; revision=44419
2012-08-10 13:00:20 +00:00
Anders Broman
29140b97c3
From Jacob Nordgren and Rishie Sharma:
...
RLC: fixed weird dereferencing of things that were not pointers
svn path=/trunk/; revision=44418
2012-08-10 09:45:06 +00:00
Jörg Mayer
8b16955d3c
Looks like some packets in the sample trace have type 0,
...
so add Unknown_0 to the mix
svn path=/trunk/; revision=44416
2012-08-10 08:35:21 +00:00
Jörg Mayer
f86358dc69
The packet id seems to be only 16 bits. The "extra" 4 bits
...
may be a subtype or additional information for the type.
svn path=/trunk/; revision=44415
2012-08-10 08:08:50 +00:00
Bill Meier
c6289587ed
General cleanup:
...
- remove 'if (tree)'
* col_...() shouldn't be called under 'if (tree)';
* new-style dissector should alwyas return same 'bytes dissected'
(independent of 'if (tree)');
- create/use extended value string;
- Use consistent indentation;
svn path=/trunk/; revision=44414
2012-08-10 03:19:13 +00:00
Michael Mann
1d9c472cae
convert some simple uses to use ephemeral memory
...
svn path=/trunk/; revision=44413
2012-08-10 02:05:19 +00:00
Jörg Mayer
94b65da547
Beginnings of a Skype dissector. Requires "decode as".
...
svn path=/trunk/; revision=44412
2012-08-10 00:35:00 +00:00
Martin Mathieson
5f1b2bd6ed
If not configured to call MAC for MAC-is PDUs, don't (avoiding
...
assertion). Do show extent of MAC-is PDU.
Didn't it used to show the MAC-is SDUs inside too?
svn path=/trunk/; revision=44411
2012-08-10 00:34:39 +00:00
Gerald Combs
5107d75c82
Try to fix a compiler warning.
...
svn path=/trunk/; revision=44408
2012-08-09 22:45:43 +00:00
Jeff Morriss
3bbeaec351
Don't leak memory when loading UATs. Also reformat a bit.
...
svn path=/trunk/; revision=44407
2012-08-09 22:29:46 +00:00
Gerald Combs
54fcbe03ff
Add a check for the number of nodes. Fixes a DoS in bug 7573 reported by
...
Ben Schmidt.
svn path=/trunk/; revision=44403
2012-08-09 22:04:46 +00:00
Gerald Combs
015f22cc9a
Use wording that's more in line with other expert messages.
...
svn path=/trunk/; revision=44402
2012-08-09 22:02:28 +00:00
Gerald Combs
097f33c41d
Iterate over the emem_tree_*32_array key data instead of using
...
recursion. I've only done minimal testing but it seems to work OK.
svn path=/trunk/; revision=44401
2012-08-09 21:46:34 +00:00
Martin Kaiser
9f4c89bad3
call mpeg_pmt dissector directly for CI+ tune_broadcast_req apdu
...
svn path=/trunk/; revision=44400
2012-08-09 20:24:50 +00:00