obnox/wireshark/wip.git
23 years agoMake "packet-clip.c", "packet-raw.c", "packet-ppp.c", "packet-tr.c",
guy [Fri, 19 May 2000 05:29:44 +0000 (05:29 +0000)]
Make "packet-clip.c", "packet-raw.c", "packet-ppp.c", "packet-tr.c",
"packet-eth.c", and "packet-fddi.c" include the include files that
declare the functions they export, so that the declarationss in the
header files will be checked against the definitions in the source
files.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1981 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoMake "packet-null.c" include "packet-null.h", so that the declarations
guy [Fri, 19 May 2000 05:18:26 +0000 (05:18 +0000)]
Make "packet-null.c" include "packet-null.h", so that the declarations
in "packet-null.h" will be checked against the definitions in
"packet-null.c".

Fix the declaration of "dissect_null()" in "packet-null.h", so that said
checks don't complain.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1980 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoAdd protection against 0-length FT_BYTES being added to proto_tree.
gram [Fri, 19 May 2000 04:54:36 +0000 (04:54 +0000)]
Add protection against 0-length FT_BYTES being added to proto_tree.

Convert ethertype() and dissect_null() to use tvbuff.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1979 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoUse new-style wtap_dump().
gram [Fri, 19 May 2000 02:42:16 +0000 (02:42 +0000)]
Use new-style wtap_dump().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1978 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoMark DHCP packets as DHCP, and add boot.dhcp flag.
gram [Fri, 19 May 2000 02:16:17 +0000 (02:16 +0000)]
Mark DHCP packets as DHCP, and add boot.dhcp flag.
From Paul Ionescu <ipaul@romsys.ro>

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1977 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoNote that the time stamp is printed only when reading an existing
guy [Thu, 18 May 2000 20:58:59 +0000 (20:58 +0000)]
Note that the time stamp is printed only when reading an existing
capture file, not when printing packet summaries as packets are
captured.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1976 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoRemove the "union pseudo_header" from the "frame_data" structure;
guy [Thu, 18 May 2000 09:09:50 +0000 (09:09 +0000)]
Remove the "union pseudo_header" from the "frame_data" structure;
there's no need to keep it around in memory - when the frame data is
read in when handing a frame, read in the information, if any, necessary
to reconstruct the frame header, and reconstruct it.  This saves some
memory.

This requires that the seek-and-read function be implemented inside
Wiretap, and that the Wiretap handle remain open even after we've
finished reading the file sequentially.

This also points out that we can't really do X.25-over-Ethernet
correctly, as we don't know where the direction (DTE->DCE or DCE->DTE)
flag is stored; it's not clear how the Ethernet type 0x0805 for X.25
Layer 3 is supposed to be handled in any case.  We eliminate
X.25-over-Ethernet support (until we find out what we're supposed to
do).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1975 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoPaul Ionescu's patch to add support for IPX over GRE.
guy [Thu, 18 May 2000 08:41:22 +0000 (08:41 +0000)]
Paul Ionescu's patch to add support for IPX over GRE.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1974 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoHave "proto_tree_is_visible" false except when we're in the middle of
guy [Thu, 18 May 2000 08:35:01 +0000 (08:35 +0000)]
Have "proto_tree_is_visible" false except when we're in the middle of
doing something that requires that the text for protocol tree entries be
generated, i.e.

1) initialize it to FALSE;

2) have every routine that sets it clear it when it's done;

3) when printing packets, set it to TRUE only if we're not just
   printing packet summary lines;

and then get rid of settings to FALSE made unnecessary as a result of
those changes.

This makes sure it's not set when it doesn't have to be (which causes
the protocol tree code to format the text when it doesn't have to,
wasting CPU time).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1973 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoSmall fix from Yaniv Kaul.
guy [Wed, 17 May 2000 08:23:50 +0000 (08:23 +0000)]
Small fix from Yaniv Kaul.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1972 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoUpdates to doco.
gram [Wed, 17 May 2000 04:34:20 +0000 (04:34 +0000)]
Updates to doco.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1971 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoGuard against short/malformed packets with old-style bounds-checking.
gram [Wed, 17 May 2000 04:09:32 +0000 (04:09 +0000)]
Guard against short/malformed packets with old-style bounds-checking.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1970 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoAdd "eth.trailer" and show ethernet trailer if it exists.
gram [Wed, 17 May 2000 03:05:39 +0000 (03:05 +0000)]
Add "eth.trailer" and show ethernet trailer if it exists.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1969 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoFix dissect_ascend() prototype.
gram [Tue, 16 May 2000 15:22:31 +0000 (15:22 +0000)]
Fix dissect_ascend() prototype.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1968 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoChange 'cp' to 'mv' for 'accept' step.
gram [Tue, 16 May 2000 06:23:05 +0000 (06:23 +0000)]
Change 'cp' to 'mv' for 'accept' step.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1967 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoConvert Ethernet and Lucent/Ascend dissectors to use tvbuff.
gram [Tue, 16 May 2000 06:21:33 +0000 (06:21 +0000)]
Convert Ethernet and Lucent/Ascend dissectors to use tvbuff.
Note in AUTHORS file that we use the exception module from kazlib.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1966 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoHave tvbuff's keep track of cap_len and pkt_len ('length' and 'reported_length'
gram [Tue, 16 May 2000 04:44:14 +0000 (04:44 +0000)]
Have tvbuff's keep track of cap_len and pkt_len ('length' and 'reported_length'
in tvbuff terminology). This is implemented for TVBUFF_REAL and TVBUFF_SUBSET
so far; support for TVBUFF_COMPOSITE is coming soon.

