Commit Graph

43627 Commits

Author SHA1 Message Date
Anders Broman ade0083237 From Andy Karch: L2TP filtering on AVPs 'Called Number' and 'Calling Number' https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8015
svn path=/trunk/; revision=46181
2012-11-25 16:19:19 +00:00
Gerald Combs 497b7770fc [Automatic manuf, services and enterprise-numbers update for 2012-11-25]
svn path=/trunk/; revision=46178
2012-11-25 15:03:35 +00:00
Evan Huus f4a786638b Add strdup_printf and strdup_vprintf to the wmem string utilities.
svn path=/trunk/; revision=46177
2012-11-25 14:16:50 +00:00
Martin Mathieson 4fb9cfe714 Set line width 1 for the cairo context used to draw all lines (bug
8017).  Do it outside of the loop.

svn path=/trunk/; revision=46176
2012-11-25 14:15:02 +00:00
Evan Huus 0d1f86c33e Allocate wmem memory in blocks of 8MB, not 10, because powers of two are nice.
svn path=/trunk/; revision=46175
2012-11-25 13:58:06 +00:00
Martin Mathieson 8abda3c25a Needed to match up correct element lists for data + control for tcptrace
graphs.

Should really make clearer the way lists of elements are allocated and
the final next is assigned to NULL...

svn path=/trunk/; revision=46174
2012-11-25 02:04:00 +00:00
Martin Mathieson 6851b6dee2 Show ACK after data list, so grey/blue is visible when zoomed out.
svn path=/trunk/; revision=46173
2012-11-25 00:35:36 +00:00
Guy Harris 32404dac06 "vendor_description", not "description".
svn path=/trunk/; revision=46172
2012-11-24 19:08:28 +00:00
Evan Huus 706211b642 Make the wmem scopes friendly to the valgrind script like emem is.
svn path=/trunk/; revision=46171
2012-11-24 19:02:05 +00:00
Guy Harris 319891ade3 Put the code to convert a GUID string to a GUID structure into a routine
of its own.  Export that routine from capture_win_ifnames.c.

Rename GetInterfaceFriendlyNameFromDeviceGuid() to
get_interface_friendly_name_from_device_guid(), to match the style of
names of the other routines exported from capture_win_ifnames.c, and
export it as well.

Have if_info_new() use those routines, and, if parse_as_guid() fails,
treat the "description" as a friendly name rather than a vendor
description, so that we don't have a vendor description for, for
example, the device offered on some versions of Windows to handle
dial-up devices.

svn path=/trunk/; revision=46170
2012-11-24 18:55:06 +00:00
Evan Huus 67ea470cc8 Add the block allocator to the documentation.
svn path=/trunk/; revision=46169
2012-11-24 18:49:52 +00:00
Evan Huus ea7e8174c0 Reorder the wmem scopes to be ordered by lifetime, which makes more sense than
the old ordering.

svn path=/trunk/; revision=46168
2012-11-24 18:47:50 +00:00
Evan Huus 8d784dcc46 Add svn properties for the new files.
svn path=/trunk/; revision=46167
2012-11-24 18:44:24 +00:00
Evan Huus a4b164680b Add a simple block allocator to wmem (no canaries or anything yet) and use it
for packet-scope memory.

svn path=/trunk/; revision=46166
2012-11-24 18:42:56 +00:00
Anders Broman dff339dd1e Set up BFCP conversations
svn path=/trunk/; revision=46165
2012-11-24 17:06:08 +00:00
Martin Mathieson 535a8887d7 From Jim Young:
- restore rendering TCP graph titles with black text (fixing bug 8016)

Plus a couple of updated comments.

svn path=/trunk/; revision=46164
2012-11-24 14:20:00 +00:00
Guy Harris 57cc0931b2 There is no longer an interface_friendlyname argument to
get_windows_interface_friendly_name(); don't refer to it.

