Commit graph

41323 commits

Author SHA1 Message Date
Jakub Zawadzki
47cee41290 Revert part of r43579, MSVC_VARIANT should be not defined.
svn path=/trunk/; revision=43585
2012-07-06 07:49:36 +00:00
Jakub Zawadzki
f31b3943c0 - e_addr_resolve is structure so pass it by pointer.
- name_resolve_concurrency must be only defined when used.

svn path=/trunk/; revision=43584
2012-07-06 07:34:08 +00:00
Jakub Zawadzki
500018d4f6 Fix compilation of epan/oids.c without HAVE_LIBSMI
svn path=/trunk/; revision=43583
2012-07-06 07:24:22 +00:00
Jakub Zawadzki
a22526df74 Try to fix compilation on compilers != MSVC.
Note: we should get rid of this circular dependency.

svn path=/trunk/; revision=43582
2012-07-06 07:06:09 +00:00
Pascal Quantin
41e5166f81 Add a few missing ENC_ASCII and remove a few unused hf entries
svn path=/trunk/; revision=43581
2012-07-06 05:33:55 +00:00
Pascal Quantin
0bcc9b0e66 From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7407 :
Update ESTA manufacturer IDs and OEM code values

svn path=/trunk/; revision=43580
2012-07-06 05:17:09 +00:00
Anders Broman
c19583b72c From Michael Mann:
Generic preferences implementation - Printing and Name Resolution.

svn path=/trunk/; revision=43579
2012-07-06 04:48:36 +00:00
Martin Mathieson
4c647041d4 Take yet more care not to be dividing by zero when calculating the bit
rate of the channel/UE. Times four... 

svn path=/trunk/; revision=43578
2012-07-06 01:52:09 +00:00
Jeff Morriss
217514e565 Remove a couple set-but-unused variables. I *think* the new tree isn't
particularly useful...

svn path=/trunk/; revision=43577
2012-07-05 23:31:17 +00:00
Jakub Zawadzki
c7dbc44bf3 Fix bug #7436
offset returned from dissect_nfs_open_claim4, dissect_nfs_openflag4 were different
when we were building tree and where we didn't.
Fix other similar cases.

svn path=/trunk/; revision=43576
2012-07-05 21:09:34 +00:00
Pascal Quantin
a9b2a718a7 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7437 :
PTP Cancel unicast transmission and Acknowledge cancel unicast transmission packets are decoded as malformed

svn path=/trunk/; revision=43575
2012-07-05 20:07:43 +00:00
Jeff Morriss
efe4dd96aa List whether we were compiled with LIBNL or not (including which major
version).

svn path=/trunk/; revision=43574
2012-07-05 19:10:47 +00:00
Pascal Quantin
a0c01750b8 From Guy Martin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7439 :
Add support for DOCSIS 3.0 AES keys

svn path=/trunk/; revision=43573
2012-07-05 19:10:46 +00:00
Pascal Quantin
889ddbd9eb Fix compilation with gcc 4.3.2
svn path=/trunk/; revision=43572
2012-07-05 09:02:08 +00:00
Pascal Quantin
a7fef5b3bf Upgrade LTE RRC dissector to v10.6.0
svn path=/trunk/; revision=43571
2012-07-05 08:44:30 +00:00
Guy Harris
918e00880c From Pontus Fuchs:
Remove refresh button from wireless toolbar

   With a "refresh interfaces" menu option and device hotplug
   notification in place there is no longer need for a refresh
   button in the toolbar.

svn path=/trunk/; revision=43570
2012-07-05 05:36:50 +00:00
Pascal Quantin
d94492cc71 From Richard Sharpe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7428 :
Add SPNEGO Extended Negotiation (NEGOEX) Security Mechanism dissector

svn path=/trunk/; revision=43569
2012-07-05 05:26:28 +00:00
Guy Harris
b1ab794baa From Pontus Fuchs:
Refresh wireless toolbar too

    The recently improved refresh interfaces code forgot the wireless
    toolbar. Make sure to refresh it too.

svn path=/trunk/; revision=43568
2012-07-05 02:01:43 +00:00
Guy Harris
eb38ae49b1 From Pontus Fuchs:
Fix wireless toolbar

    The compilation fix for mac got it slightly wrong:

    s/HAVE_PCAP/HAVE_LIBPCAP/

