Commit Graph

4115 Commits

Author SHA1 Message Date
Ronnie Sahlberg ed9c9cc01a from Stephen fischer
Attached is a patch to fix bug #1163: "Dissector bug. ISO8073 COTP
protocol."  The SES dissector was incorrectly believing it had PDUs
within the COTP PDUs.  I added an additional heuristic check to see if
the length of the SES PDU is 0, then return false since it can't be zero
length.


Thanks,
  Steve





svn path=/trunk/; revision=19733
2006-10-29 20:56:00 +00:00
Jaap Keuter 8899c8f747 From Roger Gottsponer:
During troubleshooting an ARP problem, I found an issue with wireshark
to properly recognise Gratuitous ARP packets. Gratuitous ARP packets
can be made with ARP request or ARP reply packets.

svn path=/trunk/; revision=19731
2006-10-29 19:14:31 +00:00
Ulf Lamping 68187697a0 make the checksum fields visible for TCP and UDP
svn path=/trunk/; revision=19727
2006-10-29 13:53:07 +00:00
Jaap Keuter c83da65208 From Stephen Fisher:
Attached is a patch to allow the disabling of the UDP/UDPlite checksum
verification for cards that offload it and report it incorrectly.

svn path=/trunk/; revision=19725
2006-10-29 11:50:30 +00:00
Guy Harris 8487e57880 The TCP options data is a byte array, not a character string.
svn path=/trunk/; revision=19723
2006-10-29 00:06:02 +00:00
Jaap Keuter d199875c17 Based on RFC3488. This is a setup for RGMP dissection, a simple protocol bolted on IGMP.
svn path=/trunk/; revision=19722
2006-10-28 21:52:38 +00:00
Jaap Keuter 590251d66e From Pierre Juhen:
I would like to have a tcp.options field with a name for PMDL output;
I include a patch to packet-tcp.c to provide that.

svn path=/trunk/; revision=19721
2006-10-28 21:32:38 +00:00
Martin Mathieson 358701731b Cast away most remaining warnings.
2 will remain, because the 'needle' arg in tvb_pbrk_guint8() isn't const...  Should it be?

svn path=/trunk/; revision=19717
2006-10-27 14:36:48 +00:00
Martin Mathieson 37317874e4 More warnings
svn path=/trunk/; revision=19716
2006-10-27 13:03:38 +00:00
Martin Mathieson 315327f79d When key length wrong, show expected value.
Fix Preference label where %d was missing from specifier.

svn path=/trunk/; revision=19714
2006-10-27 10:16:22 +00:00
Anders Broman 2aed0d4f40 Fix more Ubuntu warnings.
svn path=/trunk/; revision=19711
2006-10-26 21:31:48 +00:00
Martin Mathieson f378c52320 More warnings...
svn path=/trunk/; revision=19710
2006-10-26 17:03:45 +00:00
Martin Mathieson e7323183d0 Try to declare and cast away warnings
svn path=/trunk/; revision=19709
2006-10-26 16:52:55 +00:00
Jaap Keuter f7aa75ba22 From Xiaoguang Liu
In wireshark a NTP field is displayed as "clock dispersion". 
But should it be called "root dispersion" as per RFC 1305? 

svn path=/trunk/; revision=19705
2006-10-26 14:36:09 +00:00
Martin Mathieson c2c13fcecb Cast away remaining warnings seen on buildbot
svn path=/trunk/; revision=19704
2006-10-26 12:45:14 +00:00
Martin Mathieson 3d9709e6f3 Hopefully zap some warnings
svn path=/trunk/; revision=19702
2006-10-26 10:11:09 +00:00
Ronnie Sahlberg aada156d87 break request/response matching to track transactions out from the CONTROL handler to use the same code for ALL pdu types
svn path=/trunk/; revision=19701
2006-10-26 08:37:39 +00:00
Ulf Lamping f34bfa2425 slightly improve info column output
svn path=/trunk/; revision=19700
2006-10-26 08:08:13 +00:00
Ulf Lamping 76cfd7ade1 put python script name in brackets
svn path=/trunk/; revision=19699
2006-10-26 08:07:13 +00:00
Ronnie Sahlberg e487f11c33 from stephen f fix for 1040
Attached is a patch to fix bug #1040: "imap packet: not all infos are
displayed."  It has been tested against the capture file the user
provided as well as my own capture of an imap session.


Thanks,
  Steve




