aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-11-21On error, have capture_opts_trim_iface() return the exit status thatGuy Harris6-28/+27
should be used (on success, have it return 0). Exit with that exit status; if the problem is that we couldn't get the interface list or if there are no interfaces in that list, return 2, as that's not a command-line syntax error. svn path=/trunk/; revision=46108
2012-11-21Make the "Invalid capture filter" message resemble that of other programs.Guy Harris1-1/+1
svn path=/trunk/; revision=46107
2012-11-21Handle an error message that includes single quotes.Guy Harris1-1/+1
svn path=/trunk/; revision=46105
2012-11-21Add dumpcap command-line option tests; run them before TShark tests, soGuy Harris1-15/+124
that if dumpcap isn't working right, we don't try TShark tests, as TShark tests that involve capturing probably won't work. svn path=/trunk/; revision=46104
2012-11-21Fix the error message to test for when testing "-i invalid_interface".Guy Harris1-1/+1
svn path=/trunk/; revision=46103
2012-11-21Fix the capitalization of the error message printed if you specify anGuy Harris1-1/+1
invalid interface index. svn path=/trunk/; revision=46102
2012-11-21When dumpcap is being run by another program, its standard error getsGuy Harris1-3/+1
consumed by that program, and that program only ends up reporting one of those errors. Therefore, only log one of them; we're seeing errors in the buildbot, and we want the more detailed error, so don't log a message after GetInterfaceFriendlyNameFromDeviceGuid() returns an error, just rely on the error logged by GetInterfaceFriendlyNameFromDeviceGuid(). Ultimately, we don't want to print anything to the standard output or error at all, as that stuff ends up being consumed by the program in question; we should either ignore the error (if it's an "expected" error) or report it through the API so the the caller can, in turn, report it appropriately. svn path=/trunk/; revision=46099
2012-11-21From Stephen Tarr: Fix 'misspelling (typo) in display filter field name'.Bill Meier1-1/+1
ipv6.framgent --> ipv6.fragment #BACKPORT svn path=/trunk/; revision=46098
2012-11-20SCSI: Sense buffers come in two flavors. Start decoding the descriptor format.Ronnie Sahlberg1-7/+35
svn path=/trunk/; revision=46097
2012-11-20Clean up white space.Guy Harris1-4/+2
Clarify that the other "friendly name" is NDIS's idea of a "friendly name". svn path=/trunk/; revision=46096
2012-11-20We don't use get_windows_interface_friendlyname() in capture_opts.c, soGuy Harris1-32/+36
we don't need to include capture_win_ifnames.h. Clean up white space. svn path=/trunk/; revision=46095
2012-11-19Including config.h causes compile errors; Comment out for now...Bill Meier1-0/+2
svn path=/trunk/; revision=46094
2012-11-19HAVE_CONFIG_H no longer req'dBill Meier1-44/+42
svn path=/trunk/; revision=46093
2012-11-19Attempt to fix the Windows Qt builds.Jeff Morriss1-0/+1
svn path=/trunk/; revision=46092
2012-11-19I thought the test suite was run with capture permissions; that does not ↵Jeff Morriss1-1/+1
appear to be true. Fix the expected output for the "invalid interface" test (again). svn path=/trunk/; revision=46091
2012-11-19Put a line of code on its own line (instead of following a comment).Jeff Morriss1-4/+6
svn path=/trunk/; revision=46090
2012-11-19Failure to find the interface should cause *shark to exit with a status of ↵Jeff Morriss1-1/+1
1, not 2. svn path=/trunk/; revision=46089
2012-11-19As suggested by Evan: just make the variable a size_t instead of casting ↵Jeff Morriss1-2/+2
away the warning. svn path=/trunk/; revision=46088
2012-11-19I'm pretty confident the string length will fit in 32 bits; cast away the ↵Jeff Morriss1-11/+11
"possible loss of data" warning on the Win64 build. svn path=/trunk/; revision=46087
2012-11-19r46083 added interface name matching which changed the error text when an ↵Jeff Morriss1-1/+1
interface can't be found. Update the test to check for the new wording. svn path=/trunk/; revision=46086
2012-11-19From Roland Knall:Anders Broman1-0/+41
Allow for specific enabling and disabling of heuristic dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7997 svn path=/trunk/; revision=46085
2012-11-19From Krishnamurthy Mayya:Anders Broman6-14/+377
Enhancement to support MPLS-TP FM and LI payloads as per RFC 6427 and RFC 6435 Fixed some errors found by checkapi, changed filter names to use proto abbr. svn path=/trunk/; revision=46084
2012-11-19From Mike Garratt:Anders Broman17-208/+728
Friendly Names for interfaces on Windows Notes on the changes the patch covers: * if_info_t struct: addition of friendly_name * Dumpcap Interface list format changes: + Win32: "dumpcap -D" shows friendly_name in place of descript if known + All: machine interface "dumpcap -D -Z none" includes friendly_name in the list in addition to the existing parameters * interface_options struct: addition of console_display_name + When an interface name is displayed in a console, it will typically be the console_display_name (instead of name). + console_display_name is used as the basis of the autogenerated temp filenames + console_display_name is typically set to the friendly_name if known, otherwise it is set to the interface name * Enhancements to capture_opts_add_iface_opt() (the function which process -i options). + Can now specify the interface using its name and friendly_name + Interface name matching is case insenstive + Name matching first attempts exact matching, then falls back to prefix matching (e.g. dumpcap -i local) + Validates interface names, instead of blindly sending them off to winpcap/libpcap + Interface specification by number is still supported. * capture_opts_trim_iface() has been refactored: + Instead of repeating a decent chunk of the cost in capture_opts_add_iface_opt(), it calls capture_opts_trim_iface() to specify the interface. * introduction of capture_win_ifnames.[ch] (windows only code) + Implements static function GetInterfaceFriendlyNameFromDeviceGuid() - a windows version independant function to convert an interface guid into its friendly name. Uses published api functions on windows vista and higher, but falls back to unpublished API functions on older windows releases. + void get_windows_interface_friendlyname(/* IN */ char *interface_devicename, /* OUT */char **interface_friendlyname); - extracts the GUID from the interface_devicename, then uses GetInterfaceFriendlyNameFromDeviceGuid() to do the resolution * Auto temp filename generation: + Now uses wireshark_pcapng_* or wireshark_pcap_* depending on file format + Basis temp filename format on console_display_name + Win32: if console_display_name is a windows interface guid, extracts numbers from GUID here (instead of in interface option processing) GUI CHANGES: * Dialog that displays when you click the "Manage Interfaces" button (within Capture Options dialog) has been renamed from "Add new interfaces" to "Interface Management" * ui/gtk/capture_dlg.c: new_interfaces_w variable renamed to interface_management_w * Win32: Local Interfaces tab on Interface Management dialog, shows includes friendly name as far left column * Interface Management dialog defaults to larger size on win32 - so it fits without resizing local interfaces tab * Interface Management dialog now saves preferences when you click the apply button (local hidden interfaces was not persisting across restarts) * Tweaks: "Interface Details" dialog (Interface list->Capture Interfaces -> Details): + "Friendly Name" renamed to "NDIS Friendly Name" + Added "OS Friendly Name" to the top of the list * Win32: The "Capture Interfaces" dialog now shows the friendly name instead of device guid * Welcome screen: + The height of the interface list scrollbox dynamically adjusts & updates to the number visible interfaces. Up to 10 interfaces can be listed without a scroll bar, the minimum height is for 2 interfaces. + Win32: now shows just the Friendly Name if known - in place of "Interfacename_Guid:(Description)" svn path=/trunk/; revision=46083
2012-11-19Make it easier to switch between GTK2 and GTK3.Anders Broman1-1/+4
svn path=/trunk/; revision=46082
2012-11-19From l.wachowski:Anders Broman1-4/+2
- In de_bssgp_pdu_in_error() use current_offset isof 0. - in function de_bssgp_ran_inf_error_rim_cont. Error rim container doesn't have field rim sequence number. This field exists in the rest of containers but not in this one. So I have removed this field. In this function we have field pdu in error and this field is mandatory, not optional https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8000 svn path=/trunk/; revision=46081
2012-11-19If tshark doesn't fail when building the tree, try again without -V.Jeff Morriss1-1/+7
svn path=/trunk/; revision=46080
2012-11-18Was not allocating a large enough element array for tput graphs.Martin Mathieson1-4/+5
svn path=/trunk/; revision=46079
2012-11-18Added check for missing/empty ProtoField abbrev.Stig Bjørlykke1-0/+4
svn path=/trunk/; revision=46078
2012-11-18Check if we have a filter name.Anders Broman1-0/+5
svn path=/trunk/; revision=46077
2012-11-18Enhance error output.Anders Broman1-1/+1
svn path=/trunk/; revision=46076
2012-11-18From Wido KellingMartin Kaiser1-4/+5
updated Port3 status values to conform to IEC 61158 added decoding of some more values https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7996 svn path=/trunk/; revision=46075
2012-11-18- Make perform_zoom() quickly return if graph already fully zoomed outMartin Mathieson1-205/+212
- Restore zooming out with middle-button + shift - Lose unused graph->next and register_tap_listener_tcp_graph() - Fix up some whitespace svn path=/trunk/; revision=46072
2012-11-18[Automatic manuf, services and enterprise-numbers update for 2012-11-18]Gerald Combs3-27/+240
svn path=/trunk/; revision=46070
2012-11-18Fix some blurbs that matched the field tag.Guy Harris1-194/+194
De-RTMP-ize more AMF-related names and move more of the AMF stuff together. svn path=/trunk/; revision=46069
2012-11-18Move all the AMF stuff under the AMF protocol, as AMF, while it's usedGuy Harris1-241/+236
with RTMP, can be sent over HTTP, for example, as well. svn path=/trunk/; revision=46068
2012-11-18More TODOs:Guy Harris1-0/+8
We hand the user data in a CR or CC packet to the subdissectors, but don't tell the subdissectors that - do we need to? We don't hand the data in an ED packet to the subdissectors - should we, and do we need to tell them that it's an ED packet? svn path=/trunk/; revision=46067
2012-11-18You can't return from inside a TRY/CATCH/ENDTRY block (seeGuy Harris2-26/+66
epan/exceptions.h; it crashes). Try BER first, including both the test dissection and the check of the results. If that fails due to an exception being thrown, or due to the results not indicating that it's a BER-encoded T.125 packet, try PER, so that if the BER dissection doesn't work we don't just give up. Get rid of some _U_s attached to parameters that are, in fact, used. svn path=/trunk/; revision=46066
2012-11-18Support the older format of SR failure for a while longer.Martin Mathieson1-2/+6
svn path=/trunk/; revision=46065
2012-11-18In the heuristic T.124 dissector, catch BoundsError andGuy Harris2-20/+44
ReportedBoundsError exceptions when attempting to dissect the first bit of the packet and, if either is thrown, assume the packet isn't a packet for what we were trying to dissect, rather than just completely failing. Return TRUE if the heuristic T.124 dissector recognizes the packet. Get rid of some _U_s attached to parameters that are, in fact, used. svn path=/trunk/; revision=46064
2012-11-17Add channel type & ID to sequence analysis expert item strings.Martin Mathieson1-33/+63
Also simplify a hash function - haven't measured collisions, but before change sometimes wrong results would get attached. Don't think I fixed it, and don't understand how equality function could have matched even if hash function were colliding... svn path=/trunk/; revision=46063
2012-11-17Squelch another warning.Guy Harris1-1/+1
svn path=/trunk/; revision=46062
2012-11-17Squelch a warning (not enough data flow analysis is done to know thatGuy Harris1-1/+1
cotp_tree actually never will be used uninitialized). svn path=/trunk/; revision=46061
2012-11-17Handle the pseudo-trailer for the ATN extended checksums by passing inGuy Harris4-181/+231
the source and destination address lengths and data, and adding them in, rather than by copying those fields to a fixed-size static buffer - that gets rid of a global variable (global variables considered harmful), and also means that we don't try to copy 24 bytes of length+address from packets that don't *have* 24 bytes of length+address (which caused exceptions to be thrown on some OSI captures I have). Construct some LI #defines out of other LI #defines, to make it a bit clearer why they have the values they do. Support the "additional information related to the clearing of the connection" variable part parameter of the COTP DR packet (which just means giving it a name, as its contents are user-defined - some HP-UX OSI stack appears to just stick in a string saying that it's said stack). Make the code that decodes the variable part of a DR packet look like the code that decodes the variable part of most other packets. For COTP CR packets, determine the class up front by checking whether the length is > 2. (At some point we might want to associate a class indication with the COTP connection, if we see the connection setup, and, if we have that indication, use it in preference to the heuristics.) Make the code to handle various length indicator values in the ATN case more like the code in the non-ATN case. Dissect the variable part of COTP ER packets. Fix tpyos (TDPU->TPDU, tdpu->tpdu) and typpoes (accross->across). Clean up white space. svn path=/trunk/; revision=46060
2012-11-17Fix tpyoes.Guy Harris1-2/+2
svn path=/trunk/; revision=46059
2012-11-17There's no point in initializing variables to 0 when we unconditionally assignEvan Huus1-2/+2
a new value to them on the very next line. Caught by cppcheck. svn path=/trunk/; revision=46058
2012-11-17From Stephen Wall:Jaap Keuter2-0/+4
This patch allows one to specify telnet or syslog as the protocol in an SSL Decrypt profile. svn path=/trunk/; revision=46057
2012-11-17Default to *not* decoding the ATN flavor of COTP, so that, for example,Guy Harris1-1/+1
we don't, by default, break the dissection of RDP (or anything else that happens to run atop class 0 or 1). svn path=/trunk/; revision=46056
2012-11-17dissect ask_release_reply apduMartin Kaiser1-0/+17
svn path=/trunk/; revision=46055
2012-11-17Get rid of extra blank lines and trailing white space.Guy Harris1-11/+6
svn path=/trunk/; revision=46054
2012-11-17Clean up white space.Guy Harris1-556/+562
Add a comment noting that the value of the length indicator in a DT TPDU is not as constrained as one might think. svn path=/trunk/; revision=46053
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 05:27:41 +0000