svn path=/trunk/; revision=43567
2012-07-05 01:59:00 +00:00
Bill Meier
c02d156881 The amqp dissector is not a plugin; remove comment indicating that it's a plugin.
Also: Fix some "4 space tab" indentation (replace with spaces).

svn path=/trunk/; revision=43566
2012-07-04 13:04:16 +00:00
Pascal Quantin
c529c306d4 From Evan Huus via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7433 :
Remove unused mask variable in packet-bmc.c

svn path=/trunk/; revision=43565
2012-07-04 10:08:22 +00:00
Guy Harris
5d18b53bda Expand that comment to note that there's no guarantee that GLIB_LIBS has
-gmodule or that GTK_LIBS doesn't have it.

svn path=/trunk/; revision=43564
2012-07-03 22:42:14 +00:00
Jeff Morriss
3d1b5e3474 As suggested by Jakub in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7429#c4 :
Add checks for calls to proto_tree_add_XXX (where XXX != item and a few other
functions) with an encoding (ENC_*) argument.


Also add a comment to checkAddTextCalls() about why 3 loops are used.

svn path=/trunk/; revision=43563
2012-07-03 21:55:55 +00:00
Guy Harris
d889046e5f As per Gentoo bug 423743
https://bugs.gentoo.org/show_bug.cgi?id=423743

"The Makefile.am claims including GLIB_LIBS when linking wireshark is
unnecessary, because wireshark links to GTK_LIBS which is a superset.
It is not actually a superset: gmodule is included in GLIB_LIBS but
not in GTK_LIBS (unless accidentally on older glibs/gtks)."

so we must explicitly link with GLIB_LIBS.

Update the comment to reflect that - and to reflect that GTK+ doesn't
necessarily run atop X11 - while we're at it.

Fixes bug 7427.

#BACKPORT

svn path=/trunk/; revision=43561
2012-07-03 20:12:50 +00:00
Pascal Quantin
a24fa25716 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7430 :
Dissection of EAP-SIM and EAP-AKA is broken

svn path=/trunk/; revision=43560
2012-07-03 20:07:53 +00:00
Bill Meier
234cd599b3 Remove a leftover // "comment to self" (fixes checkAPI error).
svn path=/trunk/; revision=43559
2012-07-03 19:47:54 +00:00
Bill Meier
7882ec57c3 Improve use of the value_string x11_keysym_vals_source[]:
- Compile the value_string only as part of packet-x11.c
 - Create a value_string_ext to ref the value_string;
 - packet_vnc.c: Access the value_string using the value_string_ext;
 - packet-x11.c: Access the value-string using the value_string_ext
                 rather then building a temp GTree from the value_string.

svn path=/trunk/; revision=43558
2012-07-03 18:49:12 +00:00
Jeff Morriss
7a900c81b3 From Pontus Fuchs on -dev:
Fix collision between net/if.h and linux/if.h (which is included by libnl3).

svn path=/trunk/; revision=43557
2012-07-03 17:48:21 +00:00
Alexis La Goutte
a16c3e2692 From report of Dennis Mendoza via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7429
Wireshark > 1.4 does not correctly read Association ID for PS Poll packets

Wireless Frame with subtype 0x1a don't interpret the Association ID (always 0).

Fix : 
proto_tree_add_uint() wasn't changed to proto_tree_add_item()

#BACKPORT

svn path=/trunk/; revision=43556
2012-07-03 12:28:06 +00:00
Jeff Morriss
6dd3a8b1fd From Todd Eigenschink via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7411 :
Have runlex.sh exit with the exit status of lex (if it failed).

svn path=/trunk/; revision=43555
2012-07-02 21:15:51 +00:00
Gerald Combs
fcf2da1b99 [Automatic manuf, services and enterprise-numbers update for 2012-07-01]
svn path=/trunk/; revision=43551
2012-07-01 14:03:32 +00:00
Jakub Zawadzki
8c1d02377e Fix bug #7425: Per-packet right-click network or MAC name resolution not working
proto_tree_draw() from r43189 is lazy, and it don't fills tree with all item labels.
To fix it, move 'gbl_resolv_flags' hack to proto_tree_model_get_value().