svn path=/trunk/; revision=19698
2006-10-26 07:45:01 +00:00
Anders Broman b68d723b81 Remove some unused asn1 code(not in spec) to get rid of some Ubuntu warnings.
svn path=/trunk/; revision=19688
2006-10-25 22:09:48 +00:00
Gerald Combs 28d32a420f Add more paranoid pointer checks. Fixes CID 219.
svn path=/trunk/; revision=19684
2006-10-25 17:00:33 +00:00
Martin Mathieson e694978c74 Allow DCT2000 support to find a couple of more protocols.
Try to squash some warnings seen on the ubuntu buildbot log

svn path=/trunk/; revision=19683
2006-10-25 16:46:27 +00:00
Gerald Combs 131db54e82 Squelch Coverity CID 220. Fix up whitespace.
svn path=/trunk/; revision=19682
2006-10-25 16:39:19 +00:00
Jaap Keuter 09ef3b6142 From Stephen Fisher
Attached is a patch to fix bug #1170: "Wireshark interpretation of WBXML
does not comply with Spec."  This has been verified with the sample
capture the user provided.

svn path=/trunk/; revision=19681
2006-10-25 15:22:39 +00:00
Gilbert Ramirez 5a13d13021 Fix bug 1085 -- handle the various ways that a radiotap frame can
have an FCS. Also, clean up the parsing and presentation of the various
flags, and show some that aren't already shown.

svn path=/trunk/; revision=19680
2006-10-25 15:16:49 +00:00
Guy Harris ec38620f1b Clean up some compiler warnings.
svn path=/trunk/; revision=19679
2006-10-25 03:03:53 +00:00
Gerald Combs fb22815c2b Attempt to squelch Coverity CID 221.
svn path=/trunk/; revision=19678
2006-10-25 00:49:36 +00:00
Anders Broman 44c8909f04 From Reinhard Speyerer:
Fixes the incorrect decoding of the CC-SETUP CLIR suppression and invoke info elements (which seem to have been copied from the location update accept PDU).

and added some info from a later spec.

svn path=/trunk/; revision=19675
2006-10-24 22:06:34 +00:00
Ronnie Sahlberg b9ee517437 by popular request
reintroducing the ACK_RTT   measurement how long it took to ACK a data segment



Gerald   this is a trivially correct patch   can you apply it to the release branch?



svn path=/trunk/; revision=19669
2006-10-24 07:27:32 +00:00
Anders Broman c881dacb48 From Alejandro Vaquero:
For the Radius dissector to add statistics 
 in the "Service Response Time" menu and the tshark stats.

svn path=/trunk/; revision=19668
2006-10-24 05:21:00 +00:00
Ashok Narayanan 3d40131d07 Add support for dissecting RSVP E2E IGNORE proto packets (RFC3175)
svn path=/trunk/; revision=19665
2006-10-23 17:32:15 +00:00
Martin Mathieson d55c609c55 - Fix problems with parsing sctpprim headers
- Add dissection of nbap (as encap or inside sctp primitive)

svn path=/trunk/; revision=19664
2006-10-23 17:22:20 +00:00
Jaap Keuter 6e3dd0c722 From Stephen Fisher:
Here is a patch to make a few small fixes to packet-wlccp.c:

svn path=/trunk/; revision=19661
2006-10-23 05:30:37 +00:00
Ronnie Sahlberg ac67085436 add a dissector table for class specific control input/output pdus
implement class specific control commands : reset and getmaxlun for mass storage


now with a better understanding of the problem space for usb and device classes we can start cleaning the code up and make it nice



svn path=/trunk/; revision=19659
2006-10-22 11:49:23 +00:00
Ronnie Sahlberg 7a62c1f5fe add tracking of interface class for CONTROL_INPUT as well as existing support for BULK INPUT/OUTPUT
svn path=/trunk/; revision=19658
2006-10-22 09:38:59 +00:00
Ronnie Sahlberg bacb3d3ec5 fix some endianess issues
svn path=/trunk/; revision=19657
2006-10-22 05:21:37 +00:00
Ronnie Sahlberg 6ff555b31b dissect the individual bits in the CONFIDURATION descriptor field for the endpoint address
svn path=/trunk/; revision=19656
2006-10-22 01:21:20 +00:00
Ronnie Sahlberg cd02551610 add a tcp_tree field to packet_info so that we can access the tree from tcp_dissect_pdus() (and others if need be)
in tcp_dissect_pdus()  add a field ( tcp.pdu.size ) to the tree that displays the pdu size.



svn path=/trunk/; revision=19655
2006-10-22 00:21:40 +00:00
Ronnie Sahlberg 961ff01149 teach the http header dissector how to handle integer fields instead of just assuming everything is a string field
change http.content_length to be FT_UINT32


