Commit Graph

19426 Commits

Author SHA1 Message Date
Jakub Zawadzki 5376508e7d Fix bug #7669: Preference editor removes (does not save) column definitions after the 27th.
put_string_list() was generating string with list of columns to be saved to preference file, 
but buffer is limited to MAX_FMT_PREF_LEN (1024 bytes). It looks like 1024 bytes is not enough.

Fix bug by writting directly to file.


svn path=/trunk/; revision=45043
2012-09-21 12:29:04 +00:00
Anders Broman 467976f37f Assuming transport_protocol is a guint8.
svn path=/trunk/; revision=45042
2012-09-21 11:54:30 +00:00
Anders Broman ff1a7d93bf From Michal Labedzki:
Bluetooth: Provide PSM for higher layers

This is needed by AVRCP, HCRP and AVDTP to recognize other substreams.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7740

svn path=/trunk/; revision=45041
2012-09-21 11:30:53 +00:00
Anders Broman 1684c38d44 From Michal Labedzki:
Add SAP dissector

Add Bluetooth Profile SAP. Supported version: 1.1.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7715

svn path=/trunk/; revision=45040
2012-09-21 11:14:33 +00:00
Anders Broman aa3c9034f5 From Michal Labedzki:
Bluetooth: Cleanup headers
Remove redundant headers and sort existing to chosen convention.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7639

svn path=/trunk/; revision=45039
2012-09-21 10:49:44 +00:00
Anders Broman 8974a27357 From Michal Labedzki:
FCS is not part of "Control" subtree so move it.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7639

svn path=/trunk/; revision=45038
2012-09-21 10:39:15 +00:00
Anders Broman 0382e69331 From Michal Labedzki:
Bluetooth: Improve internal Decode By Channel for RFCOMM

Use UAT to allow user to force set top dissector per channel.
Only first found dissection for specified channel is used,
the rest can be used as well-known protocol on channel, but not for
current logs.  Also user can turn on/off this dissection by one-click
preference.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7639

svn path=/trunk/; revision=45037
2012-09-21 08:52:45 +00:00
Guy Harris b36016fc1d I guess the IETF is now keeping expired I-Ds around; alternic doesn't
have that one any more.

svn path=/trunk/; revision=45030
2012-09-20 20:17:53 +00:00
Jörg Mayer fad5d18b8b Add URL for WCCP V2 revision 1
svn path=/trunk/; revision=45028
2012-09-20 18:36:12 +00:00
Martin Kaiser 0bacfd7ec9 started a dissector for DTCP-IP
(Digital Transmission Content Protection over IP)

svn path=/trunk/; revision=45027
2012-09-20 17:46:42 +00:00
Jeff Morriss 8f0d5f99c6 As suggested by Xavier Raynaud in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6425 :
scanner.c includes (depends on) grammar.h so mark it so in the Makefiles.

svn path=/trunk/; revision=45020
2012-09-20 03:04:48 +00:00
Jeff Morriss 2552c750e5 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
Jeff Morriss 3729335973 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45016
2012-09-20 01:48:30 +00:00
Jeff Morriss 300eb81514 Fix up some indentation and trailing white space.
svn path=/trunk/; revision=45009
2012-09-19 19:34:17 +00:00
Chris Maynard 4b5a9a2663 Since r41681, IPv6 sets pinfo->ip_ttl as the hop limit, so display that in the
INFO column, similar to how IPv4 displays the TTL.

svn path=/trunk/; revision=45008
2012-09-19 19:12:25 +00:00
Chris Maynard 86db174948 Fix request/response tracking with checksum corner case.
svn path=/trunk/; revision=45007
2012-09-19 17:57:54 +00:00
Martin Mathieson d729f21ad2 Revert r45005.
svn path=/trunk/; revision=45006
2012-09-19 16:56:59 +00:00
Martin Mathieson a232ae9242 Make proto_item_append_string() behave sanely, and use it in a few more
dissectors.