svn path=/trunk/; revision=46163
2012-11-24 00:31:29 +00:00
Guy Harris 73b3e24705 Constify argument to get_windows_interface_friendly_name().
svn path=/trunk/; revision=46162
2012-11-24 00:29:55 +00:00
Guy Harris 5290b60ab3 Rename get_windows_interface_friendlyname() to
get_windows_interface_friendly_name(), and have it return the friendly
name on success and NULL on failure.

Get rid of the logging in get_windows_interface_friendly_name().

svn path=/trunk/; revision=46161
2012-11-24 00:05:32 +00:00
Pascal Quantin bc5d30c820 Try to fix Windows compilation
svn path=/trunk/; revision=46160
2012-11-23 23:13:22 +00:00
Guy Harris 7ed474bc27 Hoist all the friendly-name/vendor-description stuff up into
if_info_new().

svn path=/trunk/; revision=46159
2012-11-23 22:28:06 +00:00
Bill Meier 6b97dfbfa7 Improve dissection;
- Properly handle DataBlocks with optional fields at end;
- Fix a few field dissections;
General code cleanup;
- Remove almost all tests using tvb_length_remaining():
   If there's not enough data available, just let an
   exception be thrown.
- Fix a memory leak;
- Simplify code in various places.
- Add a reference to the (a ?) Microsoft spec for RDP.

Fixes Bug #7862 in a more complete manner than SVN #45566.

svn path=/trunk/; revision=46158
2012-11-23 21:11:47 +00:00
Anders Broman a1ea2f91d8 Error: the name for hf_bfcp_queue_pos ("bfcp.queue_pos") has trailing space in packet-bfcp.c
svn path=/trunk/; revision=46157
2012-11-23 16:04:20 +00:00
Anders Broman 84582b0429 Update dissetion of the header flags.
svn path=/trunk/; revision=46156
2012-11-23 14:02:12 +00:00
Bill Meier 2ee8d88f00 'if 0' wrapping of config.h no longer required;
Also, '#include winsock2.h' should be before '#include windows.h'
Based upon information provided by Gisle Vanem.

See
https://www.wireshark.org/lists/wireshark-dev/201211/msg00096.html

and message thread starting at
https://www.wireshark.org/lists/wireshark-dev/201211/msg00108.html

svn path=/trunk/; revision=46155
2012-11-23 13:59:56 +00:00
Anders Broman a05cf8c4d2 Add dissection of attributes.
svn path=/trunk/; revision=46154
2012-11-23 13:44:31 +00:00
Irene Rüngeler 2a18c9b5df Fix bug reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8011
svn path=/trunk/; revision=46153
2012-11-23 13:16:04 +00:00
Anders Broman 0fa05b7d2d Cell Identity (CI) is 2 octets.
svn path=/trunk/; revision=46152
2012-11-23 12:00:21 +00:00
Stig Bjørlykke 55aae6767c From mathewt via bug 8012:
Fixed lua le_int64() and le_uint64().

svn path=/trunk/; revision=46151
2012-11-23 11:20:35 +00:00
Guy Harris dec54e9c4d We don't need ole32.lib any more; don't link with it and don't include a
header file for it.

We also don't monkey around with wide characters any more, so don't
include <tchar.h>.

Depending on the SDK you're using and/or the version of Windows on which
you're building, NDIS_IF_MAX_STRING_SIZE and NETIO_STATUS might not be
defined; define them if not.  Thanks to Gisle Vanem for that fix.

svn path=/trunk/; revision=46150
2012-11-23 08:33:00 +00:00
Guy Harris 39fe3c0cee Parse the GUID ourselves; that leaves fewer error cases to worry about,
and thus fewer places where we would need to report an error rather than
just saying "well, this name doesn't end in a GUID, so it doesn't
correspond to an interface whose friendly name we can ask for".