svn path=/trunk/; revision=19654
2006-10-21 22:17:43 +00:00
Ronnie Sahlberg de61ac3733 the flags are FT_BOOLEAN not FT_UINT8
svn path=/trunk/; revision=19650
2006-10-21 05:07:48 +00:00
Ronnie Sahlberg d421f8598d prettify the flags field and power consumption for CONFIGURATION DESCRIPTOR
dissect the self-powered and the remote-wakeup flags
show the powerconsumption in mA


svn path=/trunk/; revision=19649
2006-10-21 04:57:12 +00:00
Gerald Combs df360ddc8c Catch an infinite loop. Fixes bug 1172.
svn path=/trunk/; revision=19640
2006-10-20 19:37:11 +00:00
Guy Harris fcd6675b74 From Stephen Fisher: put a newline at the end, to squelch warnings.
svn path=/trunk/; revision=19639
2006-10-20 19:29:41 +00:00
Guy Harris cc52fa035d Get rid of a duplicate call.
svn path=/trunk/; revision=19636
2006-10-20 18:49:02 +00:00
Martin Mathieson cb5116c5b2 Add an expert item for detecting ARP request packet storms. The time period and number of requests needed are configurable. I've turned the preference to do the detection off, because I'm not sure what might be sensible defaults for the other fields...
svn path=/trunk/; revision=19628
2006-10-20 14:20:22 +00:00
Martin Mathieson 0812a4cb6f Report roundtrip delay as expert item
svn path=/trunk/; revision=19627
2006-10-20 14:05:18 +00:00
Martin Mathieson fffd12bf24 Minor info column formatting + improved hf long text entries
svn path=/trunk/; revision=19626
2006-10-20 14:03:28 +00:00
Jaap Keuter dd63bac75b Fixes bug 1166, adds DNET decoding to I-Could-Be-Router-To-Network message.
svn path=/trunk/; revision=19623
2006-10-20 05:56:56 +00:00
Michael Tüxen fe5f26af7b Register the dissector.
svn path=/trunk/; revision=19609
2006-10-19 17:25:13 +00:00
Guy Harris 1fbb567ebe Fix a compiler warning (about a real problem).
svn path=/trunk/; revision=19605
2006-10-19 09:14:27 +00:00
Guy Harris ed8b50ba3f Fix some compiler warnings (about real problems).
svn path=/trunk/; revision=19604
2006-10-19 09:12:28 +00:00
Jaap Keuter 7ded21f336 Squelch compiler warnings
svn path=/trunk/; revision=19597
2006-10-18 19:42:10 +00:00
Jaap Keuter a3f017648f From Shaun Jackman
The RDM protocol has been accepted as ANSI standard E1.20-2006. The following patch updates the decoder to that spec. 
At the same time it is promoted to a build-in dissector.

svn path=/trunk/; revision=19596
2006-10-18 19:29:05 +00:00
Gerald Combs fc62f98e74 In the 802.11 dissector, mark the "wep_keys" preference as obsolete,
and replace it with an "enable_decryption" preference.

Instead of forcing the user to specify how many WEP keys we have,
figure it out for ourselves by parsing the key list.  When decrypting,
don't worry about the key index specified in the header (which resulted
in trying to decrypt using the same key twice); simply try each key in
order (which we were doing anyway).

In hex_str_to_bytes(), handle a null hex string.

Update the release notes.

svn path=/trunk/; revision=19592
2006-10-18 17:55:29 +00:00
Ronnie Sahlberg b3301320c1 add dissection of DATA IN/OUT and SCSI RESPONSE to the usb mass storage dissector
svn path=/trunk/; revision=19590
2006-10-18 12:00:38 +00:00
Ronnie Sahlberg 232e884ca1 new dissector : usb mass storage
this is a wrapper protocol to store SCSI frames inside usb bulk data transfers

the dissector is far from complete but does
track ITL and ITLQ structures and will also call the SCSI dissector to 
dissect the SCSI CDB.


what is still missing is handling of data in/out and scsi responses


at least it will now display the SCSI CDB and dissect it. woohoo



svn path=/trunk/; revision=19589
2006-10-18 11:24:03 +00:00
Ronnie Sahlberg 6a75fbab65 create a dissector table for the bulk input/output packet types
svn path=/trunk/; revision=19588
2006-10-18 09:30:28 +00:00
Ronnie Sahlberg df75f29284 move some defines to packet-usb.h so that they can be shared with other dissectors
svn path=/trunk/; revision=19587
2006-10-18 09:10:14 +00:00
Anders Broman 5243edd737 Add part of E.5 Basic DTMF Generator Package
svn path=/trunk/; revision=19586
2006-10-18 05:45:52 +00:00
Ulf Lamping 195144a85e llc_add_oui() wants a pointer, not a pointer pointer
svn path=/trunk/; revision=19585
2006-10-18 00:22:23 +00:00
Ronnie Sahlberg 638f9eced7 now when we do dissect the descriptors:
add tracking so that when we find an interface descriptor which tells us the device class we also create a conversation for each and every endpoint for that interface and also let all conversations (one for each endpoint) share the same usb conversation info structure.


