summaryrefslogtreecommitdiff
path: root/ui/cli
AgeCommit message (Collapse)AuthorFilesLines
2014-10-17Remove unnecessary includes of <ctype.h>.Guy Harris1-1/+0
Change-Id: I8eacec5fa8d57b10d40a3627197461dae89c6cb2 Reviewed-on: https://code.wireshark.org/review/4768 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-13Add editor modelines and/or adjust whilespace.Bill Meier39-2303/+2743
Change-Id: I626b7bd8ac6e4b91c57cc9152e7ce038754e7278 Reviewed-on: https://code.wireshark.org/review/4658 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06Adjust some whitespace to match editor modelines.Bill Meier1-29/+29
Change-Id: Ia22cac3ebd7a454c156f98d967e6fd61f708a2b3 Reviewed-on: https://code.wireshark.org/review/4489 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-28Don't change the packet list column precision in taps.Guy Harris1-2/+0
The only place where the packet list column precision should be set is in the code for the column precision menu item, the code for the recent file item for that precision, and, if we were to provide it, code for a command-line optpion to set it. It's not up to some tap to change it. Change-Id: I547e606fb346b4c21674a66e883cbbe382055a37 Reviewed-on: https://code.wireshark.org/review/4336 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-16Fix spelling: cant-->can't, wont-->won't, etcBill Meier2-3/+3
Change-Id: Ia6c3e7a25615bf8e052c3bacf096d76df775c9c2 Reviewed-on: https://code.wireshark.org/review/4126 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-07Remove blank line, add newline at the end of the file.Guy Harris1-2/+1
Change-Id: I26bed6f3493ee7bb52439af9d72790a0133485c9 Reviewed-on: https://code.wireshark.org/review/4028 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-05Qt: Refactor ConversationDialog for endpoints.Gerald Combs1-1/+1
Create a TrafficTableDialog (for lack of a better name) parent class from the general parts of ConversationDialog. Use it to create EndpointsDialog. Move the contents of conversation_tree_widget.{cpp,h} to conversation_dialog.{cpp,h} to match endpoint_dialog and traffic_table_dialog. Fill in GeoIP columns dynamically instead of using a hard-coded limit. Use "endp_" and "ENDP_" prefixes for a lot of endpoint variables and defines. Try to make geoip_db_lookup_ipv4 and geoip_db_lookup_ipv6 more robust. Clean up some includes. Fix a shadowed variable. Change-Id: I23054816ac7f8c6edb3b1f01c8536db37ba4122d Reviewed-on: https://code.wireshark.org/review/3462 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-31Remove make-tapreg-dotc and its uses, since Python is now mandatoryРоман Донченко1-8/+3
Change-Id: I13fd57a288be68d18819826bf566ed7b5688ebaa Reviewed-on: https://code.wireshark.org/review/3926 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-18Fix warning: no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte1-0/+1
Change-Id: I8be913c41695177064985848995db2c0a570c612 Reviewed-on: https://code.wireshark.org/review/3698 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-16tap-iousers: fix indent and add modelines infoAlexis La Goutte1-4/+17
Change-Id: Ia144e016bd7fb0b8d4770d45afa1145057d0a5e9 Reviewed-on: https://code.wireshark.org/review/3646 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-09Now that Python is mandatory on Windows, remove checks for it from nmakefilesРоман Донченко1-15/+1
Change-Id: I2ca6abb372ec4bda0af1aa40089082533a61df3a Reviewed-on: https://code.wireshark.org/review/3392 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-30Fix dist.Gerald Combs1-0/+3
Add ui/cli/tshark-tap.h and packaging/nsis/windeployqt-to-nsis.ps1. Change-Id: I00465aed3f33595ad50be0ba5d0ed0eae54e1137 Reviewed-on: https://code.wireshark.org/review/3268 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-30Fix the build: add a few more G_GINT64_MODIFIER's when printing 64-bit numbers.Jeff Morriss1-1/+3
Also use %u instead of %d for these unsigned numbers. Change-Id: I3d1df3bdcc3c68193b49ba8daf1dc56171356290 Reviewed-on: https://code.wireshark.org/review/3266 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-07-30Apply refactored "conversation" (tap) data to TShark.Michael Mann2-480/+75
I intentionally left the fields displayed alone (so they don't exactly match Wireshark GUI), because as Guy points out in bug 6310, not sure its A Bug or A Feature. But at least all types of conversations allowed are in sync with Wireshark GUI. Bug:6310 Change-Id: I722837df510a39dadc1f9a07a99275509516698c Reviewed-on: https://code.wireshark.org/review/3212 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-29Fix heap-use-after-free via setlocalePeter Wu1-1/+15
setlocale returns a statically-allocated memory which can be modified by subsequent calls of setlocale. This triggers a heap-use-after free in ASAN when the setlocale function is called again with the previous pointer. This was found when trying to use the "Show All Streams" option via the Telephony -> RTP menu. While at it, add some modelines Change-Id: Ide47e877ce828734fd8c5c1b064d9c505ba2b37a Reviewed-on: https://code.wireshark.org/review/3234 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-13isprint() -> g_ascii_isprint()AndersBroman1-1/+1
Change-Id: Ia586ef8ce500d5fc7578c52014206fa7a7eaea41 Reviewed-on: https://code.wireshark.org/review/1624 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-12Fix tshark -z follow,tcp stats regression when TCP stream index is > 0Pascal Quantin1-2/+2
With tshark stats are being configured before the file gets loaded and the number of TCP streams are computed Bug: 9541 Change-Id: I42c2891124f1781b05967d5f071ad40df2d6d9f5 Reviewed-on: https://code.wireshark.org/review/1598 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-25Support out-of-source checkapiStig Bjørlykke1-2/+4
Always call $(top_srcdir)/tools/checkAPIs.pl with -sourcedir=$(srcdir) from Makefile.am to allow out-of-source 'make checkapi'. Change-Id: I60d7e0079984a8ededdacf4517a0738486fa7973 Reviewed-on: https://code.wireshark.org/review/1294 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-22Fix ASAN error due to invalid typePeter Wu1-7/+5
ei_array is supposed to be an array of expert_entry items. However, it was initialized of an array of expert_info_t items which is much larger. This caused an ASAN error when running `tshark -z expert` because expert_stat_packet wants to read past the stack. Fix this by correcting the type. While at it, reduce the size of expert_entry for 64-bit systems (reduces initial memory usage by 8 kilobytes) and avoid a redundant g_array_index call. Change-Id: I2e08676a5e242743ed502dd2836806604ea75cc0 Reviewed-on: https://code.wireshark.org/review/1275 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-19More name changes.Guy Harris1-16/+16
Add ep_ to routines that may return ephemeral strings. Change "get_XXX" to "XXX_to_display" if the routine returns a formatted string if it can't get a name. Change-Id: Ia0e82784349752cf4285bf82788316c9588fdd88 Reviewed-on: https://code.wireshark.org/review/1217 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-19Some routine name changes.Guy Harris1-2/+2
"get_addr_name()" -> "ep_address_to_display()", to 1) indicate that it returns a string with ephemeral scope and 2) indicate that it maps an address to a "displayable" form - a name if possible, an address string if not. "se_get_addr_name()" -> "get_addr_name()", to indicate that its strings have the same scope as "get_ether_name()", "get_hostname()", and "get_hostname6()". Change-Id: If2ab776395c7a4a163fef031d92b7757b5d23838 Reviewed-on: https://code.wireshark.org/review/1216 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-03(Pedantic): set editor modelines tab-width & etc to 8; Also: fix some ↵Bill Meier1-3/+3
indentation in packet-sip.c Change-Id: I623fc5e4c1247dbe5e15f0f33270f4f0994268ab Reviewed-on: https://code.wireshark.org/review/943 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte3-5/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-15Fix -Wabsolute-value in TAP Compare stat (Found by Clang 3.5)Alexis La Goutte1-2/+2
tap-comparestat.c:321:55: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value] tap-comparestat.c:321:55: note: remove the call to 'abs' since unsigned values cannot be negative tap-comparestat.c:347:56: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value] tap-comparestat.c:347:56: note: remove the call to 'abs' since unsigned values cannot be negative Change-Id: Ice950228d844373abcbd0cdc8ea05079b8b933d0 Reviewed-on: https://code.wireshark.org/review/676 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-05Fix some code remove by 296591399f90a9d89be958d91047aa724a77ee6dAlexis La Goutte1-0/+1
(Copyright or info about file...) Change-Id: I90ba8b1c3ec8406b0c3365a69a8555837fc4bbb1 Reviewed-on: https://code.wireshark.org/review/515 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte39-78/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-25Remove trailing whitespaceBill Meier6-55/+55
Change-Id: I8116f63ff88687c8db3fd6e8e23b22ab2f759af0 Reviewed-on: https://code.wireshark.org/review/385 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-16Add explicit casts to fix OSX10.5 BuildbotEvan Huus1-8/+8
Change-Id: I13fa3d6af3d0fddc367835fc05efdbe106b991e6 Reviewed-on: https://code.wireshark.org/review/228 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-16Replace last use of emem trees with GHashTablesEvan Huus1-41/+48
Change-Id: I1cedc611c9b7888eb671cf858c6f7819d37afba9 Reviewed-on: https://code.wireshark.org/review/219 Reviewed-by: Michael Mann <mmann78@netscape.net>
2013-12-30Move tcap and camel "persistent data" functionality to the dissectors ↵Michael Mann2-2/+2
themselves instead of being part of epan directory. svn path=/trunk/; revision=54499
2013-12-30Use G_GUINT64_CONSTANT(nn) instead of nnULL in a few places.Bill Meier1-5/+5
svn path=/trunk/; revision=54494
2013-12-23From Ville Skyttä: Spelling FixesBill Meier4-7/+7
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9591 svn path=/trunk/; revision=54387
2013-12-20nnn'ULL' ==> G_GUINT64_CONSTANT(nnn)Bill Meier1-26/+29
svn path=/trunk/; revision=54304
2013-12-14Fix some trivial warnings.Jakub Zawadzki3-6/+6
svn path=/trunk/; revision=54085
2013-12-12Create/use a number of extended value-strings;Bill Meier1-72/+73
Remove or comment out dups from several value-string arrays; Sort a number of value-string arrays; Reformat many hf[] entries; Remove some unneeded initializers; Add editor-modelines; Use consistent indentation; Reformat whitespace. svn path=/trunk/; revision=53968
2013-12-03When including <epan/prefs.h> don't force inclusion of <epan/uat.h>Jakub Zawadzki1-1/+2
svn path=/trunk/; revision=53769
2013-11-29Stats_tree enhancements for sorting, averages and burst rate. Bug 9452 ↵Michael Mann1-15/+4
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9452) From Deon van der Westhuysen - Bug fix: object leak in stats_tree after a tap reset (for example apply statistics preferences with a stats_tree window open) - Bug fix: correct sample code in README.stats_tree - Add: slash in plug-in name now creates submenu as docs describe (was a bug?) - Add: menu separator before the stat_tree registered plug-ins - Add: stats_tree can now calculate averages for nodes; automatically calculated for range nodes. Add section in README.stats_tree describing averages. - Add: stats_tree can now calculate burst rate of each node (like rate but with a shorter, sliding time window) - Add: sorting for stats_tree plug-ins. Can sort on node name, count, average, min, max values and burst rate. - Add: preferences for stats_tree system (default sort column, burst calc params) - Add: stats_tree window copy to clipboard and export and plain text, csv and XML. - Added sample of new functionality in $srcdir/plugins/stats_tree/pinfo_stats_tree.c - Moved all stats_tree sample plug-ins to "IP Statistics" submenu. svn path=/trunk/; revision=53657
2013-11-23Set a field to squelch a Coverity warning.Guy Harris1-4/+6
svn path=/trunk/; revision=53524
2013-11-23Create the ability to have packet scoped "proto" data. Bug 9470 ↵Michael Mann1-1/+1
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470) I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future. And search/replace of a function name is easy enough to do. The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As. All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope(). All other dissectors were converted to using file_scope() which was the original scope for "proto" data. svn path=/trunk/; revision=53520
2013-11-14Get rid of Warinings [-Wmissing-prototypes]Anders Broman37-4/+64
svn path=/trunk/; revision=53311
2013-11-12Replace fvalue_ftype() with a fvalue_type_ftenum() routine that returnsGuy Harris1-11/+6
the ftenum_t for the fvalue's ftype, rather than a pointer to the ftype (which isn't all that useful except as a handle, unless you import the internal header). Have fvalue_to_string_repr() return NULL, rather than failing, if the fvalue's ftype has no val_to_string_repr method. This lets us not include the ftypes internal header in ui/cli/tap-diameter-avp.c. svn path=/trunk/; revision=53290
2013-11-10Add missing includes in order to remove exceptions.h from proto.h (next commit).Jakub Zawadzki33-29/+61
svn path=/trunk/; revision=53230
2013-11-10Move struct _ftype_t + callback typedefs + free macro to ftypes-int.hJakub Zawadzki1-0/+1
svn path=/trunk/; revision=53223
2013-11-06Add support for displaying dates as year and day-of-year (1-origin).Guy Harris2-15/+105
In the process, fix various man page descriptions of the -t flag, and add support for UTC absolute times in the iousers and iostat TShark taps. svn path=/trunk/; revision=53114
2013-10-27Remove iplen and iphdrlen from struct _packet_info.Michael Mann1-1/+1
Dissectors should just use (reported) tvb length and taps have other ways to get the data. svn path=/trunk/; revision=52899
2013-10-24Make things compile again.Jörg Mayer1-0/+1
svn path=/trunk/; revision=52828
2013-10-10Flag the addresses used in the trace which has been resolved and only add ↵Anders Broman1-2/+2
those to the list used to create the NRB. svn path=/trunk/; revision=52504
2013-10-01Remove check_col.Michael Mann1-1/+1
svn path=/trunk/; revision=52316
2013-09-11Get rid of some users the addrinfo_list.Anders Broman1-65/+35
svn path=/trunk/; revision=51953
2013-08-14Get rid of -Wshadow warning - I guess we're including something thatGuy Harris39-175/+175
gets <getopt.h>, so we get the optarg global. svn path=/trunk/; revision=51350