Throw either ReportedBoundsError or BoundsError.
A ReportedBoundsError is reported as "Malformed Frame" since the protocol
stated that a certain number of bytes should be available but they weren't.
A BoundsError is reported as a "Short Frame" since the snaplen was too short.

Register proto_short (BoundsError) and proto_malformed (ReportedBounds)
so searches can be made on "short" and "malformed".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1965 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoFix a botch that kept it from compiling if you didn't have an SNMP
guy [Mon, 15 May 2000 08:02:39 +0000 (08:02 +0000)]
Fix a botch that kept it from compiling if you didn't have an SNMP
library.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1964 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoAdd very basic tvbuff documentation. I still need to explain TVBUFF_COMPOSITE's,
gram [Mon, 15 May 2000 06:48:16 +0000 (06:48 +0000)]
Add very basic tvbuff documentation. I still need to explain TVBUFF_COMPOSITE's,
and explain how to use exceptions.h.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1963 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoConvert token-ring dissector to use tvbuffs.
gram [Mon, 15 May 2000 06:22:07 +0000 (06:22 +0000)]
Convert token-ring dissector to use tvbuffs.

Modify ethernet dissector to catch BoundsError if the attempt to
create next_tvb with the length specified in the ethernet header throws
an exception. In that case, next_tv is created with as many bytes as
are available in the frame.