svn path=/trunk/; revision=45005
2012-09-19 11:58:32 +00:00
Pascal Quantin 0543f20a15 From LI Hai via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7736 :
Fix dissection error of D-RELEASE and D-CONNECT in TETRA dissector

svn path=/trunk/; revision=45004
2012-09-19 11:02:19 +00:00
Jörg Mayer 30b7b74dde Remove #defines that provided backward source compatibility
for deprecated dissector add/remmove/... functions.

svn path=/trunk/; revision=45000
2012-09-19 07:20:49 +00:00
Ronnie Sahlberg bce733e4d8 SCSI: Dont show two reserved bytes in the decode pane for standard INQ page
svn path=/trunk/; revision=44999
2012-09-19 02:12:38 +00:00
Alexis La Goutte b6e0cc28a5 From Daniel via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7716
Adding VHT Radiotap fields support

Parsing and UI representation for recently adopted VHT Radiotap fields for
802.11ac specification
http://www.radiotap.org/defined-fields/VHT 

From me :
* Make checkAPIs happy
* Fix wrong last argument for some proto_tree_add_item
* Use proto_tree_add_item when it is possible

svn path=/trunk/; revision=44985
2012-09-18 20:46:05 +00:00
Jakub Zawadzki a016cd7740 Revert r44978: dissector_add_uint: Legalize formerly improper use of the API when calling it with pattern value of 0
dissector_add_uint() is *not only* used by tcp.port/udp.port dissector tables where 0 is not valid port number,
in some dissector tables 0 is valid protocol number, packet type, etc..

Sample dissectors using dissector_add_uint(.pattern = 0):
  packet-ansi_637.c:2348: dissector_add_uint("ansi_a.sms", 0, ansi_637_trans_handle);
  packet-cip.c:6017:      dissector_add_uint("cip.class.iface", 0, cip_class_generic_handle );
  packet-lon.c:723:       dissector_add_uint("cnip.protocol", 0, lon_handle);
  packet-q931.c:3599:     dissector_add_uint("lapd.sapi", LAPD_SAPI_Q931 /* 0 */, q931_handle);


svn path=/trunk/; revision=44980
2012-09-18 19:29:00 +00:00
Chris Maynard 6e81599840 If all ports are set to 0, then register the handle so "Decode As..." works.
svn path=/trunk/; revision=44979
2012-09-18 19:28:44 +00:00
Jörg Mayer ce7c79c0a3 dissector_add_uint:
Legalize formerly improper use of the API when calling it with
   pattern value of 0

svn path=/trunk/; revision=44978
2012-09-18 19:04:04 +00:00
Chris Maynard 183cbe9af1 Fix up proto_reg_handoff_hazelcast(), setting "initialized" to TRUE once initialized and also avoiding duplicate "tcp.port" registration.
svn path=/trunk/; revision=44977
2012-09-18 18:20:02 +00:00
Chris Maynard f870e83fb3 Don't register to udp port 0.
svn path=/trunk/; revision=44976
2012-09-18 18:15:21 +00:00
Chris Maynard e746d8091d Don't register to udp/tcp port 0, but use dissector_add_handle() instead.
svn path=/trunk/; revision=44975
2012-09-18 18:14:24 +00:00
Pascal Quantin cb5b915840 Fix dissection of Scheduling Information MAC Control Element when it is the only LCID in the MCH PDU
svn path=/trunk/; revision=44973
2012-09-18 17:26:00 +00:00
Michael Mann fd6b314416 parse nfsv4.1 SEQUENCE status flags (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7726)
svn path=/trunk/; revision=44970
2012-09-18 14:12:17 +00:00
Anders Broman f218d66053 Only provide the parameter data in the tvb used when calling subdissector for private extensions.
Add vendor ID to item.
Show flags in hex.

