Commit Graph

85 Commits

Author SHA1 Message Date
Gerald Combs 1f8334d9e9 Two more bugs from Ilja van Sprundel.
packet-ndmp.c:
  Fix our payload length check.

packet-nfs.c:
  Check for a maximum bitmap length.

Fix up whitespace.

svn path=/trunk/; revision=18699
2006-07-10 19:54:41 +00:00
Ronnie Sahlberg 0e34335c80 from aaron christensen
fix dissection of get_auth_attr



svn path=/trunk/; revision=18619
2006-06-30 07:51:52 +00:00
Ronnie Sahlberg d8e1827401 allocate the correct size of buffer to store the itlq structure for scsi
we used the wrong size which caused emem to complain that the canary value had been stomped upon.

another win for the canary feature.  thanks gerald


svn path=/trunk/; revision=18491
2006-06-17 08:40:14 +00:00
Ronnie Sahlberg 2849771e3d make ndmp track itl structures
everytime a ndmp_[scsi|tape]_open is seen   create a new itl

we need an itl structure to be able to know what commandset a certain device is using.




svn path=/trunk/; revision=18490
2006-06-17 08:22:03 +00:00
Ronnie Sahlberg feab79e328 change a whole bunch of ethereal into wireshark
svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
Michael Tüxen 3365271c04 Make top_tree static. This allows ethereal to be built on Mac OS X.
svn path=/trunk/; revision=18113
2006-05-09 10:20:28 +00:00
Ronnie Sahlberg dd40edccd9 use request/response tracking structure from NDMP and hang a scsi itlq nexus off it so that cdb/datain/dataout/response tracking for scsi forks also for the ndmp transport.
svn path=/trunk/; revision=18105
2006-05-08 09:20:34 +00:00
Ronnie Sahlberg ad8137903a add tracking of request/response and responsetime to ndmp
we need this in order to be able to provide proper itlq structures to the scsi dissector   so that response data from scsi is dissected properly.



svn path=/trunk/; revision=18104
2006-05-08 08:21:36 +00:00
Ronnie Sahlberg 1df4fecef5 add tracking of ndmp conversations and use this to track the version used if we have seen the CONNECT_OPEN request.
rename the preference to DEFAULT protocol version   to indicate it is only used for those conversation where we have not automatically detected the version used.




svn path=/trunk/; revision=18003
2006-04-26 09:40:49 +00:00
Ronnie Sahlberg 59f9aa6a8c NOTIFY_[DATA|MOVER]_HALTED requests no longer take an XDR string containing the reason for version 4 of ndmp and forward.
svn path=/trunk/; revision=18002
2006-04-26 07:58:45 +00:00
Ronnie Sahlberg acbaf3fe1f change the signature for dissect_scsi_snsinfo() to take itlq and itl structures
update the comment in packet-scsi.c   to reflect that it is the transport now that is responsible to track itl and itlq data

make scsi tapable

svn path=/trunk/; revision=17974
2006-04-24 08:16:18 +00:00
Ronnie Sahlberg e776696d14 the scsi transports (fc/fcp and iscsi) now track both itl and itlq
structures for scsi.

we no longer need the scsi_task_id structure passed by pinfo->private_data   so get rid of it.

we no longer need the (broken by design) scsi_task_data   hash table   since this has been replaced byt hte itl and itlq structures and tracking




svn path=/trunk/; revision=17952
2006-04-22 02:16:52 +00:00
Ronnie Sahlberg 73e65216bc remover the lun parameter from dissect_scsi_cdb/payload since this is now part of the exchange data in itlq
remove the two fields opcode and devtype from the scsi_task_data structure since these are also part of the itlq and itl structures



svn path=/trunk/; revision=17949
2006-04-21 22:00:38 +00:00
Ronnie Sahlberg 60e65f4869 updates to get the fc and scsi dissectors
and get rid of some breakage in the design


let the scsi transport keep track of itl (initiator, target, lun) matching
and let it pass a itl structure to scsi   that is persistent across packets.

let scsi use this itl structure to track device type for a specific itl instead of the (must have been) broken hashtable.

update both iscsi and fc to track the itl structure for scsi and schange the scsi signature to accept itl as a parameter.


more to come.



svn path=/trunk/; revision=17942
2006-04-21 11:08:24 +00:00
Ronnie Sahlberg 9481eac669 make dissect_scsi_rsp() take an exchange structure as parameter instead of just a lun.
this finally allows us to have scsi.time  for scsi transactions   but we need to cleanup and refactor the other three scsi entrypoints before we should implement scsi srt    to make the other three also take an exchange data structure as parameter from their transports (and get rid of the pinfo->private_data )


svn path=/trunk/; revision=17838
2006-04-07 10:15:15 +00:00
Ronnie Sahlberg f331077a60 waste a couple of bytes per tcp conversation and make the tree for acked_packets (i.e. packets that have interesting tcp properties such as being retransmissions etc) hang off the per conversation tcpd struct instead of being global.
while this should improve performance by unmeasurably little it does have the sideeffect that once we finish the rewrite   tcp analysis might actually work and work well even for tcp over tcp tunnelling. 

this also means that if you include packet-tcp.h   you also need to include emem.h .




svn path=/trunk/; revision=17681
2006-03-20 10:52:53 +00:00
Ulf Lamping 9a42ef9536 fix #480: Change defaults for all reassembling settings to ON
I've changed all settings I could find to TRUE. It might be reasonable to change some protocol settings back to FALSE, if reassembling fails very often.