svn path=/trunk/; revision=46149
2012-11-23 08:10:49 +00:00
Guy Harris d2e7cfceee If the interface name doesn't contain a valid GUID string, that's *not*
an error - not all interface names contain GUIDs (e.g., AirPcap devices,
or \Device\NPF_GenericDialupAdapter).  Don't log a message in that case,
just say "sorry, no friendly name".

Get rid of a g_log() call and fflush() calls that look as if they were
copied-and-pasted from sync pipe code.

Correct some comments.

svn path=/trunk/; revision=46148
2012-11-22 20:07:05 +00:00
Guy Harris 7cb9781379 We don't need Cocoa or Core Services for anything.
What we *do* need is:

	the Application Services framework, for GUI applications;

	System Configuration, for anything that would try to get
	interface friendly names;

	Core Foundation for everything that uses either of those and/or
	everything that displays system version information.

We're currently assuming that the only Apple platform on which we build
is OS X, in which case we have the OS X frameworks; update a comment.

cfutils.c is part of WIRESHARK_COMMON_SRC, which is included in
tshark_FILES; it doesn't need to be included in tshark_FILES.

svn path=/trunk/; revision=46147
2012-11-22 18:19:37 +00:00
Guy Harris bef6c70406 Don't set HAVE_LIBNL1 if we have don't libnl at all.
svn path=/trunk/; revision=46146
2012-11-22 18:01:42 +00:00
Gerald Combs 7d27bd0c6e Add cfutils.c + capture_unix_ifnames.c + SystemConfiguration. Sort our
SOURCES.

svn path=/trunk/; revision=46145
2012-11-22 17:29:58 +00:00
Gerald Combs ec560b5b47 Link with CoreFoundation and SystemConfiguration and add cfuitils.c on
OS X where needed. Dumpcap, rawshark and tshark don't appear to require
Cocoa so remove it.

svn path=/trunk/; revision=46144
2012-11-22 16:49:17 +00:00
Michael Tüxen eb41468008 Fix the expert info dealing with parameter padding. The final parameter
in a chunk is not padded, but the padding bytes are considered padding
of the chunk.

svn path=/trunk/; revision=46143
2012-11-22 16:03:19 +00:00
Anders Broman fa4c9734ea Revert http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=46140
looks like the worong variables may be used in the for loops.

../../../plugins/profinet/packet-dcerpc-pn-io.c: In function 'dissect_PDInterfaceMrpDataAdjust_block':
../../../plugins/profinet/packet-dcerpc-pn-io.c:4420:12: warning: variable 'u8MrpInstance' set but not used [-Wunused-but-set-variable]
../../../plugins/profinet/packet-dcerpc-pn-io.c: In function 'dissect_PDInterfaceMrpDataReal_block':
../../../plugins/profinet/packet-dcerpc-pn-io.c:4542:5: error: suggest parentheses around assignment used as truth value [-Werror=parentheses]
../../../plugins/profinet/packet-dcerpc-pn-io.c:4491:12: warning: variable 'u8MrpInstance' set but not used [-Wunused-but-set-variable]
../../../plugins/profinet/packet-dcerpc-pn-io.c: In function 'dissect_PDInterfaceMrpDataCheck_block':
../../../plugins/profinet/packet-dcerpc-pn-io.c:4570:12: warning: variable 'u8MrpInstance' set but not used [-Wunused-but-set-variable]
../../../plugins/profinet/packet-dcerpc-pn-io.c: In function 'dissect_MrpInstanceDataCheck_block':
../../../plugins/profinet/packet-dcerpc-pn-io.c:5426:160: error: unused parameter 'u16BodyLength' [-Werror=unused-parameter]
../../../plugins/profinet/packet-dcerpc-pn-io.c: In function 'dissect_ARBlockReq_block':
../../../plugins/profinet/packet-dcerpc-pn-io.c:6873:9: error: format '%x' expects a matching 'unsigned int' argument [-Werror=format]
../../../plugins/profinet/packet-dcerpc-pn-io.c:6811:13: warning: variable 'u16ARDevAccess' set but not used [-Wunused-but-set-variable]
../../../plugins/profinet/packet-dcerpc-pn-io.c: At top level:
../../../plugins/profinet/packet-dcerpc-pn-io.c:7628:1: error: 'dissect_IRTFrameBlock_block' defined but not used [-Werror=unused-function]
cc1: all warnings being treated as errors

