Commit Graph

41316 Commits

Author SHA1 Message Date
Guy Harris b191653a04 Get rid of a couple of tabs.
svn path=/trunk/; revision=43524
2012-06-28 18:22:02 +00:00
Guy Harris 879189564a Move the stuff to manage the global interface list and to update
displays of that list into a separate iface_lists.c file.

svn path=/trunk/; revision=43523
2012-06-28 18:16:18 +00:00
Guy Harris fde7f31b4f No pcap, no interfaces to monitor.
svn path=/trunk/; revision=43522
2012-06-28 17:01:57 +00:00
Guy Harris 1d1391ed47 From Pontus Fuchs:
Add an interface monitor that, on Linux distributions with libnl,
watches for interfaces to appear or disappear and, on such an event,
causes windows showing interface lists to update.

svn path=/trunk/; revision=43521
2012-06-28 16:21:51 +00:00
Guy Harris 28f866815a Update some refresh_interfaces_cb() calls appropriately.
svn path=/trunk/; revision=43520
2012-06-28 15:13:53 +00:00
Guy Harris b52000fc78 Comment/#ifdef out a currently-unused variable.
svn path=/trunk/; revision=43519
2012-06-28 15:11:01 +00:00
Guy Harris 4e893a71fe Make scan_local_interfaces() local to ui/gtk/main.c; widgets/windows
that want a list of interfaces should either call
fill_in_local_interfaces() to make sure the list has been populated at
least once or refresh_local_interface_lists() if they want the list to
be rescanned.

Also make get_interface_type() local to ui/gtk/main.c, as it's not
called from outside ui/gtk/main.c.

Don't declare fill_in_local_interfaces() or hide_interface() unless we
have pcap - we don't define them unless we have pcap.

svn path=/trunk/; revision=43518
2012-06-28 08:25:17 +00:00
Guy Harris 5e7ca579ce Detangle the code that manages the interface list on the welcome screen:
fill_capture_box():

	if there are interfaces on which to capture, constructs the
	interface list, otherwise destroys the interface list and puts
	up a message.

    update_capture_box():

	updates the interface list to reflect current reality.

    welcome_if_panel_reload():

	if there is an interface list, and if there are interfaces on
	which to capture (so that we still want that list), updates the
	list by calling update_capture_box(), otherwise creates or
	destroys it by calling fill_capture_box() (as either it doesn't
	exist but now needs to or does exist but needs to go away).

Have refresh_local_interface_lists(), which re-fetches the list of local
interfaces and updates every interface list that includes local
interfaces, and refresh_non_local_interface_lists(), which only updates
interface lists that (also) include interfaces other than local
interfaces (such as pipes and remote interfaces).  Call them in the
apprpriate places (if we know the list of local interfaces has been
updated, call refresh_local_interface_lists(), otherwise, if we know
interfaces other than local interfaces have been added or removed, call
refresh_non_local_interface_lists()).

Don't have any routine that updates the interface list for one widget
update the interface list for any other widget; leave the global
updating of interface lists up to refresh_local_interface_lists() and
refresh_non_local_interface_lists() - only call one of them if any
interface lists are to be updated.

svn path=/trunk/; revision=43517
2012-06-28 08:13:21 +00:00
Guy Harris 234628c616 No pcap, no interfaces, no interface lists to refresh.
svn path=/trunk/; revision=43516
2012-06-28 02:19:12 +00:00
Guy Harris 9650d477b3 From Pontus Fuchs:
add a capture_dlg_refresh_if() routine to redraw the list of
	interfaces in the Capture -> Interfaces dialog if the lsit of
	known interfaces is updated, and have it do that not by
	destroying and reconstructing the entire dialog box, but just by
	destroying and reconstructing the table containing the
	interfaces and their statistics.

From me:

	have a refresh_interfaces_cb() routine in ui/gtk/main.c that
	scans the local interfaces and refreshes *all* the widgets that
	have interface lists;

	add a "Refresh Interfaces" item to the Capture menu that calls
	that;

	have the "Refresh" button in the "Manage Interfaces" window also
	call that;

	rename the Capture Options window routine dlg_window_present()
	to capture_dlg_window_present() to make it clearer *which*
	dialog it checks for;

	fix Pontus' patch to call capture_stat_stop() *before* nulling
	out the global pointer for the statistics cache - if it's called
	*after* nulling it out, the argument passed to
	capture_stat_stop() is null, and it doesn't kill off the dumpcap
	gathering the statistics so they just pile up (and, at least on
	OS X, chewing up BPF devices until you run out of BPF devices
	that have the right ownership and permissions for dumpcap to use
	as a normal user);

	if refreshing the interfaces fails to get an interface list,
	close the Capture Interfaces dialog.

svn path=/trunk/; revision=43515
2012-06-28 01:54:42 +00:00
Guy Harris f321db7c99 Rename the GArray of interfaces "if_array", to indicate what it really
is, and rename the routine that creates it to "make_if_array()".

