the WEP/WPA decryption code instead of re-calculating it. Fixes bug
1639.
Remove fcsPresent, radiotapPresent, and associated code from airpdcap.c
since they were always FALSE. Glib-ize some data types. Fixup white
space.
Update the release notes.
svn path=/trunk/; revision=22104
Attached is a patch file for the PANA protocol dissector. The changes updates the packet-pana.c dissector to support draft-ietf-pana-pana-15.txt.
svn path=/trunk/; revision=22098
not unique between ANSI and ITU so we end up with incorrect behavior. In
particular:
- In non-ANSI if GTI==0x1, don't try to decode TT, NP, and ES.
- In ANSI don't decode the O/E indicator on GTI==0x1.
- In non-ANSI don't decode NAI on GTI==0x1 or 0x4.
svn path=/trunk/; revision=22090
anywhere else). Instead of using getaddrinfo() and getnameinfo(),
promote inet_pton.c and inet_ntop.c to the top level and use those
routines instead.
(It's 2007, for crying out loud. Why is this even an issue?)
svn path=/trunk/; revision=22075
The code for reading ERF files has not been significantly
updated since 2004. This patch brings it up to date with a
number of changes.
1) Increase number of decodable ERF types from 7 to 12. This
covers newer DAG card models and firmware updates.
2) Fix timestamp conversion. Was calculating only microsecond
precision, now displaying with nanosecond resolution. Hardware
precision is 7.5 to 30 ns depending on model.
3) Allow the user to specify HDLC encapsulation as 'chdlc',
'ppp_serial', 'frelay' or 'mtp2'. This is needed because the
ERF HDLC capture formats do not include information on what
protocol is used at the next level. This is currently done via
an environment variable 'ERF_HDLC_ENCAP' and is analagous to the
existing 'ERF_ATM_ENCAP' variable.
If the user does not specify an HDLC encapsulation it tries to
guess, and falls back to MTP2 for backwards compatibility with
Florent's existing behaviour.
I know environment variables are ugly, suggestions are welcome.
4) When reading HDLC captures as MTP2, use
WTAP_ENCAP_MTP2_WITH_PHDR rather than WTAP_ENCAP_MTP2. This
allows us to put the 'Multi-Channel ERF' record 'channel
number' field into the MTP2 pseudo header > 'link_number'
field. This is then displayed in Frame information, and can
be filtered on. (Would be nice if it could be made a display
column?)
Because the ERF record does not specify whether Annex A is used
or not, we pass MTP2_ANNEX_A_USED_UNKNOWN and allow the existing
user preference to decide.
Move the MTP2_ANNEX_A_ definitions into Wiretap, make the annex_a_used
field a guint8, and change MTP2_ANNEX_A_USED_UNKNOWN to 2 so it fits in
a guint8. (This means that if you can save an ERF MTP2 file as a
libpcap file, the pseudo-header will have MTP2_ANNEX_A_USED_UNKNOWN in
it.)
svn path=/trunk/; revision=22067
Following items are changed:
*) Bandwidth efficient decoding re-implemented with expert-info support.
The old implementation supported a single frame only.
*) Support for AMR-WB added
*) Fixes for IF1 and IF2 decoding
svn path=/trunk/; revision=22066
(the old one was mapping file handles that differed only by one bit to
the same hash value; the new one mapped them to different hash values).
svn path=/trunk/; revision=22065
The attached patch adds a small enhancement for the ETHERNET Powerlink
dissector (some well-known CANopen device profiles are decoded in human
readable plaintext in the IdentResponse frame).
svn path=/trunk/; revision=22061
attributes specified at open time, have them take a length value, and
pass 4 if the values are extracted from the current packet and 0 if they
come from values saved when the FID was opened (as they're generated
values not found in the packet) - that fixes bug 1638.
svn path=/trunk/; revision=22053
of the function was missing from the call for monitorRouteRequest. It
also appears that the wrong function was being called for
monitorRouteReport.
svn path=/trunk/; revision=22049
These changes allow the packet list clist to be destroyed and recreated
with the new column titles/values/order that the user changed in the
preferences without restarting Wireshark.
svn path=/trunk/; revision=22038
- support of extension in middle of SEQUENCE root elements
- new option EMBEDDED_PDV_CB to set default callback
- ChoiceValue support at syntax level
- ValueSet support at syntax level
- exception identifier support
- ValueFromObject support at syntax level
- next minor changes (to compile X.880 and INAP)
- dissectors using classes regenerated
svn path=/trunk/; revision=22036
TR-111, from the DSL-Forum adds two options to STUN (RFC 3489) to help
with TR-069 enabled devices traverse firewalls. TR-111 can be read here:
http://www.dslforum.org/techwork/tr/*TR-111*.pdf
This patch adds support for decoding the two optional STUN attributes
used by TR-111. One is simply a zero-length attribute, and the other a
string attribute.
Me: Changed stun.att.connection.request.binding to
stun.att.connection_request_binding
svn path=/trunk/; revision=22019
find attached several trivial diffs for viewing RTP SSRC values in Hex
rather than Dec at various places in the UI.
Also includes change from BASE_DEC to BASE_HEX_DEC for corresponding RTP
and RTCP dissector header fields.
svn path=/trunk/; revision=22017
capabilities 7.7.76" function called decode_gtp_mbms_bearer_cap in
an #if 0 block to get the Unix buildbots going again. Left code
intact on the asumption that it is about to be used since it was
recently added.
svn path=/trunk/; revision=22014
routines and routines using those routines. GLib might use different
modifiers for 64-bit quantities than the platform's C library does.
svn path=/trunk/; revision=21990
In all the places where a cast to "long long" or "unsigned long long"
was done, use G_GINT64_MODIFIER and get rid of the cast, as
1) there's no guarantee that "%ll" works
and
2) there's no guarantee that "long long" works
(the latter definitely does *NOT* work with MSVC++; the former doesn't
work with regular printf in MSVC++, but it might work with the GLib
printf-based functions).
svn path=/trunk/; revision=21978
Fix compilation failures when building wireshark-0.99.6-SVN-21916 on an
x86_64-unknown-linux-gnu target with gcc version 4.1.2 20070403 (Red Hat
4.1.2-8).
The failures fall into two categories:
(1) Casts between pointers and 32-bit integers without an intermediary cast
via 'long' or 'unsigned long'. This results in a compiler warning complaining
about casts between a pointer and an integer of a different size.
(2) Passing values to "%lld" or similar printf-style format options that the
compiler thinks are a different size. Such values need to be cast to 'long
long' or 'unsigned long long'.
svn path=/trunk/; revision=21975
Attached is a patch file and a new dissector for FCoE. This protocol
is described at http://fcoe.com and has been submitted to T11. It is an encapsulation protocol that can be used to transport FC frames over raw Ethernet when the link is loss-free due to pause. The Ethertype 0x8906 has been reserved through IEEE for this protocol.
svn path=/trunk/; revision=21967
The enclosed patch updates the ansi isup dissector to support the following parameters:
1. Generic Name
2. Originating Line Info
3. Jurisdiction
4. Charge Number
5. Forward Call Indicator (bits M and N are now being decoded)
6. Cause Code (all values are now being decoded)
svn path=/trunk/; revision=21966
Here is a small patch of a dozen lines that extracts SQL statements from
the packet.
This allows to use the field "drda.sqlstatement" in coloring rules or in a
packet filter so that only SQL statements are dumped from a connection
svn path=/trunk/; revision=21964
adds support for the following RFCs (and RFC-to-be):
- RFC 3519 Mobile IP Traversal of Network Address Translation (NAT) Devices
- RFC 3543 Registration Revocation in Mobile IPv4
- RFC 4433 Mobile IPv4 Dynamic Home Agent (HA) Assignment (including the not
yet published errata about the message extension using the short message
extension format)
- draft-ietf-mip4-message-string-ext Mobile IPv4 Message String Extension
svn path=/trunk/; revision=21948
epan/filesystem.c
have get_plugin_dir() calling init_plugin_dir() if necessary
epan/epan.c and epan/report_err.c
move the report_failure family into the new report_err.c file, have epan_init() calling the initializer
epan/plugins.h and epan/proto.c
do not have init_plugins() calling the proto_reg functions instead do it in init_proto()
gtk/main.c and tshark.c
init_plugin_dir() has become suprefluous
capinfos.c and editcap.c
load the wiretap plugins
Makefiles
do what's needed to build withe the above changes.
svn path=/trunk/; revision=21935
- packet-user_encap.c: use the new UAT_PROTO_DEF
- gtk/uat_gui.c: change the order of "containment" of the widgets to have the clist fields sized to the scrolledwindow instead of the whole window
svn path=/trunk/; revision=21934
I ran into a problem trying to debug some of my stuff yesterday that depends on the http dissector, and the server I'm working with defaults to ssl traffic; whenever I try to debug it, it always gets hung up on the lines I mentioned in the email quoted below (within the ssl dissector).
It seems the culprit is in the use of g_malloc within ssl_data_alloc, and free (instead of g_free) in tls_prf.
I've attached the diff for the fixes I made.
svn path=/trunk/; revision=21929
compiler warns about checking whether it's >= 0, as it always is.
Don't do that check - we don't use "type" until the switch statement,
and GCC should issue a warning if not all valid "enum QUALITY_TYPE"
values are handled in the switch statement.
Sort the items in the switch statement in the order in which they appear
in the enum definition, so it's clearer that it covers all values.
svn path=/trunk/; revision=21890
there's no need for files in DISTCLEANFILES to be in
MAINTAINERCLEANFILES as well.
In epan, split the generated source files into those that should be
cleaned by "make distclean" and those that shouldn't, and have
DISTCLEANFILES include only the ones that should be cleaned by "make
distclean" and have MAINTAINERCLEANFILES include the ones that shouldn't
be cleaned by "make distclean". This should fix bug 1595.
The generated source files don't need to be in EXTRA_DIST.
Use LIBWIRESHARK_DISTCLEAN_GENERATED_SRC and
LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC in epan/Makefile.nmake.
svn path=/trunk/; revision=21882
WIRESHARK_RUN_FROM_BUILD_DIRECTORY is set and, if so and we weren't run
with special privileges, set the running_in_build_directory_flag. Have
it do the same if it finds ".libs" in the pathname of the program and we
weren't run with special privileges, as that means it was probably run
from the libtool wrapper script and presumably thus isn't an installed
binary.
This means that get_credential_info() has to be called before
init_progfile_dir().
Clean up some indentation.
svn path=/trunk/; revision=21866
in both packets of a transaction.
this makes filters such as "smb.file==foo.txt" work much better since they now show both
the read/write request and also the response packets.
this is similar to what we already do in nfs for filehandles
svn path=/trunk/; revision=21856
Remove forward declaration of proto_reg_handoff_gdsdb
(this is just a hack to suppress a warning that needs
a proper solution for many many more files)
svn path=/trunk/; revision=21844
Replace the Interbase dissector by a Firebird/Interbase
dissector.
Me:
Fix warnings about unused parameters
Fix warnings about unused variables
Fix warning about unused function
Fix warning about mixed code and declaration
Declare all dissection functions static
Remove function declarations and move the switching
function down instead.
Update AUTHORS file
Add $Id$ and email address to file header
Fix filename in first comment line
svn path=/trunk/; revision=21843
with default IE names, have bssgp_proto_tree_add_ie() use val_to_str()
if the IE table doesn't have an IE name.
Don't use the IE name as a format; use "%s" as the format, and the IE
name as the argument. (That more clearly states what's being done.)
svn path=/trunk/; revision=21837
Wrap 64-bit constants in G_GINT64_CONSTANT(), so they get the
appropriate suffix appended so the compiler knows they're 64 bits.
svn path=/trunk/; revision=21832
- Update the wireless/AirPcap GUI code to support 802.11n as well as
some related upcoming code changes.
- Remove airpcap.h from the repository, since it exists in the AirPcap
devpack (and will be superseded Real Soon Now).
- Show the individual channel flag bits in radiotap.
Fix the 802.11n MCS set display.
This is a partial checkin, so hopefully nothing is broken.
svn path=/trunk/; revision=21831
libraries. A single library is generated with the lex code without the barrier
"stop on warning". Another library is generated from the remaining source
files with the "stop on warning" barrier.
svn path=/trunk/; revision=21813
new tvb for it or else the offset/length calculations for where blobs
a next_tvb=tvb_new_subset(tvb, chain_offset, MIN((int)len,
tvb_length_remaining(tvb, off)), len);
re in the packets are wrong.
svn path=/trunk/; revision=21795
(original unchanged ASN.1 source could be used because asn2wrs has been improved)
- IE value switch(){} replaced with dissector table
(some switch() and dummy CHOICE still remains but will be removed soon)
svn path=/trunk/; revision=21761
MSVC 2005 crashes, if localtime is called with very large numbers (in this case 218939827321) - probably due to changes that time_t is now 64bits long as default
limit the number given to localtime to a reasonable value
while this isn't a nice fix, I don't see a better way to fix it :-(
svn path=/trunk/; revision=21759
This patch collapses start and end time for each flow to a single duration item. The duration item can, of course, be expanded to display the start and end time.
svn path=/trunk/; revision=21746
put the filename, if known, on the fid expansion line
also place a "generated" fid in failed ntcreateandx so it is easier to
quickly see which file the ntcreateandx failed for
svn path=/trunk/; revision=21739
1. in dissect_routing6() if (rt.ip6r_type == 2) set pinfo->dst to the Home Address.
2. dissect_mipv6_hoa() set the pinfo->src to the Home Address.
svn path=/trunk/; revision=21732
The packet-pana.c dissector I have submitted previously [SVN rev 21447]
had a minor issue. The following are the fixes:
Change packet-pana.c, Line 823:
{ "Ping","pana.flags.e",
to:
{ "Error","pana.flags.e",
svn path=/trunk/; revision=21731
From Kenneth Golomb:
Fixes two issues:
1) interface_name is allocated iface_len+1 bytes but a buffer length of iface
len is passed in when the string is copied. This truncates the string to 9
characters if the interface_name is 10 characters long.
2) interface_name added to tree with proto_tree_add_string_format and is
missing the initial value parameter when called. Even if this is added the
field can not be filtered on. Adding the field with proto_tree_add_item fixes
both the tree display and the filtering issues.
svn path=/trunk/; revision=21730
This patch adds the handling of Spare Extension bytes
to UMTS Frame Protocol. It also handles the case when
the presence of CRC in dedicated channels is not known
(i.e. when FP from a K12/K15 log is dissected).
The new functionality is placed in the new function
"dissect_spare_extension_and_crc". The "dch_crc_present"
field inside "struct fp_info" (file packet-umts_fp.h)
is also extended to handle the case of unknown CRC presence.
Much of other changes is to update "offset" variable and
return it so that the location of Spare Extension and CRC
is available.
The patch also include a small tweak to handle Frame
Protocol information saved from K15. Some fields appear
8 bytes later compared to K12. The changes are in the file
packet-k12.c.
svn path=/trunk/; revision=21726
- Remove unused hf_block_ack_ssc code.
- Fix +HTC detection and frame length calculation.
- Fix Channel Width dissection.
- Fix Primary Channel dissection.
- Tweak the TID field width.
- Display the Block Ack Buffer Size as decimal.
- Display the SSC fragment and sequence numbers as decimal.
- Fix the spelling of "recommended".
svn path=/trunk/; revision=21721
OpenKey keynames should be saved/stored in the dcv structure.
this now makes all policy handles generated by the OpenKey function show
OpenKey(/path/keyname)
for all such policyhandles
svn path=/trunk/; revision=21720
available as the name of the handle
This means we can show policy handles like
OpenKey(/a/b/c/d)
instead of
OpenKey(<...>)
svn path=/trunk/; revision=21719
which also handles TYPE and PARAM_VALUE for strings, regenerate winreg
after using hte conformance file to prettify how and where strings are
to be used to decorate the summary line and the dissection tree
svn path=/trunk/; revision=21717
The splash screen shows a progress bar and a percentage complete - like the progress dialog.
As dissectors are initialised and handed off the name is shown. However, the names of plugin dissectors are not shown.
The update to the make-dissector-reg shell script has been tested, though I think generally the python version is used.
svn path=/trunk/; revision=21716
- all definitions in ASN.1 source are skipped and need not to be commented out
- #.CLASS directive can define types for Object Class Fields
- do not append 'xxx' postfix to parametrized types (changes H.235 and H.450 in accordance with it)
- change QSIG ASN.1 source to be more identical to original one
svn path=/trunk/; revision=21715
Patch tested against traces obtained from Cisco IOS 12.4 Flexible Netflow,
IOS-XR 3.3, Huawei VRP 5.30.
Features:
- Decodes Netflow v9 option templates
- Decodes quite a few additional Netflow v9 types
- Packets and octets counters can be 64-bit
- Show unknown Netflow v9 fields as hexa, useful when using tshark -V with
Netflow v9 implementations that use undocumented proprietary types.
Enabled by: "#define SHOW_UNKNOWN_TYPES 1"
svn path=/trunk/; revision=21672