XXX could we pass resolving flags to proto_item_fill_label()?


svn path=/trunk/; revision=43550
2012-06-30 10:43:50 +00:00
Guy Harris
3a4678b00f Separate the code for each column in the interface list with blank
lines.

svn path=/trunk/; revision=43549
2012-06-30 00:32:03 +00:00
Guy Harris
7546a033c7 Clarify *which* capture dialogs are handled by capture_dlg.c.
svn path=/trunk/; revision=43548
2012-06-29 22:52:13 +00:00
Jeff Morriss
f01a28135f Clean up capture option tooltip spacing and remove an extraneous word (at the end of the monitor mode description). Also use sizeof for a buffer size.
svn path=/trunk/; revision=43547
2012-06-29 21:18:35 +00:00
Pascal Quantin
d25ae90a67 From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7420 :
CI/CI+: dissect CICAM NIT

svn path=/trunk/; revision=43546
2012-06-29 20:10:25 +00:00
Guy Harris
0d56350b19 Add support for listening for interface arrival/departure events on
PF_SYSTEM sockets on OS X.

Pull iface_mon_nl_init() into iface_mon_start(), to make it a little
easier to figure out what interface monitoring code on other platforms
should do.

Add a bunch of XXX comments about additional things we should perhaps
do.

svn path=/trunk/; revision=43545
2012-06-29 18:04:11 +00:00
Guy Harris
021b749051 ui/gtk/iface_lists.c no longer needs <wsutil/file_util.h>, as the
"determine the interface type" code moved to capture_ifinfo.c.

svn path=/trunk/; revision=43544
2012-06-29 18:03:17 +00:00
Jakub Zawadzki
e083f0f71e Try to fix win64 buildbot.
packet-dbus.c(354) : error C2220: warning treated as error - no 'object' file generated
packet-dbus.c(354) : warning C4267: '=' : conversion from 'size_t' to 'int', possible loss of data

svn path=/trunk/; revision=43543
2012-06-29 17:44:48 +00:00
Jakub Zawadzki
33bfa85452 Initial support for D-Bus dissection (bug #5502)
svn path=/trunk/; revision=43542
2012-06-29 15:23:21 +00:00
Jakub Zawadzki
40776e2fed Add len() function to dfilter. For now only support FT_STRING*
Note: it returns bytes-length, not number of UTF-8 characters.

svn path=/trunk/; revision=43541
2012-06-29 11:11:24 +00:00
Jakub Zawadzki
a8eea83c37 Also support FT_STRINGZ and FT_UINT_STRING in lower()/ upper() functions.
svn path=/trunk/; revision=43540
2012-06-29 11:07:08 +00:00
Bill Meier
163ca72bab From Роман Донченко: "Adaptation" misspelled as "adaption"
In MPEG-related dissectors, "adaption" is used instead of "adaptation" several
times. See patch (it also fixes an unrelated typo that happens to be on the
same line).

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

svn path=/trunk/; revision=43539
2012-06-29 01:55:05 +00:00
Jakub Zawadzki
b18e880040 Update FSF address - part II.
svn path=/trunk/; revision=43538
2012-06-28 23:18:38 +00:00
Jakub Zawadzki
f19346af34 Update GPL-2 license in COPYING
svn path=/trunk/; revision=43537
2012-06-28 23:02:28 +00:00
Jakub Zawadzki
bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Jeff Morriss
35f83ce720 wsutil/file_util.h is needed here.
svn path=/trunk/; revision=43535
2012-06-28 21:11:41 +00:00
Guy Harris
9d90dc5e8f Move if_list_comparator_alph() to iface_lists.c; it's used in several
places.

svn path=/trunk/; revision=43534
2012-06-28 20:52:26 +00:00
Guy Harris
cccc9f0a2d If we don't have AirPcap, don't bother with the IF_AIRPCAP case; if we
ever add support for it on additional platforms, HAVE_AIRPCAP will be
defined.

svn path=/trunk/; revision=43533
2012-06-28 20:40:44 +00:00
Guy Harris
c51a19cc43 get_interface_type() contains no GUI code, so just move it up to
capture_ifinfo.c.

svn path=/trunk/; revision=43532
2012-06-28 20:16:39 +00:00