svn path=/trunk/; revision=44967
2012-09-18 07:39:14 +00:00
Evan Huus 15dca08b65 Fix uninitialized value warnings from GCC.
svn path=/trunk/; revision=44966
2012-09-18 02:17:24 +00:00
Bill Meier 7d31b63dbc Do some reformatting.
svn path=/trunk/; revision=44965
2012-09-18 01:34:08 +00:00
Bill Meier 07a1067f26 From Michael Lum: Fix typo.
svn path=/trunk/; revision=44964
2012-09-18 00:47:37 +00:00
Chris Maynard 048c68529c Initialize all hf's to -1, not 0.
svn path=/trunk/; revision=44962
2012-09-18 00:33:19 +00:00
Chris Maynard f8506c50c9 Two hf's were not initialized to -1. They are now.
svn path=/trunk/; revision=44961
2012-09-18 00:25:57 +00:00
Chris Maynard 7334bc59e5 Initialize ett's and hf's to "-1", not "- 1".
svn path=/trunk/; revision=44959
2012-09-18 00:16:01 +00:00
Jeff Morriss eb08c40b09 There is no proto_reg_handoff_data() so don't prototype it. Remove unnecessary include (glib.h).
svn path=/trunk/; revision=44953
2012-09-17 21:26:19 +00:00
Bill Meier cc4e2d3566 #include <epan/prefs.h> not req'd.
svn path=/trunk/; revision=44951
2012-09-17 18:05:21 +00:00
Bill Meier 8a82b7a361 Cleanup:
- fix two cases of potential infinite loop while dissecting;
   [for (guint8 i; i <= guint8 end; i++)]
 - col_...() fcns should not be called under 'if (tree)'
 - remove unneeded initializers;
 - move proto_reg_handoff...() to the end of the file as per convention;
 - remove some boilerplate comments;
 - use consistent indentation and whitespace style;
 - remove some trailing whitespace.

svn path=/trunk/; revision=44950
2012-09-17 17:47:43 +00:00
Bill Meier b29ae79cf6 Cleanup:
- fix several instances of a potential infinte loop while dissecting TLVs;
  (it would be nice to have a valid capture file so this dissector can be fuzz-tested)
- move proto_reg_handoff...() to the end of the file as per convention;
- do find_dissector() only once in proto_reg_handoff...();
- reformat some long lines;
- replace some tabs by spaces and do other whitespace changes.

svn path=/trunk/; revision=44949
2012-09-17 16:05:43 +00:00
Pascal Quantin d530983a67 Update dissection of Request type IE
svn path=/trunk/; revision=44948
2012-09-17 16:04:36 +00:00
Anders Broman d3334cb21d Handle SDP_CRYPTO optional parameters better.
svn path=/trunk/; revision=44946
2012-09-17 15:37:28 +00:00
Alexis La Goutte 31c1f7d11d From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Enhance DNS : make DNSKEY type filterable

svn path=/trunk/; revision=44945
2012-09-17 15:19:18 +00:00
Alexis La Goutte e057832c84 From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Enhance DNS : make RRSIG type filterable

svn path=/trunk/; revision=44944
2012-09-17 15:18:54 +00:00
Alexis La Goutte 0002fd11b5 From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Enhance DNS : make TXT, SPF type filterable

svn path=/trunk/; revision=44943
2012-09-17 15:18:32 +00:00
Alexis La Goutte 9e5e7b75df From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Enhance DNS : make MX filtereable

svn path=/trunk/; revision=44942
2012-09-17 15:17:48 +00:00
Alexis La Goutte c5826e292a From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Enhance DNS : make HINFO filtereable

