Commit Graph

76 Commits

Author SHA1 Message Date
Guy Harris ad096839d3 Move the code to set "max_data" in "dissect_nbss()" earlier, so that
it's set before we dissect continuations.

svn path=/trunk/; revision=538
1999-08-21 17:59:36 +00:00
Richard Sharpe 0ccb231a56 This is the code in packet-nbns that handles continuation messages.
It checks to see if the packet we have in front of us does not start with
one of the four NetBIOS over TCP/IP message types, or if it is a data
message, then looks for \0377SMB in the first four bytes ...

It seems to work well on one large trace of Samba activity that I have.
`

svn path=/trunk/; revision=536
1999-08-21 08:45:09 +00:00
Guy Harris ac4f87218d Declare the "packet_info" structure "pi" in "packet.h", rather than in a
bunch of source files.

Replace the "payload" field of a "packet_info" structure with "len" and
"captured_len" fields, which contain the total packet length and total
captured packet length (including all headers) at the current protocol
layer (i.e., if a given layer has a length field, and that length field
says its shorter than the length we got from the capture, reduce the
"pi.len" and "pi.captured_len" values appropriately).  Those fields can
be used in the future if we add checks to make sure a field we're
extracting from a packet doesn't go past the end of the packet, or past
the captured part of the packet.

Get rid of the additional payload argument to some dissection functions;
use "pi.captured_len - offset" instead.

Have the END_OF_FRAME macro use "pi.captured_len" rather than
"fd->cap_len", so that "dissect the rest of the frame" becomes "dissect
the rest of the packet", and doesn't dissect end-of-frame padding such
as padding added to make an Ethernet frame 60 or more octets long.  (We
might want to rename it END_OF_PACKET; if we ever want to label the
end-of-frame padding for the benefit of people curious what that extra
gunk is, we could have a separate END_OF_FRAME macro that uses
"fd->cap_len".)

svn path=/trunk/; revision=506
1999-08-18 00:57:54 +00:00
Gilbert Ramirez 7bd6c15378 Made the protocol (but not the fields) use the new proto_tree routine,
allowing users to filter on the existence of these protocols. I also
added packet-clip.c to the Nmake makefile.

svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
Gilbert Ramirez 07f42b5b31 Created a new protocol tree implementation and a new display filter
mechanism that is built into ethereal. Wiretap is now used to read all
file formats. Libpcap is used only for capturing.

svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
Guy Harris 653de14d44 As we may return an error message, rather than a NetBIOS name, from
"get_nbns_name()", make sure the array into which you put the name is
"big enough" - MAXDNAME+4 is more than big enough for those error
messages.

svn path=/trunk/; revision=299
1999-06-01 20:40:34 +00:00
Guy Harris cf84edfcf4 Correctly handle the case of the root showing up as a name in a DNS
request or reply.  (Redid "get_dns_name()" along the lines of the code
in the BSD resolver.)

Add code to dissect SOA RRs.

svn path=/trunk/; revision=297
1999-05-27 05:35:08 +00:00
Guy Harris 663ff38e62 Pass NBDS packets on to SMB even if we're only generating a summary
line, so that they show up as SMB packets, rather than NBDS packets, in
the summary display.

Put SMB at the top level of the decode tree for NBDS packets, as is done
for NBSS packets.

svn path=/trunk/; revision=270
1999-05-10 22:07:09 +00:00
Guy Harris 93aab5c7b0 Decode SMB requests inside NetBIOS Datagram Service packets.
svn path=/trunk/; revision=269
1999-05-10 21:50:13 +00:00
Guy Harris 36609cd91e EGCS 1.1's dataflow analysis (and probably that of other versions of
GCC) isn't sophisticated enough to figure out that "nbss_tree" isn't
used if "tree" is null (or doesn't trust it not to change out from under
it), so we have to initialize "nbss_tree" to NULL to squelch complaints
about it being used but uninitialized.

svn path=/trunk/; revision=264
1999-05-10 20:02:57 +00:00
Richard Sharpe 8b00cf57b3 Added initial support for SMB plus most of negprot decode ..
svn path=/trunk/; revision=258
1999-05-09 04:16:36 +00:00
Guy Harris 5958b839bc Add support for the NetBIOS Session Service.
Improve the descriptions of the NetBIOS Name Service errors a bit.

svn path=/trunk/; revision=247
1999-04-30 03:16:03 +00:00
Gilbert Ramirez ef3dfe2077 Removed all references to gtk objects from packet*.[ch] files. They now
reference the protocol tree with struct proto_tree and struct proto_item
objects. That way, the packet decoding source code file can be used with
non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged
some of the information in packet.h to more appropriate places (like other
packet-*.[ch] files).

svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
Guy Harris 464949dc2a Clean up what's displayed for unknown opcodes and unknown rcodes.
svn path=/trunk/; revision=160
1999-01-05 09:01:42 +00:00
Guy Harris bc21c7a2c7 Decode the various flag fields in resource records in NBNS replies.
svn path=/trunk/; revision=159
1999-01-05 08:48:40 +00:00
Guy Harris 229245043d Decode the word containing the opcode, flags, reply code, etc. in DNS
and NBNS requests.

Put the opcode in the COL_INFO field for DNS requests (it was already
there for NBNS requests).

Don't assume a DNS or NBNS request is neatly aligned on a 2-byte
boundary (it might not be if, for example, the packet is an FDDI
packet).

svn path=/trunk/; revision=153
1999-01-04 09:13:46 +00:00
Guy Harris 7dd4f76f59 When dissecting DNS or NBNS queries or replies, add the item to the tree
for the queries or replies first, then create and add the subtree and
populate it, and, when that's done, set the length of the item
appropriately; if you add the subtree later, the subtree's top-level
node appears to have level 0, rather than 1 greater than the tree of
which it's a subtree, which causes those trees not to print correctly.

svn path=/trunk/; revision=122
1998-12-04 05:59:14 +00:00
Guy Harris af5354f148 Take the name-processing part of "get_nbns_name_type_class()" and put it
in "get_nbns_name()", and have "get_nbns_name_type_class()" call it.
Use "get_nbns_name()" rather than "get_nbns_name_type_class()" in the
NBDS code, as there aren't any type or class fields in an NBDS packet.

Show the data in an NBDS datagram as raw data.  (We don't have an SMB
parser yet.)

Don't dissect anything past the header if an NBDS packet is an unknown
packet type.

svn path=/trunk/; revision=117
1998-11-21 04:00:31 +00:00
Gilbert Ramirez 41ce57799c Added NetBIOS datagram support (over UDP, as per RFC 1002).
svn path=/trunk/; revision=111
1998-11-20 05:54:08 +00:00
Gerald Combs 6ca358948b * Added column formatting functionality.
* Added check_col(), add_col_str() and add_col_fmt() to replace references
  to ft->win_info.
* Added column prefs handling code.

svn path=/trunk/; revision=97
1998-11-17 04:29:13 +00:00
Gilbert Ramirez fcb4c78a6a A lengthy patch to add the wiretap library. Wiretap is not used by default
because it is still in its infancy, but it can be compiled in optionally.
The library exists in its own subdirectory ethereal/wiretap. This patch also
edits all the packet-*.c files to remove the #include <pcap.h> line which is
unnecessary in these files. In the ethereal code, file.c is the most heavily
modified with #ifdef WITH_WIRETAP lines for the optional library.

svn path=/trunk/; revision=82
1998-11-12 00:06:47 +00:00
Guy Harris 44c17a888d Fix up an "sprintf()" to handle the possibility that the difference
between two pointers might be a "long" rather than an "int" (on a
platform where they're not the same).

svn path=/trunk/; revision=59
1998-10-15 06:55:42 +00:00
Guy Harris 75b9af68eb Show queries as a summary line (as was the case before my DNS checkins)
which can be expanded into a detailed name/type/class description.

svn path=/trunk/; revision=58
1998-10-15 06:40:51 +00:00
Guy Harris 02fdc292b1 Use "ip_to_str()" and "ether_to_str()" to extract IP and MAC addresses
from a packet and turn them into character strings in dotted-quad or
colonized-sextet form.

svn path=/trunk/; revision=57
1998-10-14 22:37:02 +00:00
Guy Harris 022967513b Tag NetBIOS Name Service-over-UDP packets as "NBNS (UDP)".
Give a detailed display of the innards of NBNS-over-UDP packets.  Export
some stuff from the DNS decoder for the use of the NBNS decoder (NBNS is
DNS-like).

Give a more detailed display of the innards of DNS packets as well.

Fix a couple of minor NBNS bugs.

svn path=/trunk/; revision=55
1998-10-14 19:35:00 +00:00
Gilbert Ramirez 4ef47e6cfb Added preliminary support for NetBIOS Name Services over IPX and UDP. Note
that these are two very different implementations of NetBIOS name services and
at the protocol level are not similar. I have put the UDP protocol in
packet-nbns.c, since it will be a very big module. I have all of rfc 1002 to
read and implement. I am planning on putting many different NetBIOS over IPX
functions in packet-nbipx.c, however, since there is no RFC or published
standard. I have to hack the protocol, and as such, I do not expect it to be
as full-featured as the IP-world equivalents.

svn path=/trunk/; revision=50
1998-10-14 04:09:15 +00:00