aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-06-28wsutil/file_util.h is needed here.Jeff Morriss1-0/+2
svn path=/trunk/; revision=43535
2012-06-28Move if_list_comparator_alph() to iface_lists.c; it's used in severalGuy Harris6-21/+23
places. svn path=/trunk/; revision=43534
2012-06-28If we don't have AirPcap, don't bother with the IF_AIRPCAP case; if weGuy Harris1-0/+2
ever add support for it on additional platforms, HAVE_AIRPCAP will be defined. svn path=/trunk/; revision=43533
2012-06-28get_interface_type() contains no GUI code, so just move it up toGuy Harris3-124/+130
capture_ifinfo.c. svn path=/trunk/; revision=43532
2012-06-28capture_get_if_icon() is no longer platform-dependent; theGuy Harris1-8/+0
platform-dependent work is now done in get_interface_type(). That means we also don't need to protect the handling of IF_DIALUP or even IF_AIRPCAP in #ifdefs, just in case we add support for those types in other OSes. Nothing's uisng the capture_ethernet_16.xpm image here, so don't bother including it. (Does *anybody* use it? I couldn't find any uses, but maybe we should use that.) svn path=/trunk/; revision=43531
2012-06-28No pcap, no interfaces to monitor.Guy Harris1-0/+4
svn path=/trunk/; revision=43530
2012-06-28<wsutil/file_util.h> is needed on Windows.Guy Harris1-0/+2
svn path=/trunk/; revision=43529
2012-06-28Make more routines static.Guy Harris2-6/+4
svn path=/trunk/; revision=43528
2012-06-28Make some routines static to ui/gtk/capture_dlg.c; they're not usedGuy Harris2-24/+29
outside it. svn path=/trunk/; revision=43527
2012-06-28Constify the "string to return if not found" argument toGuy Harris2-15/+9
geoip_db_lookup_ipv4() and geoip_db_lookup_ipv6(). In both of those routines, "ret" is always set to a non-null value - it's initially set to the aforementioned string - so always return it. svn path=/trunk/; revision=43526
2012-06-28<wsutil/file_util.h> is needed by ui/gtk/iface_lists.c on Linux as itGuy Harris2-2/+2
does a ws_stat64() to check for the existence of files in /sys. It's *not* needed in ui/gtk/main.c any more, as that code was moved out of ui/gtk/main.c. svn path=/trunk/; revision=43525
2012-06-28Get rid of a couple of tabs.Guy Harris1-2/+2
svn path=/trunk/; revision=43524
2012-06-28Move the stuff to manage the global interface list and to updateGuy Harris11-500/+582
displays of that list into a separate iface_lists.c file. svn path=/trunk/; revision=43523
2012-06-28No pcap, no interfaces to monitor.Guy Harris4-1/+17
svn path=/trunk/; revision=43522
2012-06-28From Pontus Fuchs:Guy Harris10-1/+358
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-28Update some refresh_interfaces_cb() calls appropriately.Guy Harris1-4/+8
svn path=/trunk/; revision=43520
2012-06-28Comment/#ifdef out a currently-unused variable.Guy Harris1-1/+3
svn path=/trunk/; revision=43519
2012-06-28Make scan_local_interfaces() local to ui/gtk/main.c; widgets/windowsGuy Harris3-437/+425
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-28Detangle the code that manages the interface list on the welcome screen:Guy Harris8-132/+132
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-28No pcap, no interfaces, no interface lists to refresh.Guy Harris2-0/+4
svn path=/trunk/; revision=43516
2012-06-28From Pontus Fuchs:Guy Harris7-94/+180
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-27Rename the GArray of interfaces "if_array", to indicate what it reallyGuy Harris1-23/+24
is, and rename the routine that creates it to "make_if_array()". svn path=/trunk/; revision=43514
2012-06-27Commit file which should have been part of SVN #43506Bill Meier1-6/+36
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-27Prettify display of O_RDONLY and O_ACCMODE flagsPascal Quantin1-17/+28
svn path=/trunk/; revision=43510
2012-06-27Fix compiler warning: "format not a string literal and no format arguments"Bill Meier1-2/+2
svn path=/trunk/; revision=43509
2012-06-27Don't show (essentially meaningless) numeric values of the expert codes.Bill Meier1-2/+5
svn path=/trunk/; revision=43508
2012-06-27Fix for "predefined values sometimes missing in Display Filter Expression ↵Bill Meier1-2/+4
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-27From Jakub Zawadzki: Fix "typeahead search broken in Display Filter ↵Bill Meier1-38/+4
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-27From Martin Raison via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7414Alexis La Goutte1-0/+4
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-27Don't supply a fallback error message for pcap_open() unless it actuallyGuy Harris1-6/+9
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-26General cleanup:Bill Meier1-1604/+1607
- Remove _U_ when function arg is actually used; - Use consistent formatting and whitespace style. svn path=/trunk/; revision=43500
2012-06-26Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7406 :Jeff Morriss1-0/+5
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-26Display expert codes in hexadecimal (less painful for my eyes :))Pascal Quantin1-2/+2
svn path=/trunk/; revision=43497
2012-06-26Validate 'offset' before calling proto_item_set_end(); prevents potential ↵Bill Meier1-0/+4
'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-26From Richard Sharpe:Bill Meier1-5/+5
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-26Have the toolbar "Save" button just be a "Save" button, working the sameGuy Harris1-60/+12
as the File -> Save menu item. svn path=/trunk/; revision=43493
2012-06-25Don't let the user set the frequency or channel when we don't HAVE_PCAP;Jeff Morriss1-0/+10
instead disable the toolbar items (I hope). Hopefully this will fix the MacOS buildbots' --without-pcap builds. svn path=/trunk/; revision=43492
2012-06-25From Michal Labedzki: Anders Broman1-11/+29
RFCOMM-Add-Version-and-DecodeBy-preferences https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6567 svn path=/trunk/; revision=43491
2012-06-25From Michal Labedzki: Anders Broman1-23/+22
RFCOMM-Cosmetic-fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6567 svn path=/trunk/; revision=43490
2012-06-25From Michal Labedzki: Anders Broman1-36/+164
BT: Expose RFCOMM Channel instead of DLCI https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6567 svn path=/trunk/; revision=43489
2012-06-25Revert 43481: linking dftest against libui was not the problem.Jeff Morriss5-44/+41
svn path=/trunk/; revision=43488
2012-06-25Set SVN properties.Jeff Morriss0-0/+0
svn path=/trunk/; revision=43487
2012-06-25Get rid of a couple of unused variables and parameters.Jeff Morriss1-3/+2
svn path=/trunk/; revision=43486
2012-06-25From Martin Kaiser:Anders Broman8-10/+210
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-25From Michael Mann:Anders Broman11-138/+165
generic preferences implementation https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7402 svn path=/trunk/; revision=43484
2012-06-25Tighten up validity checking when doing reassembly.Bill Meier1-13/+10
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-25From Tony Trinh:Anders Broman13-27/+27
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-25Move get_args_as_string from ui/util.c into wsutil (maybe not to the bestJeff Morriss5-41/+44
module, but...). This makes dftest no longer dependent on libui, so stop linking against it. svn path=/trunk/; revision=43481
2012-06-25From Tony Trinh:Anders Broman1-17/+26
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-25From Tony Trinh:Anders Broman11-59/+103
Update Lua from 5.1 to 5.2 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400 svn path=/trunk/; revision=43479