store the device type inside this conv_info structure


add the required code to manage BULK data pdus and have it for now only display what kind of bulk data is contained (interface class as snooped from the descriptors)



we now only need a class dissector table we can fork off into from the bulk dissector in usb    and then an external usb_masstorage dissector that registers itself as a mass storage device and we should be all set to dissect the scsi layer being transported atop usb





svn path=/trunk/; revision=19575
2006-10-17 13:40:26 +00:00
Tomas Kukosa cd92272ac9 debug trace at beginning of each packet
do not call subdissector for empty application data

svn path=/trunk/; revision=19574
2006-10-17 13:29:44 +00:00
Ronnie Sahlberg 5bbcf2e2ca add a define for the "no endpoint" constant used to represent unknown or host side endpoint used for conversations
ansp provide the desired port/endpoints in the call to get/create a conversation   so that we later when we see the a descriptor that says   Endpoint X is using class Y
we need tis to register that certain endpoints are used for mass storage
(or other applications)


svn path=/trunk/; revision=19573
2006-10-17 09:14:16 +00:00
Jörg Mayer ccca31102b Stephen Fisher:
Please apply the attached patch to improve the WLCCP dissector.  I have
also finished merging in packet-cisco-wireless.c, so it can be deleted.


svn path=/trunk/; revision=19572
2006-10-17 08:59:01 +00:00
Tomas Kukosa e1e18ea393 update Timestamps Option labels in accordance with RFC1323
svn path=/trunk/; revision=19570
2006-10-17 06:01:54 +00:00
Anders Broman d5cee1152d Add A.8 Basic call progress tones generator with directionality
svn path=/trunk/; revision=19569
2006-10-17 05:40:58 +00:00
Ulf Lamping 0c23562511 fix #1135: another "off by one" bug, zero termination was done twice, second time writing behind the end of the available buffer
svn path=/trunk/; revision=19566
2006-10-16 23:13:21 +00:00
Gerald Combs 2e28e9fd13 Make sure a value is non-null before we feed it to strcmp(). Fixes bug
1134.