Both dissect_tr() and dissect_eth() now have TRY blocks, which means
I had to fiddle with 'volatile' and 'static' storage options to get
things right (at least according to gcc).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1962 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoAdd accessors for 24-bit integers (which get returned as guint32's).
gram [Mon, 15 May 2000 04:37:27 +0000 (04:37 +0000)]
Add accessors for 24-bit integers (which get returned as guint32's).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1961 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoSMUX and SNMP V3 support from Jochen Friedrich.
guy [Mon, 15 May 2000 03:15:12 +0000 (03:15 +0000)]
SMUX and SNMP V3 support from Jochen Friedrich.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1960 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoWe can't trust "cf->current_frame" to refer to the frame that was
guy [Mon, 15 May 2000 01:50:16 +0000 (01:50 +0000)]
We can't trust "cf->current_frame" to refer to the frame that was
selected before we started re-colorizing or re-filtering the display, as
when the first row is added to the clist, that may be selected and thus
made the current frame.

This means that we can't find the row corresponding to the
previously-selected frame, if any, by checking as each packet is
colorized/filtered and see whether its "frame_data" structure is equal
to "cf->current_frame", as that'll always say that the first frame in
the display is the selected frame.

Instead, we recored the value of "cf->current_frame" before we do
anything to the clist, have "add_packet_to_packet_list()" return either
the row number of the frame (if it passed the filter and thus was added
to the clist) or -1 (if it didn't pass the filter and thus wasn't added
to the clist), and, after "add_packet_to_packet_list()", if the current
frame is the one that was the selected row, remember its row number (if
any), and, when we're finished colorizing/filtering the display, make
that row the current row if it's not -1 (-1 means that the selected row
didn't pass the filter).

Also, don't do that until after we've thawed the clist, as the vertical
adjustment for the clist doesn't reflect reality until then, and
attempting to go to a given row won't work right until the vertical
adjustment for the clist reflects reality.

Shove all the code to set the selected and focus rows, and to make said
row visible, into a routine, so the "Find Frame" and "Go To Frame" code
can use it as well.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1959 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoAdd a comment giving the URL of the CIFS Remote Administration Protocol
guy [Sun, 14 May 2000 20:50:03 +0000 (20:50 +0000)]
Add a comment giving the URL of the CIFS Remote Administration Protocol
spec (which covers some of what this file dissects).

Dissect the share type in NetShareEnum replies as a type value (using
values from said spec), not just as a number.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1958 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoThe argument to a "proto_tree_add_item()" adding an FT_IPv4 item should
guy [Sun, 14 May 2000 07:19:49 +0000 (07:19 +0000)]
The argument to a "proto_tree_add_item()" adding an FT_IPv4 item should
be the 32-bit IP address (in host byte order), not a pointer to the
first octet of that IP address.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1957 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoPut in some checks to make sure we don't go past the end of the frame
guy [Sun, 14 May 2000 04:00:48 +0000 (04:00 +0000)]
Put in some checks to make sure we don't go past the end of the frame
when fetching strings in NetShareEnum and NetServEnum2 replies.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1956 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoIn a NetServEnum, there's only one byte of padding after the share name.
guy [Sun, 14 May 2000 03:17:26 +0000 (03:17 +0000)]
In a NetServEnum, there's only one byte of padding after the share name.
(See, for example

ftp://ftp.microsoft.com/developr/drg/CIFS/cifsrap2.txt

.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1955 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoFix location of $(TETHEREAL) dependency.
gram [Sat, 13 May 2000 11:34:12 +0000 (11:34 +0000)]
Fix location of $(TETHEREAL) dependency.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1954 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoUse "htoles()" rather than "pletohs()" to convert host-byte-order shorts
guy [Fri, 12 May 2000 22:12:21 +0000 (22:12 +0000)]
Use "htoles()" rather than "pletohs()" to convert host-byte-order shorts
to little-endian shorts - and to convert host-byte-order longs to
little-endian shorts (if the host-byte-order long will fit into a short,
"htoles()" does the right thing; if it doesn't, there is no right thing
to do - perhaps we should return a wiretap error, although, at least at
present, it's unlikely that we'll have packets bigger than 65535 bytes,
so it's unlikely that the values won't fit into a short).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1953 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoBen Fowler <wapdev@leedsnet.com>'s "usage of fd" patch.
gram [Fri, 12 May 2000 22:03:59 +0000 (22:03 +0000)]
Ben Fowler <wapdev@leedsnet.com>'s "usage of fd" patch.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1952 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoFix minor typo found by Alan Harrison.
guy [Fri, 12 May 2000 21:27:04 +0000 (21:27 +0000)]
Fix minor typo found by Alan Harrison.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1951 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoIf ethernet header has 'length', create tvbuff of only that length
gram [Fri, 12 May 2000 19:15:53 +0000 (19:15 +0000)]
If ethernet header has 'length', create tvbuff of only that length
for next dissector. TODO: mark any remaining data as "Ethernet Trailer"

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1950 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoDoug Nazar's patch to dissect substring filters.
guy [Fri, 12 May 2000 08:04:29 +0000 (08:04 +0000)]
Doug Nazar's patch to dissect substring filters.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1949 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoFix dissect_data_tvb() so that it only appends a "Data" proto_tree label
gram [Fri, 12 May 2000 06:23:33 +0000 (06:23 +0000)]
Fix dissect_data_tvb() so that it only appends a "Data" proto_tree label
if there are more than 0 bytes of data.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1948 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoAdd a sample Makefile for regression testing by using tethereal.
gram [Fri, 12 May 2000 05:47:00 +0000 (05:47 +0000)]
Add a sample Makefile for regression testing by using tethereal.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1947 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoIn wiretap, set err to 0 before doing anything inside wtap_loop().
gram [Fri, 12 May 2000 05:06:33 +0000 (05:06 +0000)]
In wiretap, set err to 0 before doing anything inside wtap_loop().
Tethereal was dying on me because err was initialized to some random value.

It was this section of code that would exit even if wtap_loop was successful
(returned TRUE) because err was never initialized or set to anything.

err = load_cap_file(&cf, out_file_type);
if (err != 0) {
       dissect_cleanup();
       exit(2);
}

<BIGGER sheepish grin>
Fixed even more errors in LLC dissector. I had inadvertantly used the
wrong tvbuff_t* when calling dissect_data_tvb(). There is no way we are going
to be successful in this tvbuff conversion w/o regression testing. I'm
working on setting up a simple Makefile for regression testing tonight.
That's why I'm finding so many bugs in my LLC conversion.
</BIGGER sheepish grin>

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1946 f5534014-38df-0310-8fa8-9805f1628bb7

23 years ago<sheepish grin>
gram [Fri, 12 May 2000 04:21:21 +0000 (04:21 +0000)]
<sheepish grin>
Fix error in my conversion to tvbuff routines.
Because offset was calculated based on next_tvb, which already knew to
skip 8 bytes, I don't have to use "offset+8" in calls to the next non-tvbuff
dissectors.
</sheepish grin>

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1945 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoRemove proto_tree doc, as all necessary info in it is in README.developer.
gram [Fri, 12 May 2000 04:00:05 +0000 (04:00 +0000)]
Remove proto_tree doc, as all necessary info in it is in README.developer.
Add tvbtest.c to list of packaged files.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1944 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoConvert LLC dissector to use tvbuffs.
gram [Thu, 11 May 2000 22:04:18 +0000 (22:04 +0000)]
Convert LLC dissector to use tvbuffs.
Non-tvbuff dissectors create a tvbuff when calling dissect_llc()
Changed name of current_proto to match string in COL_PROTO ("FDDI" instead of "fddi")
Changed short text to be: [Short Frame: %s]  where %s is current_proto.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1943 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoPut in a comment to note that "cfgattrident2str()" was put in for use
guy [Thu, 11 May 2000 20:36:14 +0000 (20:36 +0000)]
Put in a comment to note that "cfgattrident2str()" was put in for use
when we parse ISAKMP data attributes - we don't do that yet, which is
why it's not currently used.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1942 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoYaniv Kaul's patch to add support for the ISAKMP Configuration Method
guy [Thu, 11 May 2000 18:55:40 +0000 (18:55 +0000)]
Yaniv Kaul's patch to add support for the ISAKMP Configuration Method
(draft-ietf-ipsec-isakmp-mode-cfg-04.txt).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1941 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoI had moved the COL_INFO string to far forward, before fc was
gram [Thu, 11 May 2000 16:52:15 +0000 (16:52 +0000)]
I had moved the COL_INFO string to far forward, before fc was
being set. Fixed.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1940 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoAdd tvbuff class.
gram [Thu, 11 May 2000 08:18:09 +0000 (08:18 +0000)]
Add tvbuff class.
Add exceptions routines.
Convert proto_tree_add_*() routines to require tvbuff_t* argument.
Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as
the tvbuff_t* argument to proto_tree_add_*() routines.

dissect_packet() creates a tvbuff_t, wraps the next dissect call in
a TRY block, will print "Short Frame" on the proto_tree if a BoundsError
exception is caught.

The FDDI dissector is converted to use tvbuff's.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1939 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoIn "Makefile.am" and "Makefile.nmake", have "DISSECTOR_SOURCES" include
guy [Thu, 11 May 2000 07:34:32 +0000 (07:34 +0000)]
In "Makefile.am" and "Makefile.nmake", have "DISSECTOR_SOURCES" include
only the dissector source files, not the header files; that way you
don't feed the header files to "make-reg-dotc", as "make-reg-dotc" won't
find any registration routines there so there's no point in feeding
header files to it.

Doing so means that we can make "DISSECTOR_OBJECTS" in "Makefile.nmake"
by doing

DISSECTOR_OBJECTS = $(DISSECTOR_SOURCES:.c=.obj)

rather than separately enumerating the object files, as Nmake supports
System V "make"-style substitution.

This should let users who change "DISSECTOR_SOURCES" in one of those
files just copy it to the other file.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1938 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoInclude an example of "wdd" output data from an Ascend trace I got ages
guy [Wed, 10 May 2000 22:20:26 +0000 (22:20 +0000)]
Include an example of "wdd" output data from an Ascend trace I got ages
ago.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1937 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoRename the "private" member of a "wtap_dumper" structure to "dump", as
guy [Wed, 10 May 2000 22:16:31 +0000 (22:16 +0000)]
Rename the "private" member of a "wtap_dumper" structure to "dump", as
per the "capture" member of a "wtap" structure, so that it doesn't
collide with the C++ reserved word "private".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1936 f5534014-38df-0310-8fa8-9805f1628bb7

23 years ago"packet-giop.h" and "packet-h1.h" have joined the Choir Invisibule, so
guy [Wed, 10 May 2000 21:57:47 +0000 (21:57 +0000)]
"packet-giop.h" and "packet-h1.h" have joined the Choir Invisibule, so
they can just be deleted, not just commented out.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1935 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoFix a typo in the packet counter.
gerald [Wed, 10 May 2000 21:36:55 +0000 (21:36 +0000)]
Fix a typo in the packet counter.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1934 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoFixes for building 0.8.8.
gram [Wed, 10 May 2000 15:32:09 +0000 (15:32 +0000)]
Fixes for building 0.8.8.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1933 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoUse "F<>" rather than "B<>" for file names in the Tethereal man page.
guy [Wed, 10 May 2000 06:05:17 +0000 (06:05 +0000)]
Use "F<>" rather than "B<>" for file names in the Tethereal man page.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1932 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoGraham Bloice's changes to make clicking on a column header cause the
guy [Wed, 10 May 2000 06:00:22 +0000 (06:00 +0000)]
Graham Bloice's changes to make clicking on a column header cause the
display to be sorted by the value in that column (and to reverse the sort
order the next time you click on that column).

Use "F<>" rather than "B<>" for file names in the Ethereal man page.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1931 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoFix from Ron Flory to suppress a warning GCC issues on at least some
guy [Tue, 9 May 2000 17:45:02 +0000 (17:45 +0000)]
Fix from Ron Flory to suppress a warning GCC issues on at least some
platforms.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1930 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoChange from Jason Lango to put timestamps in the RTP summary column.
guy [Tue, 9 May 2000 06:28:05 +0000 (06:28 +0000)]
Change from Jason Lango to put timestamps in the RTP summary column.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1929 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoFix a couple of typos.
guy [Tue, 9 May 2000 03:23:35 +0000 (03:23 +0000)]
Fix a couple of typos.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1928 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoOne more "0.8.7" --> "0.8.8"
gram [Tue, 9 May 2000 03:09:55 +0000 (03:09 +0000)]
One more "0.8.7" --> "0.8.8"

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1926 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoMove to version 0.8.8
gram [Mon, 8 May 2000 20:14:03 +0000 (20:14 +0000)]
Move to version 0.8.8

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1925 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoFix from Gerrit Gehnen.
guy [Mon, 8 May 2000 17:19:42 +0000 (17:19 +0000)]
Fix from Gerrit Gehnen.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1924 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoMake the "Preferences" dialog box use the new utilities to make the Esc
guy [Mon, 8 May 2000 07:58:20 +0000 (07:58 +0000)]
Make the "Preferences" dialog box use the new utilities to make the Esc
key cancel the dialog box.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1923 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoKeep a pointer to the current "Preferences" window, if any - if not, the
guy [Mon, 8 May 2000 07:54:54 +0000 (07:54 +0000)]
Keep a pointer to the current "Preferences" window, if any - if not, the
pointer is NULL - so that, instead of doing nothing if the user selects
"Edit->Preferences" when there's already a "Preferences" dialog box
open, we raise and de-iconify that window.

Connect the preferences dialog box and any file selection dialog box
opened from its Print tab, so that:

if the preferences dialog box goes away, so does the file
selection dialog box (as it no longer has a text widget into
which it can stuff the selected file name);

if the "File:" button is clicked when there's already a file
selection dialog box open, we just reactivate that existing
dialog box rather than popping up a new one.

Catch the ESC key in the file selection dialog box popped up for the
"File:" button in the Print tab of the Preferences dialog box, and make
it cancel the file selection dialog box.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1922 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoCatch the ESC key in the file selection dialog boxes popped up for
guy [Mon, 8 May 2000 07:13:40 +0000 (07:13 +0000)]
Catch the ESC key in the file selection dialog boxes popped up for
"File->Open", "File->Save As", and the "File:" buttons in the Capture
Preferences and Print dialog boxes, and make it cancel the file
selection dialog box.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1921 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoSet up the buttons in the "Capture Preferences" dialog box to use
guy [Mon, 8 May 2000 05:51:37 +0000 (05:51 +0000)]
Set up the buttons in the "Capture Preferences" dialog box to use
mnemonics.

Give the button, in the "Display Options" dialog box, that controls
whether name resolution is enabled or not the same label ("Enable name
resolution") as the equivalent button in the "Capture Preferencs" dialog
box.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1920 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoConnect the capture preferences dialog box and any file selection dialog
guy [Mon, 8 May 2000 05:42:54 +0000 (05:42 +0000)]
Connect the capture preferences dialog box and any file selection dialog
box it has open, so that:

if the capture preferences dialog box goes away, so does the
file selection dialog box (as it no longer has a text widget
into which it can stuff the selected file name);

if the "File:" button is clicked when there's already a file
selection dialog box open, we just reactivate that existing
dialog box rather than popping up a new one.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1919 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoKeep a pointer to the current "Print" window, if any - if not, the
guy [Mon, 8 May 2000 05:35:08 +0000 (05:35 +0000)]
Keep a pointer to the current "Print" window, if any - if not, the
pointer is NULL - so that, instead of doing nothing if the user selects
"File->print" when there's already a "Print" dialog box open, we raise
and de-iconify that window.

Connect the print dialog box and any file selection dialog box it has
open, so that:

if the print dialog box goes away, so does the filter dialog box
(as it no longer has a text widget into which it can stuff the
selected file name);

if the "File:" button is clicked when there's already a file
selection dialog box open, we just reactivate that existing
dialog box rather than popping up a new one.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1918 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoKeep a pointer to the current "Display Options" window, if any - if not,
guy [Mon, 8 May 2000 05:12:19 +0000 (05:12 +0000)]
Keep a pointer to the current "Display Options" window, if any - if not,
the pointer is NULL - so that, instead of doing nothing if the user
selects "Display->Options" when there's already a "Display Options"
dialog box open, we raise and de-iconify that window.

Register a "destroy" callback for the "Display Options" window, so that
no matter how it's destroyed, even if it's destroyed by a window manager
close button rather than by clicking the "OK" or "Cancel" button, we
note that fact by clearing the pointer to the current "Display Options"
window, so that if the user then selects "Display->Options", we know
that we need to pop a new "Display Options" window up.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1917 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoSet up the buttons in the "Find Frame" and "Print" dialog boxes to use
guy [Mon, 8 May 2000 04:53:21 +0000 (04:53 +0000)]
Set up the buttons in the "Find Frame" and "Print" dialog boxes to use
mnemonics.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1916 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoAdd functions to create buttons whose labels specify mnemonics, i.e.
guy [Mon, 8 May 2000 04:23:46 +0000 (04:23 +0000)]
Add functions to create buttons whose labels specify mnemonics, i.e.
that contain an "_" preceding a letter, indicating that the letter is to
be underlined in the label, and that if the key for that letter is
pressed (either with Alt or without it) in the dialog box to which the
button belongs, and the widget with the input focus doesn't do anything
with that button, the button is sent the "clicked" signal.

Attach mnemonics to the buttons in the "Display->Options" dialog box.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1915 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoMake the display options dialog box use the new utilities to make the
guy [Mon, 8 May 2000 01:23:16 +0000 (01:23 +0000)]
Make the display options dialog box use the new utilities to make the
Esc key cancel the dialog box.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1914 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoGet rid of some unnecessary (and "#if 0"ed-out) includes.
guy [Mon, 8 May 2000 01:11:46 +0000 (01:11 +0000)]
Get rid of some unnecessary (and "#if 0"ed-out) includes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1913 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoCheck whether "pipe()" succeeds, and pop up a message box and quit if it
guy [Sat, 6 May 2000 07:07:27 +0000 (07:07 +0000)]
Check whether "pipe()" succeeds, and pop up a message box and quit if it
doesn't.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1912 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoFix indentation so that it looks correct if tabs are every 8 spaces,
guy [Sat, 6 May 2000 05:19:42 +0000 (05:19 +0000)]
Fix indentation so that it looks correct if tabs are every 8 spaces,
that being the UNIX default.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1911 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoIf the attempt to execute Ethereal in a child process fails, have the
guy [Sat, 6 May 2000 05:08:39 +0000 (05:08 +0000)]
If the attempt to execute Ethereal in a child process fails, have the
child process send to the parent a message indicating why it failed, so
that the parent can report that, and then exit.

If the attempt to create the child process to run Ethereal fails, pop up
a dialog box indicating that this happened.

Change the fork code a bit, to make it easier to substitute, on Win32
systems, code that does a "CreateProcess()" for the small chunk of code
that does the fork and exec.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1910 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoAdd routines to:
guy [Fri, 5 May 2000 09:32:36 +0000 (09:32 +0000)]
Add routines to:

register lists of "heuristic" dissectors, which are handed a
frame that may or may contain a payload for the protocol they
dissect, and that return FALSE if it's not or dissect the packet
and return TRUE if it is;

add a dissector to such a list;

go through such a list, calling each dissector until either a
dissector returns TRUE, in which case the routine returns TRUE,
or it runs out of entries in the list, in which case the routine
returns FALSE.

Have lists of heuristic dissectors for TCP and for COTP when used with
the Inactive Subset of CLNP, and add the GIOP and Yahoo Messenger
dissectors to the first list and the Sinec H1 dissector to the second
list.

Make the dissector name argument to "dissector_add()" and
"dissector_delete()" a "const char *" rarther than just a "char *".

Add "heur_dissector_add()", the routine to add a heuristic dissector to
a list of heuristic dissectors, to the set of routines we can export to
plugins through a table on platforms where dynamically-loaded code can't
call stuff in the main program, and initialize the element in the table
in question for "dissector_add()" (which we'd forgotten to do).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1909 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoOptimizations for some old code.
gram [Thu, 4 May 2000 22:59:27 +0000 (22:59 +0000)]
Optimizations for some old code.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1908 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoMake the "Print" dialog box use the new utilities to make the Return
guy [Wed, 3 May 2000 07:50:38 +0000 (07:50 +0000)]
Make the "Print" dialog box use the new utilities to make the Return
key print the packets and make the Esc key cancel the dialog box.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1907 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoMake the summary dialog box use the new utilities to make the Return
guy [Wed, 3 May 2000 07:44:12 +0000 (07:44 +0000)]
Make the summary dialog box use the new utilities to make the Return
and Esc keys close the dialog box; to make the Return key work, we have
to make the "Close" button the default widget.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1906 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoMake dialog boxes created with "simple_dialog()" use the new utilities
guy [Wed, 3 May 2000 07:19:38 +0000 (07:19 +0000)]
Make dialog boxes created with "simple_dialog()" use the new utilities
to make the Esc key cancel the dialog box (or accept it, if it has no
"Cancel" button).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1905 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoMake the "Capture Preferences" dialog box use the new utilities to make
guy [Wed, 3 May 2000 07:09:40 +0000 (07:09 +0000)]
Make the "Capture Preferences" dialog box use the new utilities to make
the Return key start the capture and make the Esc key cancel the dialog
box.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1904 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoAdd some utilities to:
guy [Tue, 2 May 2000 08:04:31 +0000 (08:04 +0000)]
Add some utilities to:

set the "activate" signal for a widget to call a routine to
activate the "OK" button for a dialog box;

set the "key_press_event" signal for a top-level dialog window
to call a routine to activate the "Cancel" button for a dialog
box if the key being pressed is the <Esc> key;

to make it easier to drive dialog boxes entirely from the keyboard.

Make the "Find Frame" and "Go To Frame" dialog boxes use those
utilities.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1903 f5534014-38df-0310-8fa8-9805f1628bb7

23 years agoPut in a comment to note what we'd do if we ever wanted to make the
guy [Tue, 2 May 2000 07:44:37 +0000 (07:44 +0000)]
Put in a comment to note what we'd do if we ever wanted to make the
contents of the popup menu differ based on what row or column we're in.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1902 f5534014-38df-0310-8fa8-9805f1628bb7

23 years ago Make "P" a mnemonic for "Print" in the "File" menu.
guy [Tue, 2 May 2000 03:21:41 +0000 (03:21 +0000)]
Make "P" a mnemonic for "Print" in the "File" menu.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1901 f5534014-38df-0310-8fa8-9805f1628bb7

24 years agoAdd in the patch to make the IRIX libpcap handle snapshot lengths larger
guy [Sat, 29 Apr 2000 08:45:39 +0000 (08:45 +0000)]
Add in the patch to make the IRIX libpcap handle snapshot lengths larger
than the interface MTU.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1900 f5534014-38df-0310-8fa8-9805f1628bb7

24 years agoUpdate the README.hpux file to contain the latest version of the libpcap
guy [Sat, 29 Apr 2000 08:38:35 +0000 (08:38 +0000)]
Update the README.hpux file to contain the latest version of the libpcap
patch, which appears to work on at least some HP-UX 10.20 systems, as
well as HP-UX 11.00.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1899 f5534014-38df-0310-8fa8-9805f1628bb7

24 years agoUpdate the README.win32 file to reflect the fact that the latest version
guy [Sat, 29 Apr 2000 08:32:50 +0000 (08:32 +0000)]
Update the README.win32 file to reflect the fact that the latest version
of the GTK+-for-Win32 library seems to work OK (at least with recent
changes to Ethereal avoid passing signed characters to "isprint()").

Note that you will need various Cygwin tools if you modify ".y", ".l",
or dissector files, and give instructions on how to get Cygwin.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1898 f5534014-38df-0310-8fa8-9805f1628bb7

24 years agoDocument "match_strval()" and "val_to_str()", as per Gerrit Gehnen's
guy [Sat, 29 Apr 2000 07:57:43 +0000 (07:57 +0000)]
Document "match_strval()" and "val_to_str()", as per Gerrit Gehnen's
suggestion.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1897 f5534014-38df-0310-8fa8-9805f1628bb7

24 years agoGraham Bloice's changes to, on Win32 using Microsoft's "nmake":
guy [Sat, 29 Apr 2000 07:35:07 +0000 (07:35 +0000)]
Graham Bloice's changes to, on Win32 using Microsoft's "nmake":

build "register.c" in the top-level Makefile;

set path in "config.nmake" to include the Cygwin directory for
tools - those tools are needed to build "register.c";

remove constructed source files, and some additional object
files, when doing "nmake clean".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1896 f5534014-38df-0310-8fa8-9805f1628bb7

24 years agoChanges from Gerrit Gehnen to
guy [Fri, 28 Apr 2000 19:35:41 +0000 (19:35 +0000)]
Changes from Gerrit Gehnen to

1) fix some problems with the SINEC H1 dissector;

2) make it easier to plug in other dissectors atop OSI transport
   protocols (by making the H1 dissector return an indication of
   whether it recognizes the packet as an H1 packet or not, so
   that, if it doesn't, additional dissectors can be tried).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1895 f5534014-38df-0310-8fa8-9805f1628bb7

24 years agoIf the "encrypted payload" flag is set in an ISAKMP packet, don't
guy [Fri, 28 Apr 2000 17:53:25 +0000 (17:53 +0000)]
If the "encrypted payload" flag is set in an ISAKMP packet, don't
dissect the payload, just report it as "Encrypted payload (N byte(s))".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1894 f5534014-38df-0310-8fa8-9805f1628bb7

24 years agoUse "isprint()", rather than "isgraph()" followed by a check for space,
guy [Thu, 27 Apr 2000 20:39:21 +0000 (20:39 +0000)]
Use "isprint()", rather than "isgraph()" followed by a check for space,
as "isprint()" is defined to be "isgraph() or space" (or, historically
speaking, "isgraph()", which came later, is defined to be "isprint()
except for space).

Make the characters in "packet_hex_print()" be "guchar" rather than
"gchar", so that they don't get sign-extended if the 8th bit is set, and
thus don't cause "isprint()" and company to give random answers.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1893 f5534014-38df-0310-8fa8-9805f1628bb7

24 years agoPrint spaces as spaces (instead of '.') in the hex dump pane.
gram [Thu, 27 Apr 2000 17:04:37 +0000 (17:04 +0000)]
Print spaces as spaces (instead of '.') in the hex dump pane.
Thanks to "Dan Warburton" <warb@tgf.tc.faa.gov> for catching that error.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1892 f5534014-38df-0310-8fa8-9805f1628bb7

24 years agoAdd a "-s" flag to editcap, to make it truncate packets to a specified
guy [Thu, 27 Apr 2000 00:31:30 +0000 (00:31 +0000)]
Add a "-s" flag to editcap, to make it truncate packets to a specified
snapshot length before writing them to the output file; this may come in
handy if you are translating the file to a different format so that it
can be read by a program that can't handle packets above a certain size
(e.g., the snoop in Solaris 2.5.1 or 2.6, which reject Ethernet packets
larger than the Ethernet MTU, and thus can't handle gigabit Ethernet
captures using jumbo frames).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1891 f5534014-38df-0310-8fa8-9805f1628bb7

24 years agosupport A6 packet (IPv6 name resolution).
itojun [Wed, 26 Apr 2000 12:01:50 +0000 (12:01 +0000)]
support A6 packet (IPv6 name resolution).
support AD and CD bit in RFC2535 (DNS security extension) section 6.
(seen on packets from BIND9 named)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1890 f5534014-38df-0310-8fa8-9805f1628bb7

24 years agoAdd proto_tree_add_int_format() function.
gram [Tue, 25 Apr 2000 21:43:50 +0000 (21:43 +0000)]
Add proto_tree_add_int_format() function.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1889 f5534014-38df-0310-8fa8-9805f1628bb7

24 years agoFixed declaration of ip_dissector_table and clarified bitwidth doco.
gram [Tue, 25 Apr 2000 08:55:11 +0000 (08:55 +0000)]
Fixed declaration of ip_dissector_table and clarified bitwidth doco.
Patch from Ben Fowler <wapdev@leedsnet.com>

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1888 f5534014-38df-0310-8fa8-9805f1628bb7

24 years agoWe have to look at RTSP packets regardless of whether we're generating a
guy [Fri, 21 Apr 2000 07:43:53 +0000 (07:43 +0000)]
We have to look at RTSP packets regardless of whether we're generating a
protocol tree or not, so that, on the first pass through the capture, we
see the SETUP requests that specify the ports to be used, and thus know
what the conversations for RTCP and RTP are.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1887 f5534014-38df-0310-8fa8-9805f1628bb7

24 years ago8-bit character paranoia.
guy [Fri, 21 Apr 2000 01:52:35 +0000 (01:52 +0000)]
8-bit character paranoia.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1886 f5534014-38df-0310-8fa8-9805f1628bb7

24 years agoSupport for RTCP and RTP, from Jason Lango.
guy [Fri, 21 Apr 2000 01:45:58 +0000 (01:45 +0000)]
Support for RTCP and RTP, from Jason Lango.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1885 f5534014-38df-0310-8fa8-9805f1628bb7

24 years agoLPD fixes from Matthijs Melchior <mmelchior@lucent.com>
gram [Thu, 20 Apr 2000 15:24:41 +0000 (15:24 +0000)]
LPD fixes from Matthijs Melchior <mmelchior@lucent.com>

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1884 f5534014-38df-0310-8fa8-9805f1628bb7

24 years ago"nw_server_address" is no longer a global variable, so don't declare it
guy [Thu, 20 Apr 2000 07:23:45 +0000 (07:23 +0000)]
"nw_server_address" is no longer a global variable, so don't declare it
in "packet-ncp.h".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1883 f5534014-38df-0310-8fa8-9805f1628bb7

24 years agoHave the IPv6 dissector use the same dissector table as the IPv4
guy [Thu, 20 Apr 2000 07:05:58 +0000 (07:05 +0000)]
Have the IPv6 dissector use the same dissector table as the IPv4
dissector.

Don't dissect the payload of any fragmented IPv6 packet unless it's the
initial fragment (that's what we do for IPv4).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1882 f5534014-38df-0310-8fa8-9805f1628bb7

24 years agoMicrosoft Proxy protocol dissector from Jeff Foster.
guy [Thu, 20 Apr 2000 02:18:53 +0000 (02:18 +0000)]
Microsoft Proxy protocol dissector from Jeff Foster.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1881 f5534014-38df-0310-8fa8-9805f1628bb7