Commit Graph

36 Commits

Author SHA1 Message Date
Michael Mann 7bf6862ecf convert to proto_tree_add_subtree[_format]
Change-Id: Ia7014003a3cff5181295172978d6c613c3b83b0b
Reviewed-on: https://code.wireshark.org/review/2676
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-28 12:05:43 +00:00
Michael Mann 14824e6adf Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html

This reverts commit 246fe2ca4c.

Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 18:25:59 +00:00
Dario Lombardo 246fe2ca4c Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:14:58 +00:00
Alexis La Goutte 296591399f Remove all $Id$ from top of file
(Using sed : sed -i '/^ \* \$Id\$/,+1 d')

Fix manually some typo (in export_object_dicom.c and crc16-plain.c)

Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8
Reviewed-on: https://code.wireshark.org/review/497
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04 14:27:33 +00:00
Florian Fainelli d08586867d packet-homeplug-av: use HOMEPLUG_AV_MMVER_1_1 consistently
The HomePlug AV dissector was not consistently using the
HOMEPLUG_AV_MMVER_1_1 constant and was sometimes using it and sometimes
using mmver == 1 directly. Make sure we use that constant throughout the
code to help clarifiying which version tests are applying to.

Change-Id: I602413163e4e44dedfbf3e2364448a951fa70f54
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Reviewed-on: https://code.wireshark.org/review/428
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-28 03:36:19 +00:00
Florian Fainelli e6277bdedd packet-homeplug-av: fix missing reserved byte for station dump
dissect_homeplug_av_nw_info_sta() was processing stations
information correctly, except that after the first station dump, all
dumps would be off-by-one byte because we were not reserving a missing
byte at the end of the station dump. Fixes #9798.