svn path=/trunk/; revision=46142
2012-11-22 12:45:50 +00:00
Anders Broman fbce97738b From Preben Guldberg:
Add a tooltip for a pkt_comment column to show packet comment.

Modified to check frame data for packet_comment and show it as
a tooltip for the entire row.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7995

svn path=/trunk/; revision=46141
2012-11-22 12:33:21 +00:00
Anders Broman 79974a41b0 From Wido Kelling:
Updates to conform IEC 61158.
major change:
reassembling of PNIO fragments (only works if OpenSafty dissector is disabled)
see Bug 7997

minor changes:
improved handling of DFP Frames

added / updated 
MRP Block decoding
ARServerBlock
ARVendorBlock
PDInterfaceDataReal
PDInterfaceAdjust
PDPortStatistic
SubdirFrameData corrected display and subblocks added
PDIRGlobalData complete dissection 
decoding of FrameDataProperties and ARTypes updated to conform the STD
removed now usuported RTC2 ranges

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8002

svn path=/trunk/; revision=46140
2012-11-22 12:12:12 +00:00
Anders Broman d0e85eed92 - Include capture_win_ifnames.h
- false -> FALSE

svn path=/trunk/; revision=46139
2012-11-22 11:38:04 +00:00
Guy Harris c8fc50e817 It's get_windows_interface_friendlyname(), not
get_windows_interface_friendly_name().

svn path=/trunk/; revision=46138
2012-11-22 08:08:52 +00:00
Guy Harris 8052d01fe2 Get the friendly name for interfaces. Also, no Windows interfaces are
loopback interfaces.

svn path=/trunk/; revision=46137
2012-11-22 08:08:06 +00:00
Guy Harris 308d1ffedd Some more if_info_t updates.
svn path=/trunk/; revision=46135
2012-11-22 07:33:39 +00:00
Guy Harris 1105a21a8c Fix another reference to the "description" member of an if_info_t (in
commented-out code).

svn path=/trunk/; revision=46134
2012-11-22 07:02:53 +00:00
Guy Harris 1d0b5f5d07 Add capture_unix_ifnames.c to the list of files needed when building for
UN*X.

svn path=/trunk/; revision=46133
2012-11-22 07:00:23 +00:00
Guy Harris 6a5d8a1e65 Fix a reference to the "description" member of an if_info_t.
svn path=/trunk/; revision=46132
2012-11-22 06:54:35 +00:00
Guy Harris bd976ae6c0 On UN*X, if an interface has a description, use it as the "friendly
name".  If it doesn't have a description, on OS X, use the System
Configuration framework to attempt to get a "friendly name" for
interfaces.

If a loopback device doesn't have a friendly name, give it "Loopback" as
the friendly name.

Move the "turn a CFString into a mallocated C string" routine into
common code, as it's used in more than one place.

svn path=/trunk/; revision=46131
2012-11-22 06:02:49 +00:00
Guy Harris b9e8e95ffe Get rid of an unused variable.
svn path=/trunk/; revision=46130
2012-11-22 05:50:47 +00:00
Guy Harris 24d4323da6 Assume, at least for now, that "Darwin" means "OS X"; don't bother
checking whether the relevant frameworks are available.  (An iOS port's
going to require a *lot* more work, and I don't know whether
Darwin-the-pure-OS even builds and runs any more.)

We don't need Core Services any more, as we're no longer using
Gestalt().  We just need Core Foundation for getting the OS version and
Application Services for firing up Web browser or file manager windows.

svn path=/trunk/; revision=46129
2012-11-22 05:46:49 +00:00