svn path=/trunk/; revision=44941
2012-09-17 15:16:34 +00:00
Anders Broman 8e74cd8d16 Fix errors in the packet length checks.
svn path=/trunk/; revision=44939
2012-09-17 12:13:34 +00:00
Anders Broman 9db969ded1 Add IPv6 heuristic.
svn path=/trunk/; revision=44938
2012-09-17 10:46:56 +00:00
Evan Huus b87393b7df Add eol-style and keywords to SVN properties.
svn path=/trunk/; revision=44936
2012-09-17 02:22:23 +00:00
Evan Huus 2aaa543505 Make it compile with GCC.
svn path=/trunk/; revision=44935
2012-09-17 02:05:49 +00:00
Michael Mann 5db8e408f0 Add IETF ForCES(Forwarding and Control Element Separation) dissector (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3534)
svn path=/trunk/; revision=44934
2012-09-17 01:38:52 +00:00
Evan Huus b6423a84c8 Add packet-interlink to CMake build to maintain parity with automake as of
revision 44927.

svn path=/trunk/; revision=44928
2012-09-16 17:57:15 +00:00
Bill Meier d7b7757a1c Complete process of moving packet-interlink to a built-in dissector:
- Add packet-interlink.c to Makefile.common
   (Not included in SVN #37610-37612);
   See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6005
- Also: update signature for dissect_interlink_heur() (as per recent changes).

svn path=/trunk/; revision=44927
2012-09-16 17:26:49 +00:00
Gerald Combs 704eb29ad4 [Automatic manuf, services and enterprise-numbers update for 2012-09-16]
svn path=/trunk/; revision=44924
2012-09-16 14:03:36 +00:00
Evan Huus 826bba705b From Pontus Fuchs via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7728
Make right-click + apply-as-filter work in the packet list for non-ethernet
frames (such as ieee 802.11 frames).

svn path=/trunk/; revision=44921
2012-09-15 20:16:14 +00:00
Evan Huus dd01cc0490 From Niels Widger via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7725
Add get_filter method to Wireshark's Lua interface (to correspond with the
already-exposed set_filter method).

svn path=/trunk/; revision=44916
2012-09-15 13:58:57 +00:00
Evan Huus 5a7af5d6d9 Avoid a stack-smash when decoding the new DNS option field if the length is
malformed.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7730