Change-Id: Iff3afd5ff536ae718fa446de3c59cd5e9851ff20
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Reviewed-on: https://code.wireshark.org/review/427
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-28 00:40:25 +00:00
Jakub Zawadzki c45475ab45 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54135
2013-12-15 23:44:12 +00:00
Michael Mann 0f0c111119 Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49920
2013-06-14 01:02:11 +00:00
Martin Kaiser 77c9d43ce4 coverity 993742: potential division by zero
svn path=/trunk/; revision=48659
2013-03-30 19:16:51 +00:00
Martin Kaiser 94ea9af46c fix indentation in one place
svn path=/trunk/; revision=48658
2013-03-30 19:15:29 +00:00
Alexis La Goutte 59669d270c From G.Gerrits via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8501 HomeplugAV dissector: Decoding HPAV-1.1 Tone Map Tx/Rx Characteristics Req/Conf (0xA070/0xA071/0xA090/0xA091)
Dissecting HPAV-1.1 Tone Map Characteristics Req/Conf (0xA070/0xA071) was not correct.
Also found that MMType 0xA070/0xA071 is used for the Tx ToneMaps and the MMType 0xA090/0xA091 for the Rx ToneMaps. Added types and dissector for the Rx MMType. Although the Rx-Conf-Structure is almost identical to the Tx is did duplicate the dissector code to avoid mixups.
Added some additional Infos to the carrier dissector output (Carrier#, #Modulated-Bits, Average#Modulated-Bits/Carrier).

Also extended the homeplug_av_tone_map_vals with 0x08 for 12bit 4096-QAM (the AR74xx should support this kind of modulation) and changed the mask to 0x0f accordingly

svn path=/trunk/; revision=48592
2013-03-27 18:16:22 +00:00
Bill Meier 96a24cc79f Fix spelling/typos found using a list of commonly misspelled words.
The misspellings were mostly in comments but some were
in text strings visible to the user.


svn path=/trunk/; revision=47899
2013-02-26 04:42:26 +00:00
Evan Huus 0f5ea5487f Whitespace cleanup.
svn path=/trunk/; revision=47286
2013-01-25 22:04:59 +00:00
Evan Huus e55b8a1d38 From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8259
Improve the dissection of the "Get Software Version" confirmation frame as well
as the "Read configuration Block" confirmation frame by properly dissecting the
fields previously marked as reserved in the Homeplug-AV dissector.

svn path=/trunk/; revision=47285
2013-01-25 21:54:18 +00:00
Pascal Quantin 738dae7c3d From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8258 :
HomePlugAV dissector: improve device ID decoding

svn path=/trunk/; revision=47271
2013-01-25 14:10:09 +00:00
Evan Huus d334115b4d From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8166
properly dissect the 0x6048 and 0x6038 frames with HomePlug AV 1.1 

svn path=/trunk/; revision=47265
2013-01-25 00:18:10 +00:00
Evan Huus 9037ec60ed From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8166
Fixes for decoding HPAV-1.1 Network Info Request/Confirmation

From me: minor whitespace cleanup.

svn path=/trunk/; revision=47257
2013-01-24 16:23:15 +00:00
Evan Huus 33981700b5 From Guus Gerrits via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8148
Add some additional formatting to the mmhdr subtree (e.g. selecting 5
mmheaderbytes with mmver!=0, Added a subtree for the Fragmentation Info)

svn path=/trunk/; revision=46956
2013-01-05 23:14:50 +00:00
Pascal Quantin 58575f394f From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8148 :
Fix dissection of HomePlug AV 1.1 frames with fragmentation information

From me: indentation fixes

svn path=/trunk/; revision=46871
2012-12-31 13:39:04 +00:00
Jaap Keuter cd376e0ca8 From G.Gerrits:
Minor patch just adding the newer AR7400/INT7400 with dev_id==4 for decoding 
in the Homeplug AV "Get Device/SW Version Confirm (A001)" response.

svn path=/trunk/; revision=46695
2012-12-22 14:28:52 +00:00
Jakub Zawadzki bf77a26b3f Patch from Florian Fainelli via bug #7772
Cleans up the mask used for the "High" part of the sub-carrier modulation 
to match (modulus the 4-bits shifting) the one used for the "Low" part.

svn path=/trunk/; revision=45382
2012-10-08 12:06:16 +00:00
Jakub Zawadzki cef1e32ede Patch from Florian Fainelli
Fix bug #7772: dissect only the number of active HomePlug AV subcarriers

The dissector currently dissects all 1156 sub-carriers available in the Tone
Map Characteristisc Confirmation frame no matter what is the number of active
ones. 

This is not valid, because the frame only contains the number of active
sub-carriers, even though it is padded to 1156 sub-carriers. This is also an
issue for newest HomePlug AV devices with a 500Mbits/sec PHY rate, because
those will have up to 2690 sub-carriers, and we would only dissect the first
1156 active ones.


svn path=/trunk/; revision=45381
2012-10-08 12:05:14 +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
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
Alexis La Goutte 6111c40173 From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7548
HomeplugAV dissector: decode device id

adds proper device id decoding the in the Homeplug AV "Get Device/SW Version 
Confirm (A001)" response.

svn path=/trunk/; revision=44163
2012-07-31 19:09:57 +00:00
Bill Meier 26d1cbb989 Create/use extended value strings to access certain value string arrays;
Remove unneeded initializers;
Use consistent indentation.

svn path=/trunk/; revision=44073
2012-07-27 16:02:06 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Chris Maynard d9a5e3a1d2 Do not use BASE_NONE for FT_*INT* types.
svn path=/trunk/; revision=43177
2012-06-09 17:47:58 +00:00
Bill Meier 2df5dc3d53 From Reinhard Speyerer: Fix several misspellings/typos in Wireshark
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6967

svn path=/trunk/; revision=41645
2012-03-18 22:24:24 +00:00
Bill Meier 86f7bff724 Fix incorrect packet-details display of certain 1 bit FT_BOOLEAN fields.
(Use a valid 'parent field width' in the hf[] 'display' field.

svn path=/trunk/; revision=41396
2012-03-07 15:39:39 +00:00
Guy Harris dfcec43973 Shuffle the ett[] array elements around a bit, and add blank lines, to
match their definitions; add two missing elements that turned up.  That
should fix bug 6736.

svn path=/trunk/; revision=40509
2012-01-15 09:07:54 +00:00
Bill Meier 3f5b02de51 Fix encoding arg for ptvcursor_add() and ptvcursor_add_noadvance() function calls.
svn path=/trunk/; revision=39566
2011-10-25 16:04:31 +00:00
Bill Meier 794757ae8f For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.
Also: remove trailing whitespace for a number of files.

svn path=/trunk/; revision=39503
2011-10-21 02:10:19 +00:00
Guy Harris 464778ed69 More misspellings of "unknown", for bug 6244.
svn path=/trunk/; revision=38565
2011-08-16 16:26:50 +00:00
Bill Meier e3dff872d0 Put proto_reg_handoff_...() at the end of the file as per the usual Wireshark convention.
svn path=/trunk/; revision=37440
2011-05-27 15:51:21 +00:00
Jeff Morriss 28bae657ae From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5943 :
The two patches attached allow the dissection of the Homeplug AV Ethernet MAC
management frames between a controlling device and a Homeplug AV Ethernet to
PLC adapter. This protocol is pretty similar to the previous generation
Homeplug protocol (dissected by packet-homeplug.c) but a couple of noticeable
differences make it require its own dissector handler.

This dissector is based on the work done by Nicolas Thill, Xavier Carcelle and
myself in the Faifa project (https://dev.open-plc.org).

The dissector handles the standard Homeplug AV Ethernet MAC management frames
(called public) as well as the Intellon specific management frames (vendor).

From me:
Remove unnecessary global variables.
Add to COL_INFO even when !tree.
Remove gotos.
Remove unnecessary includes.

svn path=/trunk/; revision=37403
2011-05-26 01:55:04 +00:00