directory in which global data files are stored. If an installed binary
is being run, that's the correct directory for them; if a build-tree
binary is being run, the "manuf" file will be there, and you can put
other data files there as well, if necessary.
Do the same with plugins, except that, if there's no
"plugins\\{version}" subdirectory of that directory, fall back on the
default installation directory, so you at least have a place where you
can put plugins for use by build-tree binaries. (Should we, instead,
have the Windows build procedure create a subdirectory of the "plugins"
source directory, with the plugin version number as its name, and copy
the plugins there, so you'd use the build-tree plugin binaries?)
Move "test_for_directory()" out of "util.c" and into
"epan/filesystem.c", with the other file system access portability
wrappers and convenience routines. Fix "util.h" not to declare it - or
other routines moved to "epan/filesystem.c" a while ago.
svn path=/trunk/; revision=3858
Optimize use of AC_CHECK_FUNC in wiretap/acinclude.m4
Move #include "config.h" to be first include in some files.
From albert chin (china@thewrittenword.com)
svn path=/trunk/; revision=3857
result to "proto_tree_add_uint()".
Get rid of the structure declarations in "packet-rx.h"; they're not
used, and one of them has a zero-length array in it, which is not
standard C, and not accepted by all C compilers.
svn path=/trunk/; revision=3852
"standard" plugin directory, and, instead of getting PLUGIN_DIR (the
*real* installation directory) from the configure script, as can be done
in UNIX, attempt to get it by getting the full pathname of the currently
running program and assuming it's in the installation directory.
svn path=/trunk/; revision=3850
checking for "gzgets()" in zlib.
If there is a "zlib.h" header, and there is a "gzgets()" in zlib, check
whether we find "gzgets()" in zlib when we link with the GTK+ link
flags, and, if not, fail. People often grab XFree86 source and build
and install it on their systems, and they appear sometimes to
misconfigure XFree86 so that, even on systems with zlib, it assumes
there is no zlib, so the XFree86 build process builds and installs its
own "mini-zlib" in the X11 library directory. The "mini-zlib" lacks
"gzgets()", and that's the zlib with which Ethereal gets linked, so the
build of Ethereal fails.
svn path=/trunk/; revision=3849
whether that data is an end-marker in an SDES, so we don't report a
malformed frame if the SDES list doesn't end with an RTCP_SDES_END
marker (RFC 1889 says "The list of items in each chunk is terminated by
one or more null octets, the first of which is interpreted as an item
type of zero to denote the end of the list", but the "Parsing RTCP SDES
packets" example doesn't seem to treat hitting the end of the frame
before seeing an RTCP_SDES_END as an error, and at least one Quicktime
capture I have has no RTCP_SDES_END at the end).
Use "tvb_reported_length_remaining()" to do the check, so that we don't
stop until we either hit the *real* end (rather than the capture end) of
the packet, or throw an exception (so that a "Short Frame" indication
shows up if the capture length was such that not all the frame was
captured).
svn path=/trunk/; revision=3848
for the protocol; otherwise, the protocol statistics code doesn't work
(and often trips across assertions). Put the "Gnutella Upload /
Download Stream" item underneath a Gnutell protocol item, rather than
putting it at the top level.
svn path=/trunk/; revision=3847
Make sure that we can handle the lack of 'server_port=' when
setting up a conversation dissector.
Squelch some signed vs. unsigned comparison warnings.
Changes to match only on the destination address in
conversations, because the server might send back a packet from
an address other than the address to which its client sent the
packet, so we construct a conversation with no second address.
svn path=/trunk/; revision=3845
matching request, or for responses where we don't have the
pathname/transaction code of the matching request, indicate the SMB
opcode of the transaction, rather than just saying it's a response to a
generic message.
svn path=/trunk/; revision=3841
don't know the path name, don't give up, just show the parameters and
data, as is done with transactions that aren't mailslot browser
transactions or LANMAN RAP pipe transactions.
svn path=/trunk/; revision=3840
sense; instead, it's a "multiplex ID" used when there's more than one
request *currently* in flight, to distinguish replies.
This means that the MID and PID don't uniquely identify a request in
a conversation.
Therefore, we have to use some other value to distinguish between
requests with the same MID and PID.
Add a mechanism to do so.
svn path=/trunk/; revision=3829
1) Shiva PAP (SPAP) and Extensible Authentication Protocol (EAP)
2) CBCP negotiation in LCP Callback Operation Field
to the PPP dissector.
svn path=/trunk/; revision=3826
fields "Yes" and "No" as their strings and give them new names, so we
don't need to use "proto_tree_add_XXX_format" and so that the enumerated
fields can be filtered symbolically.
Set the length of the top-level NBDS item based on the packet type, and
set it to cover only the header, not the SMB message inside the packet,
for direct and broadcast datagrams.
Set the length of the top-level NBSS header to cover only the header,
not the SMB message, for session messages.
svn path=/trunk/; revision=3825
places) dissector tvbuffified, from Ronnie Sahlberg and me.
Additional "are we past the end of the buffer" checks added, so that we
don't hand random junk to the transaction and transact2 dissectors.
svn path=/trunk/; revision=3824
that rather than passing another copy of that flag to dissectors of
particular messages.
Pass that structure to the pipe subdissector by making "pi.private"
point to it, rather than by passing it as an explicit argument.
Change more of the
if (dirn == 1) {
...
}
if (dirn == 0) {
...
}
stuff to
if (dirn == 1) {
...
} else {
...
}
and then, as per the first paragraph, check the "request" flag in the
"smb_info" structure rather than checking a "dirn" flag.
Set "last_transact2_command" to -1 in the "smb_request_val" structures
for TRANSACTION requests, as it doesn't apply to those requests.
As "dissect_transact_params()" doesn't do any work if the "TransactName"
argument is null, don't bother calling it for a reply if we don't have an
"smb_request_val" for the corresponding request, as that means we can't
find out the value to pass as the "TransactName" argument.
svn path=/trunk/; revision=3822
data type "gint64" really is - should be sufficiient for a %llx format,
and not all compilers that support 64-bit data types have "long long".
svn path=/trunk/; revision=3820
(This fixes an incorrect string for TRANS2_GET_DFS_REFERRAL, which has
the code 0x10 according to the current SNIA CIFS draft spec; I've seen
those in packet captures.)
Create entries in the transaction hash tables only for requests, not for
replies; this means a reply might not have an entry in the table, if the
request didn't appear in the capture, so handle that case.
Make the "last_transact2_command" field of a "smb_request_val" structure
an "int", so it can be given the value -1, which is different from all
the valid 16-bit unsigned values, to indicate that we couldn't get the
transaction code from the request (e.g., because it's too short).
Show the first Setup word in a TRANSACT2 request as the transaction
code, as that's what it is.
"dirn" is a Boolean, so
if (dirn == 1) {
...
}
if (dirn == 0) {
...
}
is equivalent to
if (dirn == 1) {
...
} else {
...
}
and the latter is a bit clearer, so use it.
Distinguish between a TRANSACTION or TRANSACT2 reply where we didn't see
the request and one where we saw the request but didn't see the request
path for TRANSACTION or the request code for TRANSACT2.
Use "g_strdup()" rather than "g_malloc()" followed by "strcpy()".
svn path=/trunk/; revision=3819
"void *" that a dissector can set to point to such a structure; that
means that the stuff in the epan directory doesn't have to know anything
about the protocol-specific private data one dissector passes to
another, and that structure doesn't have to be changed if a dissector
wants to pass some new type of data to another dissector.
svn path=/trunk/; revision=3818
(currently) available on-line.
Updates from Simharajan Srishylam to:
interpret WCCPv2 in the version field;
handle multiple forwarding methods, assignment methods, or
packet return methods being enabled;
treat unknown messages as WCCPv2 messages, and attempt to
dissect the fields common to all v2 messages.
Note that multiple forwarding/assignment/packet return methods should
really be handled as Boolean bitfields.
Fix some signed vs. unsigned comparison issues.
svn path=/trunk/; revision=3817
Use "proto_tree_add_item()" where possible, and use it, rather than
"proto_tree_add_text()", to put the WCCP version into the packet. Make
the version field hex, so the V2 version shows up in a reasonable form.
Show the flags in bit-set capabilities as Boolean bitfields.
Check the length field of capabilities for sanity, and use the length
field to step to the next capability rather than hardwiring in 8.
In the top-level tree item for a capability element, show the type of
element.
Use the correct offsets when putting stuff into the subtree for a
capability element.
Dissect the values of unknown capabilities as opaque arrays of bytes,
not as 4-byte integers.
svn path=/trunk/; revision=3816
(currently) available on-line.
Updates from Simharajan Srishylam to:
interpret WCCPv2 in the version field;
handle multiple forwarding methods, assignment methods, or
packet return methods being enabled;
treat unknown messages as WCCPv2 messages, and attempt to
dissect the fields common to all v2 messages.
Note that multiple forwarding/assignment/packet return methods should
really be handled as Boolean bitfields.
Fix some signed vs. unsigned comparison issues.
svn path=/trunk/; revision=3815
Improve Template and Description for Attribute delegation code
_get_xxx_at() should only be called for Reply with NO_EXCEPTION
_set_xxx_at() should only be called for Request
svn path=/trunk/; revision=3813
"last_data_descrip" fields of an "smb_request_val" structure to null
when you allocate it, so that, when the hash table is cleaned out, we
don't try handing random junk to "g_free()".
svn path=/trunk/; revision=3811
Guy Harris