svn path=/trunk/; revision=16048
2005-09-28 22:15:38 +00:00
Guy Harris ab2dca9114 Move some headers for stuff defined by a dissector into epan/dissectors
- and rename smb.h to packet-smb.h, as it's packet-smb.c's header file.

svn path=/trunk/; revision=15845
2005-09-17 00:31:15 +00:00
Guy Harris b7b80d94be Move a pile of protocol-related headers from the top-level source
directory to the epan directory.  Some of them should perhaps ultimately
be moved to epan/dissectors, if they pertain only to stuff exported by a
particular dissector.

Fix Gerald's e-mail address in files we're moving.

svn path=/trunk/; revision=15844
2005-09-17 00:02:31 +00:00
Jörg Mayer 69dcb66cd9 More char -> const char warning fixes
svn path=/trunk/; revision=15218
2005-08-05 00:23:22 +00:00
Ronnie Sahlberg aa7157462c remove offset and len from the signature of dissect_scsi_payload()
svn path=/trunk/; revision=14473
2005-05-29 03:18:53 +00:00
Ronnie Sahlberg e66ff913ff make all callers of dissect_scsi_cdb() first create a new subset tvb
change the signature for dissect_scsi_cdb since we no longer need to pass offset over.



svn path=/trunk/; revision=14472
2005-05-29 02:55:12 +00:00
Guy Harris bd29cb1267 Fix a routine to return the value it's supposed to return.
svn path=/trunk/; revision=14354
2005-05-12 02:51:59 +00:00
Ronnie Sahlberg f905153266 add the missing MODE field in mover_get_state that was introduced in version 4.
also change bytes_left_to_read to be a INT64 and not a UINT64.
It iss supposed to be an UINT64  but some implementations are buggy and it is easier to make sense of this field one for those buggy clients if it is printed as an INT64.
This change/violation will not affect any correct/valid NDMP implementation or how ethereal decodes its output  unless your entire backup is > 2**63 bytes in size.



svn path=/trunk/; revision=14228
2005-04-29 08:02:44 +00:00
Ronnie Sahlberg 7061524f79 fix bug in parsing of NDMP_DATA_CONNECT messages, it is a ndmp_address passed to this function not an ndmp_address_type.
svn path=/trunk/; revision=14071
2005-04-14 03:41:31 +00:00
Ronnie Sahlberg 38fd4be564 the definition of tcp address structure changed between version 3 and version 4
make version 4 dissect tcp addr structure properly



svn path=/trunk/; revision=14012
2005-04-04 05:56:57 +00:00
Ronnie Sahlberg 55bd0f9bbb fix printout of length of ndmp pdu
svn path=/trunk/; revision=13478
2005-02-23 08:38:18 +00:00
Ronnie Sahlberg 93e2089ed2 pass lun (and status) to scsi subdissector so we can filter
on scsi.lun   and prettify the summary line a bit.

ndmp still needs some work to track luns between commands
and fcp needs verification it works for volumesetaddressing.



svn path=/trunk/; revision=13420
2005-02-17 12:07:45 +00:00
Lars Roland ec9ca01616 Move the following files from /trunk to /trunk/epan:
asn1.[ch]
follow.[ch]
ptvcursor.[ch]
reassemble.[ch]
xmlstub.[ch]

fix #include statements accordingly.

svn path=/trunk/; revision=13366
2005-02-09 23:38:00 +00:00
Anders Broman 851ecd2ac4 From Jon Ringle:
1) Added a setup_frame parameter to conversation_t
2) Used the conversation_t next to maintain a list of conversations with the 
same src/dest tuple but different setup_frame number.
3) Changed the signature of find_conversation() and conversation_new() to pass 
in the frame number.
4) Adjusted packet-sdp to select RTP conversation if both m=audio and m=image 
are present, and T.38 conversation if only m=image is present. I expect that 
RTP/T.38 dissecting to be better, but I don't have a way to generate T.38 
packets.

svn path=/trunk/; revision=13243
2005-02-02 20:07:03 +00:00
Ronnie Sahlberg 5d1b339131 make ndmp use tcp_dissect_pdus()
so that it will track pdu boundaries properly

not tracking pdu boundaries caused pain since it would miss too many
commands


svn path=/trunk/; revision=12769
2004-12-18 22:09:06 +00:00
Guy Harris 776280fa0d Properly reject packets that don't look like NDMP packets.
svn path=/trunk/; revision=12216
2004-10-06 09:59:50 +00:00
Guy Harris bbe7f89742 Move prefs.c and prefs.h into the epan subdirectory.
svn path=/trunk/; revision=12115
2004-09-27 22:55:15 +00:00
Ulf Lamping d530bd4e14 Prevent the word "desegmentation" at the GUI, but use reassembling at that places, as we also use "defragmentation" and "reassembling". Use reassembling as the general term for such actions.
I (hopefully) didn't changed any protocol fields or preference file names, but only the GUI labels appearing in the protocol display and the protocol preferences.

Also added a note to the protocol preferences (where appropriate), that you have to enable "Allow subdissectors to reassemble TCP streams" at the corresponding protocol settings for TCP reassembling to take effect.

If you encounter any mistakes I've made here, please let me know...

svn path=/trunk/; revision=11784
2004-08-21 09:02:52 +00:00
Gilbert Ramirez 669db206cb Move dissectors to epan/dissectors directory.
Also move ncp222.py, x11-fields, process-x11-fields.pl,
make-reg-dotc, and make-reg-dotc.py.

Adjust #include lines in files that include packet-*.h
files.

svn path=/trunk/; revision=11410
2004-07-18 18:06:47 +00:00