svn path=/trunk/; revision=44915
2012-09-15 13:49:27 +00:00
Jeff Morriss 670dff46e4 Fix up the (#if'd out) sequence number analysis debug code so that it compiles and is easier to read. Also fix up some white space.
svn path=/trunk/; revision=44903
2012-09-14 18:20:59 +00:00
Anders Broman ebda6f06b7 Try to make the buildbot happy.
svn path=/trunk/; revision=44901
2012-09-14 14:40:47 +00:00
Anders Broman ffbacb51d2 Heuristically dissect TIPC IP payloads.
svn path=/trunk/; revision=44900
2012-09-14 14:14:46 +00:00
Anders Broman 6aca10831f From Mike Morrin:
Fix pedantic compiler warnings in csn.1 dissectors.

There is some tricky casting going on in csn.1 structures.  To eliminate all
the warnings, the function pointers needed to be moved out of the object
pointer unions.  Fortunately macros (mostly) hide these changes from the
protocol dissector tables.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7686

svn path=/trunk/; revision=44899
2012-09-14 14:05:50 +00:00
Anders Broman d1ac1bddf1 Address buildbot error:
packet-nstrace.c: In function 'dissect_nstrace':
packet-nstrace.c:131: warning: 'dst_vmname_len' may be used uninitialized in this function
packet-nstrace.c:131: warning: 'src_vmname_len' may be used uninitialized in this function

svn path=/trunk/; revision=44898
2012-09-14 11:42:46 +00:00
Anders Broman 6292b7c119 From Michal Labedzki:
Bluetooth: minor fix in HID
Applied by hand and changed offset to be signed as per WS convention.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7639

svn path=/trunk/; revision=44896
2012-09-14 11:27:57 +00:00
Anders Broman 19f6a77cee From Nikhil Kalu:
Enhancement to add more trace record fields in Citrix NetScaler capture file format.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7713

svn path=/trunk/; revision=44895
2012-09-14 11:11:37 +00:00
Anders Broman 0a21adec4b From Michal Labedzki:
Add Bluetooth Protocol BNEP. Supported version: 1.0.

I changed offset to be an int to follow WS convention.While at it I changed other types to fit the tvb_get routines.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7719

svn path=/trunk/; revision=44894
2012-09-14 11:02:24 +00:00
Anders Broman 9ec55f59d7 From Claude LeFrancois:
Cosmetic changes to GTPv2(Add text to itenms)
Minor code changes by me.

svn path=/trunk/; revision=44891
2012-09-14 08:24:35 +00:00
Ronnie Sahlberg a711905c4c SCSI: Update INQUIRY standard page and decode the flags depending on which version of SPC that the device claims conformance to.
svn path=/trunk/; revision=44886
2012-09-13 01:28:57 +00:00
Pascal Quantin 3e8ac587fd Fix FBI true_false_string array and remove a useless hf variable
svn path=/trunk/; revision=44884
2012-09-12 12:29:59 +00:00
Anders Broman e97273a35d From Mike Morrin:
* fixup of dissection of message type for PRACH messages.
* fixed dissection of optional octet 2/3 in dl control messages
* removed a few more duplicate hf items
* changed all M_BIT macros to M_UINT, as M_BIT does not use the referenced hf.
* fixed dissection of ul_tfi and dl_tfi so that assignments and usage can be
filtered more easily
* fixed missing references to existing value strings and converted to tfs
strings where possible

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7686

svn path=/trunk/; revision=44883
2012-09-12 12:07:53 +00:00
Anders Broman 26372ed66a Add doxygen hints.
svn path=/trunk/; revision=44882
2012-09-12 10:27:37 +00:00
Pascal Quantin 76b94dde6b From Esa Haapamäki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7718 :
Fix dissection of NAS Uplink and Downlink Count in MM Context IE

svn path=/trunk/; revision=44881
2012-09-12 10:21:00 +00:00
Jeff Morriss 42623443ed As suggested by Anatoly in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5699 :
Followup to r44844: use a better cast (intptr_t instead of long long).

svn path=/trunk/; revision=44880
2012-09-11 13:11:33 +00:00
Anders Broman 7f66cae784 From Chris Elston:
Add automatic L2TPv3 session setting detection

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7711

svn path=/trunk/; revision=44879
2012-09-11 13:06:42 +00:00
Jakub Zawadzki 95de6e0ecb Bluetooth: Move HFP dissector from RFCOMM file
HFP is moved from RFCOMM where named HF.
Then fix name to one used by SIG specification: HFP.
Next step is improve dissection of HFP by dissect
specific for this profile AT commands.

From Michal Labedzki on behalf of Tieto Corporation
Part of bug #7639 

svn path=/trunk/; revision=44877
2012-09-11 11:53:34 +00:00
Pascal Quantin 1bdf9a8912 Upgrade LTE RRC dissector to v11.0.0
svn path=/trunk/; revision=44875
2012-09-11 10:08:41 +00:00
Jakub Zawadzki a406bb1a50 Add data parameter to dissector_try_uint_new
svn path=/trunk/; revision=44874
2012-09-11 09:06:48 +00:00
Jakub Zawadzki 27fb6880c4 Add new function: call_dissector_with_data
svn path=/trunk/; revision=44873
2012-09-11 09:06:13 +00:00
Jakub Zawadzki 9f92dc93c5 Add data parameter to call_dissector_only.
svn path=/trunk/; revision=44872
2012-09-11 08:28:07 +00:00
Jakub Zawadzki dee4443809 Add data parameter to dissector_try_heuristic
svn path=/trunk/; revision=44871
2012-09-11 08:26:48 +00:00
Pascal Quantin 7e9411fee3 Enhance dissection of PSI1
svn path=/trunk/; revision=44870
2012-09-11 07:48:49 +00:00
Ronnie Sahlberg 96c5cd466b SCSI: PMI and LBA are no longer part of READCAPACITY10 in current versions of SBC
svn path=/trunk/; revision=44867
2012-09-11 03:52:39 +00:00
Ronnie Sahlberg f238f0193d SCSI: SBC, print the subcommand name in the info column for service-action-in
svn path=/trunk/; revision=44866
2012-09-11 03:34:34 +00:00
Ronnie Sahlberg 6c84cbde98 SCSI: SBC: READCAPACITY16 no longer have PMI or LBA in the request in modern versions of the standard
svn path=/trunk/; revision=44865
2012-09-11 03:30:04 +00:00
Jakub Zawadzki 9d6e413be7 Regenerate all asn.1 dissectors.
svn path=/trunk/; revision=44861
2012-09-10 21:42:36 +00:00
Jakub Zawadzki 5a8783f5b1 Initial commit to support yet another method of passing data between dissectors.
Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL

svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
Martin Kaiser 03993d6e0e add private data specifier for NorDig
trivial whitespace cleanup

svn path=/trunk/; revision=44858
2012-09-10 21:22:01 +00:00
Martin Kaiser 189257b004 use proto_mpeg_descriptor_loop_dissect() in the NIT
svn path=/trunk/; revision=44857
2012-09-10 21:15:54 +00:00
Martin Kaiser 4e2268aaa4 function to dissect a sequence of mpeg/dvb descriptors
(such descriptor loops are part of all psi and si tables)

take into account that a private data specifier descriptor may set the
 context for interpretation of subsequent descriptors in the loop

as a first example, add the private descriptors defined by CI+ LLP


svn path=/trunk/; revision=44856
2012-09-10 21:09:34 +00:00
Martin Kaiser 1f34b32040 fix compiler errors
packet-gsm_rlcmac.c:6341: error: missing braces around initializer

packet-gsm_rlcmac.c:473: error: hf_h110qi_t_tqi defined but not used
packet-gsm_rlcmac.c:474: error: hf_packetuplinkid_tqi defined but not used
packet-gsm_rlcmac.c:477: error: hf_multiblock_allocation_number_of_radio_blocks_allocated defined but not used

svn path=/trunk/; revision=44855
2012-09-10 21:00:18 +00:00
Pascal Quantin 3f1e1285f3 From Mike Morrin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7686 :
Remove duplicate hf items in packet-gsm_rlcmac.c

svn path=/trunk/; revision=44854
2012-09-10 20:31:41 +00:00
Alexis La Goutte 0157f2f5e7 From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Make WKS Type filterable

svn path=/trunk/; revision=44849
2012-09-10 15:54:21 +00:00
Alexis La Goutte 0cede7b727 From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Make PTR Type filterable

svn path=/trunk/; revision=44848
2012-09-10 15:52:37 +00:00
Alexis La Goutte a11cd0e674 From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Make SOA Type filterable

svn path=/trunk/; revision=44847
2012-09-10 15:52:00 +00:00
Jakub Zawadzki 6ec66dbc45 Revert part of r44845 (packet-lppe.c) #fail
svn path=/trunk/; revision=44846
2012-09-10 15:35:23 +00:00
Jakub Zawadzki 0176a135db Propage changes done in generated dissectors to asn1/
svn path=/trunk/; revision=44845
2012-09-10 15:24:00 +00:00
Jeff Morriss 17e7db3bca Attempt to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5699
and https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5979 : 

Don't cast the buffer address to int on Win32: a 64-bit address won't
fit in an integer.

svn path=/trunk/; revision=44844
2012-09-10 15:18:17 +00:00
Pascal Quantin e48357e7f3 Add SVN properties
svn path=/trunk/; revision=44843
2012-09-10 14:56:22 +00:00
Michael Mann ea772dea9e Compiler fixes to rev 44841
svn path=/trunk/; revision=44842
2012-09-10 14:22:24 +00:00
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