svn path=/trunk/; revision=43514
2012-06-27 23:15:28 +00:00
Bill Meier 9489edfbde Commit file which should have been part of SVN #43506
From Jakub Zawadzki: Fix "typeahead search broken in Display Filter Expression Window"
 
 Revert SVN #42291.
 
 Fixes Bug #7412: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7412


svn path=/trunk/; revision=43511
2012-06-27 14:58:32 +00:00
Pascal Quantin 698337ee9a Prettify display of O_RDONLY and O_ACCMODE flags
svn path=/trunk/; revision=43510
2012-06-27 14:57:58 +00:00
Bill Meier 9c9d57321f Fix compiler warning: "format not a string literal and no format arguments"
svn path=/trunk/; revision=43509
2012-06-27 14:44:00 +00:00
Bill Meier e42127ce00 Don't show (essentially meaningless) numeric values of the expert codes.
svn path=/trunk/; revision=43508
2012-06-27 14:15:46 +00:00
Bill Meier bd91ce6af3 Fix for "predefined values sometimes missing in Display Filter Expression window.
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7413

Essentially: BASE_CUSTOM was being used as a mask rather than a field value.


svn path=/trunk/; revision=43507
2012-06-27 13:57:39 +00:00
Bill Meier 45ca434f32 From Jakub Zawadzki: Fix "typeahead search broken in Display Filter Expression Window"
Revert SVN #42291.

Fixes Bug #7412: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7412


svn path=/trunk/; revision=43506
2012-06-27 13:37:13 +00:00
Alexis La Goutte fca94d1d2d From Martin Raison via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7414
PMIPV6 support over IPV4 network

PMIPv6 is an extension of MIPv6, adding a certain number of options to the
MIPv6 protocol. These options are already implemented in the wireshark
dissector, and the MIPv6 headers are recognized, but only inside IPv6 packets.

However, RFC5844 extends the PMIPv6 protocol to make it work over IPv4 networks
: as explained in section 4 of this RFC, the MIPv6 message is carried inside an
IPv4 packet with a UDP header. The port number in the UDP header is 5436


svn path=/trunk/; revision=43505
2012-06-27 13:27:28 +00:00
Guy Harris 2851255f53 Don't supply a fallback error message for pcap_open() unless it actually
fails.

This may clear up the problem most recently reported in bug 7021 after
the crash was fixed, where the capture starts successfully but an error
dialog pops up.

svn path=/trunk/; revision=43501
2012-06-27 05:13:06 +00:00
Bill Meier e3b8929a46 General cleanup:
- Remove _U_ when function arg is actually used;
- Use consistent formatting and whitespace style.

svn path=/trunk/; revision=43500
2012-06-26 21:45:06 +00:00
Jeff Morriss e4599acf28 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7406 :
Build the idl2wrs man page (including the HTML version) but don't install
them: a developer might want to read the man page and the Debian development
package wants to install them.

svn path=/trunk/; revision=43498
2012-06-26 20:41:28 +00:00
Pascal Quantin f2e85a5a96 Display expert codes in hexadecimal (less painful for my eyes :))
svn path=/trunk/; revision=43497
2012-06-26 19:36:08 +00:00
Bill Meier f7d834b564 Validate 'offset' before calling proto_item_set_end(); prevents potential 'Dissector Bug' msg
Addresses comment in Bug #7390 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7390#c1

svn path=/trunk/; revision=43496
2012-06-26 16:06:26 +00:00
Bill Meier 5efda930a6 From Richard Sharpe:
I noticed some inconsistencies in the command naming. The following
patch fixes those (so that they now match between SMB and SMB2):


svn path=/trunk/; revision=43495
2012-06-26 13:02:13 +00:00
Guy Harris cbb028bd47 Have the toolbar "Save" button just be a "Save" button, working the same
as the File -> Save menu item.

svn path=/trunk/; revision=43493
2012-06-26 04:26:04 +00:00
Jeff Morriss 3294c9876a Don't let the user set the frequency or channel when we don't HAVE_PCAP;
instead disable the toolbar items (I hope).

Hopefully this will fix the MacOS buildbots' --without-pcap builds.

svn path=/trunk/; revision=43492
2012-06-25 23:30:23 +00:00
Anders Broman 289707eccc From Michal Labedzki:
RFCOMM-Add-Version-and-DecodeBy-preferences 

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

svn path=/trunk/; revision=43491
2012-06-25 23:17:12 +00:00
Anders Broman bdb1eb55e9 From Michal Labedzki:
RFCOMM-Cosmetic-fixes 

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

svn path=/trunk/; revision=43490
2012-06-25 23:10:01 +00:00
Anders Broman b8b2d513f6 From Michal Labedzki:
BT: Expose RFCOMM Channel instead of DLCI

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