svn path=/trunk/; revision=19560
2006-10-16 18:44:43 +00:00
Ronnie Sahlberg 40ee68e3d4 correct the little / big endian comment
svn path=/trunk/; revision=19558
2006-10-16 14:54:20 +00:00
Ronnie Sahlberg 2cb017d84f dissect a lot more of the descriptors so that we can finally see which endpoints are used for what purpose
svn path=/trunk/; revision=19557
2006-10-16 14:43:35 +00:00
Jörg Mayer a32f396008 Display the skipped 4 bytes from the header as setup (see
struct usb_header). Just display it as a big endian number
(I don't have a spec at hand).


svn path=/trunk/; revision=19556
2006-10-16 14:24:24 +00:00
Ronnie Sahlberg ff7e652235 break finding/creating a conversation out into its own helper (which makes it easier later when we find an endpoint description that tells us some other endpoint is used for massstorage)
implement some more descriptors


svn path=/trunk/; revision=19555
2006-10-16 13:42:59 +00:00
Ronnie Sahlberg af000bdaa6 Finish dissection of GET DESCRIPTOR for the devicetype: DEVICE.
This dissector should be extended to dissect all other descriptors for all other device types as well.





svn path=/trunk/; revision=19554
2006-10-16 10:33:46 +00:00
Ronnie Sahlberg c5480555fd add some variables to the task structure so that we can pass TYPE/INDEX from the GET DESCRIPTOR request to the response dissector
(we need this in order to know how to dissect the response?)



svn path=/trunk/; revision=19553
2006-10-16 08:47:48 +00:00
Anders Broman dc10ba22e6 Fix Event dissection which was broken when going to V3.
and add a few parameters.

svn path=/trunk/; revision=19544
2006-10-15 22:11:26 +00:00
Anders Broman 6c0254b1cb Upadte to H.248 V3 and add some annex E parameters.
svn path=/trunk/; revision=19543
2006-10-15 16:06:02 +00:00
Jörg Mayer b9582da89f - gcc dies on "default: }", add a ;
- proto_register usb instead of eth.

svn path=/trunk/; revision=19542
2006-10-15 12:27:51 +00:00
Ronnie Sahlberg d0bea0954e populate the info column with the request type and whetehr it is a request or a response
svn path=/trunk/; revision=19541
2006-10-15 08:21:56 +00:00
Ronnie Sahlberg a78a49b057 add tracking of request/responses for CONTROL INPUT so we can start passing parameters from request to response and dissect response data
svn path=/trunk/; revision=19540
2006-10-15 08:12:41 +00:00
Ronnie Sahlberg 714ce64b12 add a new port type for usb endpoints
start introducing conversations to the usb dissector so that we can start tracking requests/responses
which we need to in order to dissect for example the data returned by a device to a GET DESCRIPTORS call



svn path=/trunk/; revision=19539
2006-10-15 06:10:59 +00:00
Ronnie Sahlberg 077e03a549 start dissecting the setup headers
dissect GET DESCRIPTOR as an example on how to add such dissectors


svn path=/trunk/; revision=19538
2006-10-15 03:49:27 +00:00
Ronnie Sahlberg c56d0ab3af more serviceactions
svn path=/trunk/; revision=19537
2006-10-15 02:54:08 +00:00
Ronnie Sahlberg ba6507c460 some more service actions
svn path=/trunk/; revision=19536
2006-10-14 22:45:07 +00:00
Ronnie Sahlberg 187454bf8a dissect some more osd service actions
svn path=/trunk/; revision=19535
2006-10-14 22:31:27 +00:00
Ronnie Sahlberg 26e2395f1d if reassembly did not give us a new tvb, then dont call any scsi payload subdissector
svn path=/trunk/; revision=19534
2006-10-14 22:05:57 +00:00
Guy Harris aa60f5a539 Fix a compiler warning by doing what I suspect was intended.
svn path=/trunk/; revision=19533
2006-10-14 20:18:10 +00:00
Guy Harris 196bb24bdd Do the suboption processing in dissect_netware_ip_suboption() a bit more
like the way it's done in other suboption dissectors.

Fix a typo.

svn path=/trunk/; revision=19532
2006-10-14 20:17:14 +00:00
Ronnie Sahlberg 3d0788951a add dissection of FLUSH and FLUSH COLLECTION
svn path=/trunk/; revision=19529
2006-10-14 11:25:38 +00:00
Ronnie Sahlberg ebfc131d81 implement WRITE and CREATE COLLECTION
svn path=/trunk/; revision=19528
2006-10-14 10:52:50 +00:00
Ronnie Sahlberg cfaf149ae8 rename some fields in the setup blob to use the same names as in the standard
add dissection of the bmRequestType bitmap



svn path=/trunk/; revision=19527
2006-10-14 10:09:32 +00:00
Ronnie Sahlberg f1f76a1817 put the packet type in the summary line
svn path=/trunk/; revision=19526
2006-10-14 09:43:17 +00:00
Ronnie Sahlberg 2b13206239 set both read/write flags in ndmp scsi and also always set the expected length to whatever length is transported inside the ndmp pdu
this fixes a regression caused by the recent scsi data in/out reassembly code which made the scsi dissector fail to dissect data in/out over ndmp correctly if scsi reassembly was enabled



svn path=/trunk/; revision=19525
2006-10-14 09:18:24 +00:00
Ronnie Sahlberg 24ef4fcef0 create a new address type AT_USB and start populating the packet list
with nice data




svn path=/trunk/; revision=19524
2006-10-14 05:02:40 +00:00
Ronnie Sahlberg 057c7a0555 let SCSI reassembly default to FALSE
put "reassembled in" in the summary line

put the fragment list at the top of the tree instead of down inside the SCSI expansion



svn path=/trunk/; revision=19523
2006-10-14 01:44:29 +00:00
Ronnie Sahlberg 91ff6ddaf4 add scsi data reassembly
svn path=/trunk/; revision=19519
2006-10-13 22:25:35 +00:00
Ronnie Sahlberg 02ea9c5608 check the estinated data transfer length for the current transfer and start adding checks for scsi data reassembly
svn path=/trunk/; revision=19518
2006-10-13 21:26:03 +00:00
Ronnie Sahlberg 9768637878 dont call the scsi data in/out dissectors unless data offset is 0 i.e. the beginning of data in/out
svn path=/trunk/; revision=19517
2006-10-13 21:07:07 +00:00
Anders Broman c1bc224c9e Set properties.
svn path=/trunk/; revision=19515
2006-10-13 17:04:16 +00:00
Gerald Combs e000e1c8ec Make the "WEP key count" option match the number of WEP key slots. Add
a note about improving the WEP key interface.

svn path=/trunk/; revision=19514
2006-10-13 15:53:20 +00:00