aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
AgeCommit message (Collapse)AuthorFilesLines
2006-02-17More duplicate code removal.Gerald Combs1-9/+2
svn path=/trunk/; revision=17339
2006-02-17Include some header files so that we can get rid of duplicate code andGerald Combs1-23/+12
call various GTK+ routines. svn path=/trunk/; revision=17338
2006-02-17Paolo Abeni:Jörg Mayer2-7/+17
pinfo->net_src and pinfo->net_dst where used to set up conversation, but this fields are null on eap stream. use pinfo->src and pinfo->dst instead. The patch also enable strict checking in the 'follow ssl stream' dialog. svn path=/trunk/; revision=17333
2006-02-17remove dependencies to pcap.h, so getting an idea what needs to be done by ↵Ulf Lamping9-20/+6
dumpcap in addition to the things already done now various dumpcap related code cleanup: mainly #include's and capture engine related stuff svn path=/trunk/; revision=17327
2006-02-16Freeze and thaw the packet list after a merge so that the packet list showsGerald Combs1-0/+2
the correct information. svn path=/trunk/; revision=17320
2006-02-16Move common control initialization to gtk/main.c where it belongs.Gerald Combs2-104/+94
Remove a MessageBox() call used for debugging. Fixup whitespace. svn path=/trunk/; revision=17319
2006-02-15Update a comment.Guy Harris1-3/+9
svn path=/trunk/; revision=17313
2006-02-15Have those functions that end up just calling a win32_ routine if we'reGuy Harris1-34/+29
using GTK+ 2.x on Windows just have the call, nothing else (no extra variables). svn path=/trunk/; revision=17308
2006-02-14Paolo Abeni:Jörg Mayer2-14/+29
- enable the 'follow SSL stream' menu item only when a ssl packet is selected. - when 'following' an ssl stream, show ssl decrypted data only for current conversation. - fix a typo in ssl preference description. svn path=/trunk/; revision=17301
2006-02-13add missing #include "tempfile.h"Ulf Lamping1-0/+1
svn path=/trunk/; revision=17294
2006-02-13Don't se_leak expert_info records.Luis Ontanon1-3/+5
se_alloc them where and if needed, not every time expert_set_info_vformat is called. svn path=/trunk/; revision=17293
2006-02-13add missing #include "tempfile.h"Ulf Lamping1-0/+1
svn path=/trunk/; revision=17289
2006-02-13Add a placeholder for integrating with the display filter dialog.Gerald Combs1-0/+3
svn path=/trunk/; revision=17286
2006-02-13Copy over the file open/save code from the Win32 native branch.Gerald Combs7-62/+1725
The Windows-native routines were integrated by inserting #if GTK_MAJOR_VERSION >= 2 && _WIN32 win32_native_routine(GDK_WINDOW_HWND(top_level->window)); return; #endif at the beginning of each GTK+ file routine. There's probably a prettier way to do this. Some of the sizes need to be tweaked in win32-file-dlg.rc, but everything seems to work. Fix up whitespace. svn path=/trunk/; revision=17285
2006-02-13Add tempfile.h to the list of headeer files. That was the problem, notGuy Harris1-1/+1
the pathname in the #include. svn path=/trunk/; revision=17280
2006-02-12Look for "tempfile.h" in the top-level directory.Guy Harris1-1/+1
svn path=/trunk/; revision=17279
2006-02-12Move create_tempfile() to tempfile.c out of util.c. This means dumpcapGuy Harris1-1/+1
no longer needs util.c, so it no longer includes routines that use host_ip_af(), so it no longer needs to define its own host_ip_af(). That also means dumpcap.c no longer needs to include <sys/socket.h>. svn path=/trunk/; revision=17278
2006-02-12Send LOG_DOMAIN_CAPTURE_CHILD messages to our log handler, so they don'tGuy Harris1-1/+4
go to the standard output (as is the case for some such messages, including the "child is sending an error message to the parent" message, which shows up if we fail to exec dumpcap). *Anything* other than an official capture-child message written to the standard output by the capture child confuses the heck out of the parent, and can cause it to think the child closed the pipe (resulting, in the case described in the previous parenthetical note, in no dialog box being displayed for dumpcap not being executed). svn path=/trunk/; revision=17274
2006-02-12Well, it doesn't help to apply patches and then forget to actuallyJörg Mayer1-11/+0
commit them. Patch by Paolo Abeni: remove some commented out code. svn path=/trunk/; revision=17271
2006-02-12Add a routine to attempt to get the absolute pathname of the executableGuy Harris2-7/+7
file, strip off the last component to get the pathname of the directory containing the executable file, and save it for future use. On Windows, you can get that from the OS, but, on UN*X, you have to look at argv[0] and derive the absolute path from that (argv[0] is not guaranteed to be an absolute path, or even a path at all). (In addition, if you're running from the build directory, you might have to strip off a ".libs/" added to argv[0] as an artifact of the libtoolizing script.) Use that in the About dialog, and use it to construct the path of dumpcap. Don't put quotes into the path of dumpcap; you don't have to quote strings with spaces in them when handing them to execvp and, in fact, you *mustn't* quote them, as the quotes will be treated as part of the pathname. svn path=/trunk/; revision=17267
2006-02-12Add userdata arguments to a bunch of stat initialization routines toGuy Harris16-139/+140
squelch compiler warnings. Tag one existing such argument as unused to squelch another warning. Fix up some indentation. svn path=/trunk/; revision=17261
2006-02-11various capture child related minor cleanupsUlf Lamping1-20/+5
svn path=/trunk/; revision=17258
2006-02-11font_init don't need to know if running as a capture_child, this will simply ↵Ulf Lamping3-19/+3
no longer happen. svn path=/trunk/; revision=17257
2006-02-11the point of no return ...Ulf Lamping1-73/+5
using dumpcap as the capture child for Ethereal. dumpcap is a plain console application now, even for Win32 (so no WinMain, create_console and special piping stuff reguired). The undocumented command line option -Z will switch dumpcap into "child mode", using binary instead of plain text output messages to communicate with a parent Ethereal. Ethereal's main.c no longer needs to distinguish between child mode or not, so some simplifying here. capture_sync.c has to call dumpcap in a "hidden window" mode using CreateProcess instead of spawnvp, otherwise an uggly console window would appear. The handles created by _pipe doesn't seem to be inheritable for this function, using CreatePipe instead. The file capture_loop.c is only needed by dumpcap, removed from Ethereal link objects. Some debugging aid added and other minor cleanup done. svn path=/trunk/; revision=17256
2006-02-11minor bugfix: restore the Ethereal icon (after capturing) at the right placesUlf Lamping1-13/+26
svn path=/trunk/; revision=17255
2006-02-11 add an userdata argument to register_stat_cmd_arg() and its callback to use ↵Luis Ontanon42-139/+168
the callback for multiple registrations. svn path=/trunk/; revision=17252
2006-02-11In "Save As", support only file types we can write to; that simplifiesGuy Harris5-139/+108
the logic, making it easier to get it right (fewer interactions between components of the dialog - the file type doesn't affect whether we can save some but not all packets). It also means we don't offer a file type for saving, only to take it away if you choose anything other than saving all packets. If the capture file is a temporary file from a capture done in the current Ethereal session, it's libpcap format, which we can write to, so you would be able to save it. If it's a saved file we read in, saving the file in its entirety in its own format is just copying the file, and it's not clear supporting that adds enough useful functionality to justify the extra complication. Fix "range_update_dynamics()" to update all the rows of the range button/count table properly (make the button active iff there's a non-zero count in the currently-selected column, make a count active iff the column is selected), to select the "Captured" column if the count of displayed packets goes to zero, and to select the "Save all packets" row if the count of packets in the currently-selected row and column goes to zero. (XXX - we should perhaps do that with the "user-defined range" counts as well, which would involve updating the counts on every change to the range field.) svn path=/trunk/; revision=17251
2006-02-11Display g_error messages in the console window unconditionally, if ↵Lars Roland1-2/+4
preferences aren't loaded yet. This way we ensure that errors are displayed during protocol registration. Use g_error instead of g_warning, if not allowed characters are used in display filter names for protocols. Extend the error message in this case. svn path=/trunk/; revision=17248
2006-02-10remove all calls to exit() from the capture_opts.c and replace them by ↵Ulf Lamping1-3/+7
status return values (0,1 or 2). This way makes it much easier to debug, e.g. to set a common breakpoint if a command line parameter fails. svn path=/trunk/; revision=17240
2006-02-09Win32 inconvenience: a call to g_error will terminate the program and the ↵Ulf Lamping1-1/+8
user won't see anything. To avoid this, the log handler in the error case: - opens a console window (regardless of the users settings) - waits for a keypress before continuing to terminate the program This way, the user will be notified that there's a problem, instead of simply seeing a terminating program only. svn path=/trunk/; revision=17236
2006-02-08Paolo Abeni:Jörg Mayer1-5/+1
the attached patch clean a bit the ssl decryption related code, removing a macro I used when the code was still for an external plugin. svn path=/trunk/; revision=17217
2006-02-07eXtenstion options access to the -X command line optionsLuis Ontanon1-1/+14
svn path=/trunk/; revision=17207
2006-02-07handmerged patch from metze it conflicted with recent P bit patch i checked inRonnie Sahlberg1-2/+2
svn path=/trunk/; revision=17202
2006-02-07Paolo Abeni:Jörg Mayer1-1/+1
>There is still an issue into the HAVE_LIBGNUTLS macro definition. I'm >fixing it and cleaning a bit the windows side configuration. I hope to >post soon the fix. The attached patch should fix the issue. I missed to modify the config.win32 file and I misstyped a few macros name. svn path=/trunk/; revision=17200
2006-02-07Peter Kjellerstedt:Jörg Mayer1-0/+8
GTK_WRAP_WORD_CHAR does not exist in old versions of GTK2+ (2.2.1 and earlier). The following patch should make it compile again (solution borrowed from GAIM). svn path=/trunk/; revision=17199
2006-02-06- fix a leakLuis Ontanon2-7/+12
- register the funnel mini-api ASAP svn path=/trunk/; revision=17189
2006-02-06Forgot to add ssl-dlg.h to the distroJörg Mayer1-0/+1
svn path=/trunk/; revision=17188
2006-02-06Paolo AbeniJörg Mayer1-10/+10
the attached patch set correctly the title of the 'Follow SSL stream' dialog, to fix one issue reported by Nail Devis. Unfortunaly there isn't an easy way to enable the 'Follow SSL stream' dialog only for ssl session without knowing the value of proto_ssl (the ssl protocol id), because the ssl dissector can run on user specified ports (configured via preferences) svn path=/trunk/; revision=17187
2006-02-06fix some variable declarations bugs (code not conforming to ANSI-C)Ulf Lamping1-3/+8
svn path=/trunk/; revision=17185
2006-02-06Declare -ssl_stream_cb in ssl-dlg.hJörg Mayer3-3/+36
svn path=/trunk/; revision=17184
2006-02-06another gtk_resize_window()Ronnie Sahlberg1-0/+5
svn path=/trunk/; revision=17178
2006-02-06gtk1.x does not have gtk_window_resize()Ronnie Sahlberg1-0/+5
svn path=/trunk/; revision=17176
2006-02-06Add code to check whether the app was started with special privilegesGuy Harris1-0/+6
(e.g., set-UID or set-GID), and don't load user plugs if it is. svn path=/trunk/; revision=17174
2006-02-06The simple dialogLuis Ontanon1-23/+144
svn path=/trunk/; revision=17172
2006-02-06From Paolo Abeni: fix some warnings, etc..Guy Harris1-1/+1
svn path=/trunk/; revision=17169
2006-02-06"text_window_delete_event_cb()" returns a gboolean; declare it as such.Guy Harris1-1/+1
svn path=/trunk/; revision=17168
2006-02-05* add an option to funnel_register_menu to retap the packets right after ↵Luis Ontanon1-7/+54
been called * add a set_close_cllback function to the textwindow mini-api to set a callback to be called when the window gets closed. * fix few issues regarding the closing of the window svn path=/trunk/; revision=17165
2006-02-05- add a register_menu funnel Luis Ontanon1-7/+29
- remove the field_menu altoghether (It was not what I thought) - move a declaration to the start of a function to allow VC6 to compile svn path=/trunk/; revision=17161
2006-02-04Paolo AbeniJörg Mayer4-0/+1066
I have developed an external plugin to enable ssl decryption in ethereal. Me - Remove unnecessary $Id$ from acinclude.m4 - Added packet-ssl-utils.h to Makefile.common - Fixed a few warnings TODO - Lots of warning fixes (see separate mail) - Reformat function headers to read like the others do (return value<newline>function-name...) - Test on Windows platform - Review the patch to packet-ssl.c and new files packet-ssl-utils.[hc] svn path=/trunk/; revision=17156
2006-02-04GTK1 buid failed, this should fix it.Luis Ontanon1-5/+5
s/tv/tw/ svn path=/trunk/; revision=17154