svn path=/trunk/; revision=43489
2012-06-25 22:48:11 +00:00
Jeff Morriss 9e1359e2fa Revert 43481: linking dftest against libui was not the problem.
svn path=/trunk/; revision=43488
2012-06-25 22:21:58 +00:00
Jeff Morriss efbde1c75a Set SVN properties.
svn path=/trunk/; revision=43487
2012-06-25 21:54:43 +00:00
Jeff Morriss af63e14c68 Get rid of a couple of unused variables and parameters.
svn path=/trunk/; revision=43486
2012-06-25 21:45:21 +00:00
Anders Broman b160466dd2 From Martin Kaiser:
add X.509 certificate extensions for DVB-CI/CI+

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

svn path=/trunk/; revision=43485
2012-06-25 21:16:43 +00:00
Anders Broman 3814106d7e From Michael Mann:
generic preferences implementation

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

svn path=/trunk/; revision=43484
2012-06-25 21:05:36 +00:00
Bill Meier 9b21bf229f Tighten up validity checking when doing reassembly.
Fixes Bug #7390  https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7390
(Esentially: Do proper validity checking to prevent a "Dissector Bug" exception;
             throw a BoundsError exception instead).


svn path=/trunk/; revision=43483
2012-06-25 20:43:54 +00:00
Anders Broman e6e6d6217b From Tony Trinh:
Update Lua from 5.1 to 5.2

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

svn path=/trunk/; revision=43482
2012-06-25 20:42:07 +00:00
Jeff Morriss 8eeebf73e0 Move get_args_as_string from ui/util.c into wsutil (maybe not to the best
module, but...).

This makes dftest no longer dependent on libui, so stop linking against it.

svn path=/trunk/; revision=43481
2012-06-25 20:38:45 +00:00
Anders Broman aeceb172a4 From Tony Trinh:
Update autoconf script to check for Lua 5.2 

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

svn path=/trunk/; revision=43480
2012-06-25 20:31:24 +00:00
Anders Broman 6efe4ea27c From Tony Trinh:
Update Lua from 5.1 to 5.2

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

svn path=/trunk/; revision=43479
2012-06-25 20:28:14 +00:00
Guy Harris f272aaeb80 Only allow "Save" if
the file has unsaved changes, and we can save it in some format
	through Wiretap

or

	the file is a temporary file and has no unsaved changes (so that
	"saving" it just means copying it).

Only allow "Save As" if

	we can save it in some format through Wiretap

or

	the file is a temporary file and has no unsaved changes (so that
	"saving" it just means copying it).

This means that we don't support using "Save As" for just copying the
file unless we can do that with Wiretap; copying the file byte-for-byte
only works as "saving" if there are no unsaved changes *and* we're
saving it in the same format that it's in *and* we're saving it with the
same form of compression (if any) that it has.

Rename cf_can_save_as() to cf_can_write_with_wiretap() to better reflect
what it really does.

svn path=/trunk/; revision=43477
2012-06-25 18:37:52 +00:00
Guy Harris c96179ed1e In the "Save As" dialog box, default to compressed if the file is
compressed and the default file format supports compression.

svn path=/trunk/; revision=43475
2012-06-25 17:56:29 +00:00
Pascal Quantin 053707aef8 Fix dissection of NAS EPS Service Request message (broken in r42200)
svn path=/trunk/; revision=43474
2012-06-25 11:12:54 +00:00
Pascal Quantin 2d5792d19b Fix typo errors
svn path=/trunk/; revision=43473
2012-06-25 10:16:15 +00:00
Jeff Morriss 7e1b2bcde2 From Rick Mortensen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4128 :
Add Ericsson-proprietary AVPs and Result-Codes for SCAP.

Add Huawei as a known vendor.

From me:
Reindent the Ericsson XML file; sort the new AVPs by number.

svn path=/trunk/; revision=43472
2012-06-25 04:41:36 +00:00
Anders Broman 342812d0ee From Yair:
1. OAM cells are not automatically detected if the AAL type passed is
AAL_UNKNOWN.
2. CRC10 calculation does not take into account the "crc_stripped" option, and
uses a hardcoded offset of 5 bytes into the cell.

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

svn path=/trunk/; revision=43471
2012-06-24 23:56:27 +00:00
Anders Broman 753d90e57e From Martin Kaiser:
add oid for sha256.

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

svn path=/trunk/; revision=43469
2012-06-24 23:52:24 +00:00
Jeff Morriss 06e81d59b4 Fix up some white space (get rid of 4-space tabs.
svn path=/trunk/; revision=43468
2012-06-24 23:52:05 +00:00
Pascal Quantin a2a9d5757a Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7386 :
Fix dissection of Packet Receipt Times Report Block

svn path=/trunk/; revision=43467
2012-06-24 21:26:40 +00:00
Jörg Mayer 2b6b0656c2 Pontus Fuchs via bug 6973:
Add last piece of the wireless toolbar: Use dumpcap to actually set
the channel.

svn path=/trunk/; revision=43466
2012-06-24 19:45:49 +00:00
Jörg Mayer 5cab183cfb Pontus Fuchs (via bug 6973):
Make the wireless toolbar actually appear.

svn path=/trunk/; revision=43465
2012-06-24 19:43:09 +00:00