etypes.h \
file.c \
file.h \
- filter.c \
- filter.h \
follow.c \
follow.h \
globals.h \
/* capture.c
* Routines for packet capture windows
*
- * $Id: capture.c,v 1.65 1999/09/09 02:42:22 gram Exp $
+ * $Id: capture.c,v 1.66 1999/09/09 03:31:49 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#include "capture.h"
#include "util.h"
#include "prefs.h"
+#include "globals.h"
-extern capture_file cf;
-extern GtkWidget *info_bar;
-extern guint file_ctx;
-
-extern gchar *ethereal_path;
-extern gchar *medium_font;
-extern gchar *bold_font;
-extern int fork_mode;
-extern int sync_pipe[];
-extern int sync_mode;
-extern int sigusr2_received;
-extern int quit_after_cap;
-
-/* Capture callback data keys */
-#define E_CAP_IFACE_KEY "cap_iface"
-#define E_CAP_FILT_KEY "cap_filter"
-#define E_CAP_COUNT_KEY "cap_count"
-#define E_CAP_OPEN_KEY "cap_open"
-#define E_CAP_SNAP_KEY "cap_snap"
-
-/* Capture filter key */
-#define E_CAP_FILT_TE_KEY "cap_filt_te"
-
-static void search_for_if_cb(gpointer data, gpointer user_data);
-static void free_if_cb(gpointer data, gpointer user_data);
-static void capture_prep_ok_cb(GtkWidget *, gpointer);
-static void capture_prep_close_cb(GtkWidget *, gpointer);
-static float pct(gint, gint);
static void capture_stop_cb(GtkWidget *, gpointer);
static void capture_pcap_cb(u_char *, const struct pcap_pkthdr *,
const u_char *);
-
-struct search_user_data {
- char *name;
- int found;
-};
-
-static GList *
-get_interface_list() {
- GList *il = NULL;
- gint nonloopback_pos = 0;
- struct ifreq *ifr, *last;
- struct ifconf ifc;
- struct ifreq ifrflags;
- int sock = socket(AF_INET, SOCK_DGRAM, 0);
- struct search_user_data user_data;
- pcap_t *pch;
- gchar err_str[PCAP_ERRBUF_SIZE];
-
- if (sock < 0)
- {
- simple_dialog(ESD_TYPE_WARN, NULL,
- "Can't list interfaces: error opening socket.");
- return NULL;
- }
-
- /* Since we have to grab the interface list all at once, we'll make
- plenty of room */
- ifc.ifc_len = 1024 * sizeof(struct ifreq);
- ifc.ifc_buf = malloc(ifc.ifc_len);
-
- if (ioctl(sock, SIOCGIFCONF, &ifc) < 0 ||
- ifc.ifc_len < sizeof(struct ifreq))
- {
- simple_dialog(ESD_TYPE_WARN, NULL,
- "Can't list interfaces: SIOCGIFCONF error: %s", strerror(errno));
- goto fail;
- }
-
- ifr = (struct ifreq *) ifc.ifc_req;
- last = (struct ifreq *) ((char *) ifr + ifc.ifc_len);
- while (ifr < last)
- {
- /*
- * Skip addresses that begin with "dummy", or that include a ":"
- * (the latter are Solaris virtuals).
- */
- if (strncmp(ifr->ifr_name, "dummy", 5) == 0 ||
- strchr(ifr->ifr_name, ':') != NULL)
- goto next;
-
- /*
- * If we already have this interface name on the list, don't add
- * it (SIOCGIFCONF returns, at least on BSD-flavored systems, one
- * entry per interface *address*; if an interface has multiple
- * addresses, we get multiple entries for it).
- */
- user_data.name = ifr->ifr_name;
- user_data.found = FALSE;
- g_list_foreach(il, search_for_if_cb, &user_data);
- if (user_data.found)
- goto next;
-
- /*
- * Get the interface flags.
- */
- memset(&ifrflags, 0, sizeof ifrflags);
- strncpy(ifrflags.ifr_name, ifr->ifr_name, sizeof ifrflags.ifr_name);
- if (ioctl(sock, SIOCGIFFLAGS, (char *)&ifrflags) < 0) {
- if (errno == ENXIO)
- goto next;
- simple_dialog(ESD_TYPE_WARN, NULL,
- "Can't list interfaces: SIOCGIFFLAGS error on %s: %s",
- ifr->ifr_name, strerror(errno));
- goto fail;
- }
-
- /*
- * Skip interfaces that aren't up.
- */
- if (!(ifrflags.ifr_flags & IFF_UP))
- goto next;
-
- /*
- * Skip interfaces that we can't open with "libpcap".
- */
- pch = pcap_open_live(ifr->ifr_name, WTAP_MAX_PACKET_SIZE, 0, 0, err_str);
- if (pch == NULL)
- goto next;
- pcap_close(pch);
-
- /*
- * If it's a loopback interface, add it at the end of the list,
- * otherwise add it after the last non-loopback interface,
- * so all loopback interfaces go at the end - we don't want a
- * loopback interface to be the default capture device unless there
- * are no non-loopback devices.
- */
- if ((ifrflags.ifr_flags & IFF_LOOPBACK) ||
- strncmp(ifr->ifr_name, "lo", 2) == 0)
- il = g_list_insert(il, g_strdup(ifr->ifr_name), -1);
- else {
- il = g_list_insert(il, g_strdup(ifr->ifr_name), nonloopback_pos);
- /* Insert the next non-loopback interface after this one. */
- nonloopback_pos++;
- }
-
-next:
-#ifdef HAVE_SA_LEN
- ifr = (struct ifreq *) ((char *) ifr + ifr->ifr_addr.sa_len + IFNAMSIZ);
-#else
- ifr = (struct ifreq *) ((char *) ifr + sizeof(struct ifreq));
-#endif
- }
-
- free(ifc.ifc_buf);
- close(sock);
-
- if (il == NULL) {
- simple_dialog(ESD_TYPE_WARN, NULL,
- "There are no network interfaces that can be opened.\n"
- "Please check to make sure you have sufficient permission\n"
- "to capture packets.");
- return NULL;
- }
-
- return il;
-
-fail:
- if (il != NULL) {
- g_list_foreach(il, free_if_cb, NULL);
- g_list_free(il);
- }
- free(ifc.ifc_buf);
- close(sock);
- return NULL;
-}
-
-static void
-search_for_if_cb(gpointer data, gpointer user_data)
-{
- struct search_user_data *search_user_data = user_data;
-
- if (strcmp((char *)data, search_user_data->name) == 0)
- search_user_data->found = TRUE;
-}
-
-static void
-free_if_cb(gpointer data, gpointer user_data)
-{
- g_free(data);
-}
-
-void
-capture_prep_cb(GtkWidget *w, gpointer d) {
- GtkWidget *cap_open_w, *if_cb, *if_lb,
- *count_lb, *count_cb, *main_vb, *if_hb, *count_hb,
- *filter_hb, *filter_bt, *filter_te, *caplen_hb,
- *bbox, *ok_bt, *cancel_bt, *snap_lb,
- *snap_sb;
- GtkAdjustment *adj;
- GList *if_list, *count_list = NULL;
- gchar *count_item1 = "0 (Infinite)", count_item2[16];
-
- if_list = get_interface_list();
- if (if_list == NULL)
- return;
-
- cap_open_w = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title(GTK_WINDOW(cap_open_w), "Ethereal: Capture Preferences");
-
- /* Container for each row of widgets */
- main_vb = gtk_vbox_new(FALSE, 3);
- gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
- gtk_container_add(GTK_CONTAINER(cap_open_w), main_vb);
- gtk_widget_show(main_vb);
-
- /* Interface row */
- if_hb = gtk_hbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(main_vb), if_hb);
- gtk_widget_show(if_hb);
-
- if_lb = gtk_label_new("Interface:");
- gtk_box_pack_start(GTK_BOX(if_hb), if_lb, FALSE, FALSE, 0);
- gtk_widget_show(if_lb);
-
- if_cb = gtk_combo_new();
- gtk_combo_set_popdown_strings(GTK_COMBO(if_cb), if_list);
- if (cf.iface)
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry), cf.iface);
- else if (if_list)
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry), if_list->data);
- gtk_box_pack_start(GTK_BOX(if_hb), if_cb, FALSE, FALSE, 0);
- gtk_widget_show(if_cb);
-
- while (if_list) {
- g_free(if_list->data);
- if_list = g_list_remove_link(if_list, if_list);
- }
-
- /* Count row */
- count_hb = gtk_hbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(main_vb), count_hb);
- gtk_widget_show(count_hb);
-
- count_lb = gtk_label_new("Count:");
- gtk_box_pack_start(GTK_BOX(count_hb), count_lb, FALSE, FALSE, 0);
- gtk_widget_show(count_lb);
-
- count_list = g_list_append(count_list, count_item1);
- if (cf.count) {
- snprintf(count_item2, 15, "%d", cf.count);
- count_list = g_list_append(count_list, count_item2);
- }
-
- count_cb = gtk_combo_new();
- gtk_combo_set_popdown_strings(GTK_COMBO(count_cb), count_list);
- gtk_box_pack_start(GTK_BOX(count_hb), count_cb, FALSE, FALSE, 0);
- gtk_widget_show(count_cb);
-
- while (count_list)
- count_list = g_list_remove_link(count_list, count_list);
-
- /* Filter row */
- filter_hb = gtk_hbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(main_vb), filter_hb);
- gtk_widget_show(filter_hb);
-
- filter_bt = gtk_button_new_with_label("Filter:");
- gtk_signal_connect(GTK_OBJECT(filter_bt), "clicked",
- GTK_SIGNAL_FUNC(prefs_cb), (gpointer) E_PR_PG_FILTER);
- gtk_box_pack_start(GTK_BOX(filter_hb), filter_bt, FALSE, TRUE, 0);
- gtk_widget_show(filter_bt);
-
- filter_te = gtk_entry_new();
- if (cf.cfilter) gtk_entry_set_text(GTK_ENTRY(filter_te), cf.cfilter);
- gtk_object_set_data(GTK_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_te);
- gtk_box_pack_start(GTK_BOX(filter_hb), filter_te, TRUE, TRUE, 0);
- gtk_widget_show(filter_te);
-
- /* Misc row: Capture file checkbox and snap spinbutton */
- caplen_hb = gtk_hbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(main_vb), caplen_hb);
- gtk_widget_show(caplen_hb);
-
- snap_lb = gtk_label_new("Capture length");
- gtk_misc_set_alignment(GTK_MISC(snap_lb), 0, 0.5);
- gtk_box_pack_start(GTK_BOX(caplen_hb), snap_lb, FALSE, FALSE, 6);
- gtk_widget_show(snap_lb);
-
- adj = (GtkAdjustment *) gtk_adjustment_new((float) cf.snap,
- MIN_PACKET_SIZE, WTAP_MAX_PACKET_SIZE, 1.0, 10.0, 0.0);
- snap_sb = gtk_spin_button_new (adj, 0, 0);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (snap_sb), TRUE);
- gtk_widget_set_usize (snap_sb, 80, 0);
- gtk_box_pack_start (GTK_BOX(caplen_hb), snap_sb, FALSE, FALSE, 3);
- gtk_widget_show(snap_sb);
-
- /* Button row: OK and cancel buttons */
- bbox = gtk_hbutton_box_new();
- gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
- gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
- gtk_container_add(GTK_CONTAINER(main_vb), bbox);
- gtk_widget_show(bbox);
-
- ok_bt = gtk_button_new_with_label ("OK");
- gtk_signal_connect(GTK_OBJECT(ok_bt), "clicked",
- GTK_SIGNAL_FUNC(capture_prep_ok_cb), GTK_OBJECT(cap_open_w));
- GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
- gtk_box_pack_start (GTK_BOX (bbox), ok_bt, TRUE, TRUE, 0);
- gtk_widget_grab_default(ok_bt);
- gtk_widget_show(ok_bt);
-
- cancel_bt = gtk_button_new_with_label ("Cancel");
- gtk_signal_connect(GTK_OBJECT(cancel_bt), "clicked",
- GTK_SIGNAL_FUNC(capture_prep_close_cb), GTK_OBJECT(cap_open_w));
- GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
- gtk_box_pack_start (GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0);
- gtk_widget_show(cancel_bt);
-
- /* Attach pointers to needed widgets to the capture prefs window/object */
- gtk_object_set_data(GTK_OBJECT(cap_open_w), E_CAP_IFACE_KEY, if_cb);
- gtk_object_set_data(GTK_OBJECT(cap_open_w), E_CAP_FILT_KEY, filter_te);
- gtk_object_set_data(GTK_OBJECT(cap_open_w), E_CAP_COUNT_KEY, count_cb);
- gtk_object_set_data(GTK_OBJECT(cap_open_w), E_CAP_SNAP_KEY, snap_sb);
-
- gtk_widget_show(cap_open_w);
-}
-
-static void
-capture_prep_ok_cb(GtkWidget *ok_bt, gpointer parent_w) {
- GtkWidget *if_cb, *filter_te, *count_cb, *snap_sb;
- gchar *filter_text;
- char tmpname[128+1];
-
- if_cb = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(parent_w), E_CAP_IFACE_KEY);
- filter_te = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(parent_w), E_CAP_FILT_KEY);
- count_cb = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(parent_w), E_CAP_COUNT_KEY);
- snap_sb = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(parent_w), E_CAP_SNAP_KEY);
-
- if (cf.iface) g_free(cf.iface);
- cf.iface =
- g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry)));
-
- filter_text = gtk_entry_get_text(GTK_ENTRY(filter_te));
- if (cf.cfilter) g_free(cf.cfilter);
- cf.cfilter = NULL; /* ead 06/16/99 */
- if (filter_text && filter_text[0]) {
- cf.cfilter = g_strdup(gtk_entry_get_text(GTK_ENTRY(filter_te)));
- }
- cf.count = atoi(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(count_cb)->entry)));
- cf.snap = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(snap_sb));
- if (cf.snap < 1)
- cf.snap = WTAP_MAX_PACKET_SIZE;
- else if (cf.snap < MIN_PACKET_SIZE)
- cf.snap = MIN_PACKET_SIZE;
-
- gtk_widget_destroy(GTK_WIDGET(parent_w));
-
- /* Choose a random name for the capture buffer */
- if (cf.save_file && !cf.user_saved) {
- unlink(cf.save_file); /* silently ignore error */
- g_free(cf.save_file);
- }
- cf.save_file_fd = create_tempfile(tmpname, sizeof tmpname, "ether");
- cf.save_file = g_strdup(tmpname);
- cf.user_saved = 0;
-
- if( fork_mode ){ /* use fork() for capture */
- int fork_child;
- char ssnap[24];
- char scount[24]; /* need a constant for len of numbers */
- char save_file_fd[24];
- int err;
-
- sprintf(ssnap,"%d",cf.snap); /* in lieu of itoa */
- sprintf(scount,"%d",cf.count);
- sprintf(save_file_fd,"%d",cf.save_file_fd);
- signal(SIGCHLD, SIG_IGN);
- if (sync_mode) pipe(sync_pipe);
- if((fork_child = fork()) == 0){
- /* args: -k -- capture
- * -i interface specification
- * -w file to write
- * -W file descriptor to write
- * -c count to capture
- * -Q quit after capture (forces -k)
- * -s snaplen
- * -S sync mode
- * -m / -b fonts
- * -f "filter expression"
- */
- if (sync_mode) {
- close(1);
- dup(sync_pipe[1]);
- close(sync_pipe[0]);
- execlp(ethereal_path, "ethereal", "-k", "-Q", "-i", cf.iface,
- "-w", cf.save_file, "-W", save_file_fd,
- "-c", scount, "-s", ssnap, "-S",
- "-m", medium_font, "-b", bold_font,
- (cf.cfilter == NULL)? 0 : "-f",
- (cf.cfilter == NULL)? 0 : cf.cfilter,
- (const char *)NULL);
- }
- else {
- execlp(ethereal_path, "ethereal", "-k", "-Q", "-i", cf.iface,
- "-w", cf.save_file, "-W", save_file_fd,
- "-c", scount, "-s", ssnap,
- "-m", medium_font, "-b", bold_font,
- (cf.cfilter == NULL)? 0 : "-f",
- (cf.cfilter == NULL)? 0 : cf.cfilter,
- (const char *)NULL);
- }
- }
- else {
- cf.filename = cf.save_file;
- if (sync_mode) {
- close(sync_pipe[1]);
- while (!sigusr2_received) {
- struct timeval timeout = {1,0};
- select(0, NULL, NULL, NULL, &timeout);
- if (kill(fork_child, 0) == -1 && errno == ESRCH)
- break;
- }
- if (sigusr2_received) {
- err = tail_cap_file(cf.save_file, &cf);
- if (err != 0) {
- simple_dialog(ESD_TYPE_WARN, NULL,
- file_open_error_message(err, FALSE), cf.save_file);
- }
- }
- sigusr2_received = FALSE;
- }
- }
- }
- else
- capture();
-}
-
-static void
-capture_prep_close_cb(GtkWidget *close_bt, gpointer parent_w)
-{
- gtk_grab_remove(GTK_WIDGET(parent_w));
- gtk_widget_destroy(GTK_WIDGET(parent_w));
-}
+static float pct(gint, gint);
typedef struct _loop_data {
gint go;
/* capture.h
* Definitions for packet capture windows
*
- * $Id: capture.h,v 1.13 1999/08/18 16:28:22 gram Exp $
+ * $Id: capture.h,v 1.14 1999/09/09 03:31:50 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#define DLT_PPP_BSDOS 14
#endif
-
-void capture_prep_cb(GtkWidget *, gpointer);
void capture(void);
#endif /* HAVE_LIBPCAP */
extern int quit_after_cap; /* Makes a "capture only mode". Implies -k */
#endif
+#define PF_DIR ".ethereal"
+
#endif
*~
libui_a_SOURCES = \
+ capture_dlg.c \
+ capture_dlg.h \
file_dlg.c \
+ filter_prefs.c \
+ filter_prefs.h \
gtkbindings.h \
gtkclist.c \
gtkclist.h \
main.h \
menu.c \
menu.h \
+ prefs_dlg.c \
+ prefs_dlg.h \
print_dlg.c \
print_prefs.c \
print_prefs.h \
--- /dev/null
+/* capture_dlg.c
+ * Routines for packet capture windows
+ *
+ * $Id: capture_dlg.c,v 1.1 1999/09/09 03:32:00 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <gtk/gtk.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <time.h>
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+
+#include <signal.h>
+#include <errno.h>
+
+#include <wiretap/wtap.h>
+#include "capture.h"
+#include "globals.h"
+#include "main.h"
+#include "capture_dlg.h"
+#include "prefs_dlg.h"
+#include "util.h"
+
+/* Capture callback data keys */
+#define E_CAP_IFACE_KEY "cap_iface"
+#define E_CAP_FILT_KEY "cap_filter"
+#define E_CAP_COUNT_KEY "cap_count"
+#define E_CAP_OPEN_KEY "cap_open"
+#define E_CAP_SNAP_KEY "cap_snap"
+
+/* Capture filter key */
+#define E_CAP_FILT_TE_KEY "cap_filt_te"
+
+static GList*
+get_interface_list();
+
+static void
+capture_prep_ok_cb(GtkWidget *ok_bt, gpointer parent_w);
+
+static void
+capture_prep_close_cb(GtkWidget *close_bt, gpointer parent_w);
+
+static void
+search_for_if_cb(gpointer data, gpointer user_data);
+
+static void
+free_if_cb(gpointer data, gpointer user_data);
+
+void
+capture_prep_cb(GtkWidget *w, gpointer d) {
+ GtkWidget *cap_open_w, *if_cb, *if_lb,
+ *count_lb, *count_cb, *main_vb, *if_hb, *count_hb,
+ *filter_hb, *filter_bt, *filter_te, *caplen_hb,
+ *bbox, *ok_bt, *cancel_bt, *snap_lb,
+ *snap_sb;
+ GtkAdjustment *adj;
+ GList *if_list, *count_list = NULL;
+ gchar *count_item1 = "0 (Infinite)", count_item2[16];
+
+ if_list = get_interface_list();
+ if (if_list == NULL)
+ return;
+
+ cap_open_w = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_title(GTK_WINDOW(cap_open_w), "Ethereal: Capture Preferences");
+
+ /* Container for each row of widgets */
+ main_vb = gtk_vbox_new(FALSE, 3);
+ gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
+ gtk_container_add(GTK_CONTAINER(cap_open_w), main_vb);
+ gtk_widget_show(main_vb);
+
+ /* Interface row */
+ if_hb = gtk_hbox_new(FALSE, 3);
+ gtk_container_add(GTK_CONTAINER(main_vb), if_hb);
+ gtk_widget_show(if_hb);
+
+ if_lb = gtk_label_new("Interface:");
+ gtk_box_pack_start(GTK_BOX(if_hb), if_lb, FALSE, FALSE, 0);
+ gtk_widget_show(if_lb);
+
+ if_cb = gtk_combo_new();
+ gtk_combo_set_popdown_strings(GTK_COMBO(if_cb), if_list);
+ if (cf.iface)
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry), cf.iface);
+ else if (if_list)
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry), if_list->data);
+ gtk_box_pack_start(GTK_BOX(if_hb), if_cb, FALSE, FALSE, 0);
+ gtk_widget_show(if_cb);
+
+ while (if_list) {
+ g_free(if_list->data);
+ if_list = g_list_remove_link(if_list, if_list);
+ }
+
+ /* Count row */
+ count_hb = gtk_hbox_new(FALSE, 3);
+ gtk_container_add(GTK_CONTAINER(main_vb), count_hb);
+ gtk_widget_show(count_hb);
+
+ count_lb = gtk_label_new("Count:");
+ gtk_box_pack_start(GTK_BOX(count_hb), count_lb, FALSE, FALSE, 0);
+ gtk_widget_show(count_lb);
+
+ count_list = g_list_append(count_list, count_item1);
+ if (cf.count) {
+ snprintf(count_item2, 15, "%d", cf.count);
+ count_list = g_list_append(count_list, count_item2);
+ }
+
+ count_cb = gtk_combo_new();
+ gtk_combo_set_popdown_strings(GTK_COMBO(count_cb), count_list);
+ gtk_box_pack_start(GTK_BOX(count_hb), count_cb, FALSE, FALSE, 0);
+ gtk_widget_show(count_cb);
+
+ while (count_list)
+ count_list = g_list_remove_link(count_list, count_list);
+
+ /* Filter row */
+ filter_hb = gtk_hbox_new(FALSE, 3);
+ gtk_container_add(GTK_CONTAINER(main_vb), filter_hb);
+ gtk_widget_show(filter_hb);
+
+ filter_bt = gtk_button_new_with_label("Filter:");
+ gtk_signal_connect(GTK_OBJECT(filter_bt), "clicked",
+ GTK_SIGNAL_FUNC(prefs_cb), (gpointer) E_PR_PG_FILTER);
+ gtk_box_pack_start(GTK_BOX(filter_hb), filter_bt, FALSE, TRUE, 0);
+ gtk_widget_show(filter_bt);
+
+ filter_te = gtk_entry_new();
+ if (cf.cfilter) gtk_entry_set_text(GTK_ENTRY(filter_te), cf.cfilter);
+ gtk_object_set_data(GTK_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_te);
+ gtk_box_pack_start(GTK_BOX(filter_hb), filter_te, TRUE, TRUE, 0);
+ gtk_widget_show(filter_te);
+
+ /* Misc row: Capture file checkbox and snap spinbutton */
+ caplen_hb = gtk_hbox_new(FALSE, 3);
+ gtk_container_add(GTK_CONTAINER(main_vb), caplen_hb);
+ gtk_widget_show(caplen_hb);
+
+ snap_lb = gtk_label_new("Capture length");
+ gtk_misc_set_alignment(GTK_MISC(snap_lb), 0, 0.5);
+ gtk_box_pack_start(GTK_BOX(caplen_hb), snap_lb, FALSE, FALSE, 6);
+ gtk_widget_show(snap_lb);
+
+ adj = (GtkAdjustment *) gtk_adjustment_new((float) cf.snap,
+ MIN_PACKET_SIZE, WTAP_MAX_PACKET_SIZE, 1.0, 10.0, 0.0);
+ snap_sb = gtk_spin_button_new (adj, 0, 0);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (snap_sb), TRUE);
+ gtk_widget_set_usize (snap_sb, 80, 0);
+ gtk_box_pack_start (GTK_BOX(caplen_hb), snap_sb, FALSE, FALSE, 3);
+ gtk_widget_show(snap_sb);
+
+ /* Button row: OK and cancel buttons */
+ bbox = gtk_hbutton_box_new();
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
+ gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
+ gtk_container_add(GTK_CONTAINER(main_vb), bbox);
+ gtk_widget_show(bbox);
+
+ ok_bt = gtk_button_new_with_label ("OK");
+ gtk_signal_connect(GTK_OBJECT(ok_bt), "clicked",
+ GTK_SIGNAL_FUNC(capture_prep_ok_cb), GTK_OBJECT(cap_open_w));
+ GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
+ gtk_box_pack_start (GTK_BOX (bbox), ok_bt, TRUE, TRUE, 0);
+ gtk_widget_grab_default(ok_bt);
+ gtk_widget_show(ok_bt);
+
+ cancel_bt = gtk_button_new_with_label ("Cancel");
+ gtk_signal_connect(GTK_OBJECT(cancel_bt), "clicked",
+ GTK_SIGNAL_FUNC(capture_prep_close_cb), GTK_OBJECT(cap_open_w));
+ GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
+ gtk_box_pack_start (GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0);
+ gtk_widget_show(cancel_bt);
+
+ /* Attach pointers to needed widgets to the capture prefs window/object */
+ gtk_object_set_data(GTK_OBJECT(cap_open_w), E_CAP_IFACE_KEY, if_cb);
+ gtk_object_set_data(GTK_OBJECT(cap_open_w), E_CAP_FILT_KEY, filter_te);
+ gtk_object_set_data(GTK_OBJECT(cap_open_w), E_CAP_COUNT_KEY, count_cb);
+ gtk_object_set_data(GTK_OBJECT(cap_open_w), E_CAP_SNAP_KEY, snap_sb);
+
+ gtk_widget_show(cap_open_w);
+}
+
+static void
+capture_prep_ok_cb(GtkWidget *ok_bt, gpointer parent_w) {
+ GtkWidget *if_cb, *filter_te, *count_cb, *snap_sb;
+ gchar *filter_text;
+ char tmpname[128+1];
+
+ if_cb = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(parent_w), E_CAP_IFACE_KEY);
+ filter_te = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(parent_w), E_CAP_FILT_KEY);
+ count_cb = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(parent_w), E_CAP_COUNT_KEY);
+ snap_sb = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(parent_w), E_CAP_SNAP_KEY);
+
+ if (cf.iface) g_free(cf.iface);
+ cf.iface =
+ g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry)));
+
+ filter_text = gtk_entry_get_text(GTK_ENTRY(filter_te));
+ if (cf.cfilter) g_free(cf.cfilter);
+ cf.cfilter = NULL; /* ead 06/16/99 */
+ if (filter_text && filter_text[0]) {
+ cf.cfilter = g_strdup(gtk_entry_get_text(GTK_ENTRY(filter_te)));
+ }
+ cf.count = atoi(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(count_cb)->entry)));
+ cf.snap = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(snap_sb));
+ if (cf.snap < 1)
+ cf.snap = WTAP_MAX_PACKET_SIZE;
+ else if (cf.snap < MIN_PACKET_SIZE)
+ cf.snap = MIN_PACKET_SIZE;
+
+ gtk_widget_destroy(GTK_WIDGET(parent_w));
+
+ /* Choose a random name for the capture buffer */
+ if (cf.save_file && !cf.user_saved) {
+ unlink(cf.save_file); /* silently ignore error */
+ g_free(cf.save_file);
+ }
+ cf.save_file_fd = create_tempfile(tmpname, sizeof tmpname, "ether");
+ cf.save_file = g_strdup(tmpname);
+ cf.user_saved = 0;
+
+ if( fork_mode ){ /* use fork() for capture */
+ int fork_child;
+ char ssnap[24];
+ char scount[24]; /* need a constant for len of numbers */
+ char save_file_fd[24];
+ int err;
+
+ sprintf(ssnap,"%d",cf.snap); /* in lieu of itoa */
+ sprintf(scount,"%d",cf.count);
+ sprintf(save_file_fd,"%d",cf.save_file_fd);
+ signal(SIGCHLD, SIG_IGN);
+ if (sync_mode) pipe(sync_pipe);
+ if((fork_child = fork()) == 0){
+ /* args: -k -- capture
+ * -i interface specification
+ * -w file to write
+ * -W file descriptor to write
+ * -c count to capture
+ * -Q quit after capture (forces -k)
+ * -s snaplen
+ * -S sync mode
+ * -m / -b fonts
+ * -f "filter expression"
+ */
+ if (sync_mode) {
+ close(1);
+ dup(sync_pipe[1]);
+ close(sync_pipe[0]);
+ execlp(ethereal_path, "ethereal", "-k", "-Q", "-i", cf.iface,
+ "-w", cf.save_file, "-W", save_file_fd,
+ "-c", scount, "-s", ssnap, "-S",
+ "-m", medium_font, "-b", bold_font,
+ (cf.cfilter == NULL)? 0 : "-f",
+ (cf.cfilter == NULL)? 0 : cf.cfilter,
+ (const char *)NULL);
+ }
+ else {
+ execlp(ethereal_path, "ethereal", "-k", "-Q", "-i", cf.iface,
+ "-w", cf.save_file, "-W", save_file_fd,
+ "-c", scount, "-s", ssnap,
+ "-m", medium_font, "-b", bold_font,
+ (cf.cfilter == NULL)? 0 : "-f",
+ (cf.cfilter == NULL)? 0 : cf.cfilter,
+ (const char *)NULL);
+ }
+ }
+ else {
+ cf.filename = cf.save_file;
+ if (sync_mode) {
+ close(sync_pipe[1]);
+ while (!sigusr2_received) {
+ struct timeval timeout = {1,0};
+ select(0, NULL, NULL, NULL, &timeout);
+ if (kill(fork_child, 0) == -1 && errno == ESRCH)
+ break;
+ }
+ if (sigusr2_received) {
+ err = tail_cap_file(cf.save_file, &cf);
+ if (err != 0) {
+ simple_dialog(ESD_TYPE_WARN, NULL,
+ file_open_error_message(err, FALSE), cf.save_file);
+ }
+ }
+ sigusr2_received = FALSE;
+ }
+ }
+ }
+ else
+ capture();
+}
+
+static void
+capture_prep_close_cb(GtkWidget *close_bt, gpointer parent_w)
+{
+ gtk_grab_remove(GTK_WIDGET(parent_w));
+ gtk_widget_destroy(GTK_WIDGET(parent_w));
+}
+
+struct search_user_data {
+ char *name;
+ int found;
+};
+
+static GList *
+get_interface_list() {
+ GList *il = NULL;
+ gint nonloopback_pos = 0;
+ struct ifreq *ifr, *last;
+ struct ifconf ifc;
+ struct ifreq ifrflags;
+ int sock = socket(AF_INET, SOCK_DGRAM, 0);
+ struct search_user_data user_data;
+ pcap_t *pch;
+ gchar err_str[PCAP_ERRBUF_SIZE];
+
+ if (sock < 0)
+ {
+ simple_dialog(ESD_TYPE_WARN, NULL,
+ "Can't list interfaces: error opening socket.");
+ return NULL;
+ }
+
+ /* Since we have to grab the interface list all at once, we'll make
+ plenty of room */
+ ifc.ifc_len = 1024 * sizeof(struct ifreq);
+ ifc.ifc_buf = malloc(ifc.ifc_len);
+
+ if (ioctl(sock, SIOCGIFCONF, &ifc) < 0 ||
+ ifc.ifc_len < sizeof(struct ifreq))
+ {
+ simple_dialog(ESD_TYPE_WARN, NULL,
+ "Can't list interfaces: SIOCGIFCONF error: %s", strerror(errno));
+ goto fail;
+ }
+
+ ifr = (struct ifreq *) ifc.ifc_req;
+ last = (struct ifreq *) ((char *) ifr + ifc.ifc_len);
+ while (ifr < last)
+ {
+ /*
+ * Skip addresses that begin with "dummy", or that include a ":"
+ * (the latter are Solaris virtuals).
+ */
+ if (strncmp(ifr->ifr_name, "dummy", 5) == 0 ||
+ strchr(ifr->ifr_name, ':') != NULL)
+ goto next;
+
+ /*
+ * If we already have this interface name on the list, don't add
+ * it (SIOCGIFCONF returns, at least on BSD-flavored systems, one
+ * entry per interface *address*; if an interface has multiple
+ * addresses, we get multiple entries for it).
+ */
+ user_data.name = ifr->ifr_name;
+ user_data.found = FALSE;
+ g_list_foreach(il, search_for_if_cb, &user_data);
+ if (user_data.found)
+ goto next;
+
+ /*
+ * Get the interface flags.
+ */
+ memset(&ifrflags, 0, sizeof ifrflags);
+ strncpy(ifrflags.ifr_name, ifr->ifr_name, sizeof ifrflags.ifr_name);
+ if (ioctl(sock, SIOCGIFFLAGS, (char *)&ifrflags) < 0) {
+ if (errno == ENXIO)
+ goto next;
+ simple_dialog(ESD_TYPE_WARN, NULL,
+ "Can't list interfaces: SIOCGIFFLAGS error on %s: %s",
+ ifr->ifr_name, strerror(errno));
+ goto fail;
+ }
+
+ /*
+ * Skip interfaces that aren't up.
+ */
+ if (!(ifrflags.ifr_flags & IFF_UP))
+ goto next;
+
+ /*
+ * Skip interfaces that we can't open with "libpcap".
+ */
+ pch = pcap_open_live(ifr->ifr_name, WTAP_MAX_PACKET_SIZE, 0, 0, err_str);
+ if (pch == NULL)
+ goto next;
+ pcap_close(pch);
+
+ /*
+ * If it's a loopback interface, add it at the end of the list,
+ * otherwise add it after the last non-loopback interface,
+ * so all loopback interfaces go at the end - we don't want a
+ * loopback interface to be the default capture device unless there
+ * are no non-loopback devices.
+ */
+ if ((ifrflags.ifr_flags & IFF_LOOPBACK) ||
+ strncmp(ifr->ifr_name, "lo", 2) == 0)
+ il = g_list_insert(il, g_strdup(ifr->ifr_name), -1);
+ else {
+ il = g_list_insert(il, g_strdup(ifr->ifr_name), nonloopback_pos);
+ /* Insert the next non-loopback interface after this one. */
+ nonloopback_pos++;
+ }
+
+next:
+#ifdef HAVE_SA_LEN
+ ifr = (struct ifreq *) ((char *) ifr + ifr->ifr_addr.sa_len + IFNAMSIZ);
+#else
+ ifr = (struct ifreq *) ((char *) ifr + sizeof(struct ifreq));
+#endif
+ }
+
+ free(ifc.ifc_buf);
+ close(sock);
+
+ if (il == NULL) {
+ simple_dialog(ESD_TYPE_WARN, NULL,
+ "There are no network interfaces that can be opened.\n"
+ "Please check to make sure you have sufficient permission\n"
+ "to capture packets.");
+ return NULL;
+ }
+
+ return il;
+
+fail:
+ if (il != NULL) {
+ g_list_foreach(il, free_if_cb, NULL);
+ g_list_free(il);
+ }
+ free(ifc.ifc_buf);
+ close(sock);
+ return NULL;
+}
+
+static void
+search_for_if_cb(gpointer data, gpointer user_data)
+{
+ struct search_user_data *search_user_data = user_data;
+
+ if (strcmp((char *)data, search_user_data->name) == 0)
+ search_user_data->found = TRUE;
+}
+
+static void
+free_if_cb(gpointer data, gpointer user_data)
+{
+ g_free(data);
+}
+
+
--- /dev/null
+/* capture_dlg.h
+ * Definitions for packet capture windows
+ *
+ * $Id: capture_dlg.h,v 1.1 1999/09/09 03:32:01 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __CAPTURE_DLG_H__
+#define __CAPTURE_DLG_H__
+
+void capture_prep_cb(GtkWidget *, gpointer);
+
+#endif /* capture.h */
#include "keys.h"
#endif
-#ifndef __PREFS_H__
-#include "prefs.h"
+#ifndef __PREFS_DLG_H__
+#include "prefs_dlg.h"
#endif
#ifndef __UTIL_H__
/* ethereal.c
*
- * $Id: main.c,v 1.1 1999/09/09 02:42:39 gram Exp $
+ * $Id: main.c,v 1.2 1999/09/09 03:32:01 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#include "summary.h"
#include "file.h"
#include "menu.h"
-#include "prefs.h"
+#include "prefs_dlg.h"
#include "column.h"
#include "print.h"
#include "resolv.h"
/* ethereal.h
* Global defines, etc.
*
- * $Id: main.h,v 1.1 1999/09/09 02:42:40 gram Exp $
+ * $Id: main.h,v 1.2 1999/09/09 03:32:02 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#ifndef __ETHEREAL_H__
#define __ETHEREAL_H__
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
+
+#ifndef __GLOBALS_H__
+#include "globals.h"
+#endif
-#define PF_DIR ".ethereal"
#define RC_FILE PF_DIR "/gtkrc"
#define MONO_MEDIUM_FONT "-*-lucidatypewriter-medium-r-normal-*-*-120-*-*-*-*-iso8859-1"
#define MONO_BOLD_FONT "-*-lucidatypewriter-bold-r-normal-*-*-120-*-*-*-*-iso8859-1"
/* menu.c
* Menu routines
*
- * $Id: menu.c,v 1.2 1999/09/09 02:42:40 gram Exp $
+ * $Id: menu.c,v 1.3 1999/09/09 03:32:02 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#include "main.h"
#include "menu.h"
#include "packet.h"
-#include "capture.h"
+#include "capture_dlg.h"
#include "summary.h"
#include "display.h"
-#include "prefs.h"
+#include "prefs_dlg.h"
#include "print.h"
#include "follow.h"
#include "colors.h"
--- /dev/null
+/* prefs_dlg.c
+ * Routines for handling preferences
+ *
+ * $Id: prefs_dlg.c,v 1.1 1999/09/09 03:32:03 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#include <gtk/gtk.h>
+
+#include <stdlib.h>
+#include <ctype.h>
+#include <errno.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <sys/stat.h>
+
+#include "main.h"
+#include "packet.h"
+#include "file.h"
+#include "prefs.h"
+#include "column.h"
+#include "print.h"
+#include "prefs_dlg.h"
+#include "print_prefs.h"
+#include "filter_prefs.h"
+#include "util.h"
+
+e_prefs prefs;
+
+static void prefs_main_ok_cb(GtkWidget *, gpointer);
+static void prefs_main_save_cb(GtkWidget *, gpointer);
+static void prefs_main_cancel_cb(GtkWidget *, gpointer);
+
+
+#define E_PRINT_PAGE_KEY "printer_options_page"
+#define E_FILTER_PAGE_KEY "filter_options_page"
+#define E_COLUMN_PAGE_KEY "column_options_page"
+
+void
+prefs_cb(GtkWidget *w, gpointer sp) {
+ GtkWidget *prefs_w, *main_vb, *top_hb, *bbox, *prefs_nb,
+ *ok_bt, *save_bt, *cancel_bt;
+ GtkWidget *print_pg, *filter_pg, *column_pg, *filter_te, *label;
+
+/* GtkWidget *nlabel; */
+ gint start_page = (gint) sp;
+
+ filter_pg = NULL;
+ filter_te = NULL;
+
+ prefs_w = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_title(GTK_WINDOW(prefs_w), "Ethereal: Preferences");
+
+ /* Container for each row of widgets */
+ main_vb = gtk_vbox_new(FALSE, 5);
+ gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
+ gtk_container_add(GTK_CONTAINER(prefs_w), main_vb);
+ gtk_widget_show(main_vb);
+
+ /* Top row: Preferences notebook */
+ top_hb = gtk_hbox_new(FALSE, 1);
+ gtk_container_add(GTK_CONTAINER(main_vb), top_hb);
+ gtk_widget_show(top_hb);
+
+ prefs_nb = gtk_notebook_new();
+ gtk_container_add(GTK_CONTAINER(main_vb), prefs_nb);
+ gtk_widget_show(prefs_nb);
+
+ /* General prefs */
+/* nlabel = gtk_label_new("Nothing here yet...");
+ gtk_widget_show (nlabel);
+
+ label = gtk_label_new ("General");
+ gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), nlabel, label);
+ */
+ /* Printing prefs */
+ print_pg = printer_prefs_show();
+ gtk_object_set_data(GTK_OBJECT(prefs_w), E_PRINT_PAGE_KEY, print_pg);
+ label = gtk_label_new ("Printing");
+ gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), print_pg, label);
+
+ /* Filter prefs */
+ if (w)
+ filter_te = gtk_object_get_data(GTK_OBJECT(w), E_FILT_TE_PTR_KEY);
+ filter_pg = filter_prefs_show(filter_te);
+
+ /* Pass along the entry widget pointer from the calling widget */
+ gtk_object_set_data(GTK_OBJECT(filter_pg), E_FILT_TE_PTR_KEY, filter_te);
+ gtk_object_set_data(GTK_OBJECT(prefs_w), E_FILTER_PAGE_KEY, filter_pg);
+ label = gtk_label_new ("Filters");
+ gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), filter_pg, label);
+ /* Column prefs */
+ column_pg = column_prefs_show();
+ gtk_object_set_data(GTK_OBJECT(prefs_w), E_COLUMN_PAGE_KEY, column_pg);
+ label = gtk_label_new ("Columns");
+ gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), column_pg, label);
+
+ /* Jump to the specified page, if it was supplied */
+ if (start_page > E_PR_PG_NONE)
+ gtk_notebook_set_page(GTK_NOTEBOOK(prefs_nb), start_page);
+
+ /* Button row: OK and cancel buttons */
+ bbox = gtk_hbutton_box_new();
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
+ gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
+ gtk_container_add(GTK_CONTAINER(main_vb), bbox);
+ gtk_widget_show(bbox);
+
+ ok_bt = gtk_button_new_with_label ("OK");
+ gtk_signal_connect(GTK_OBJECT(ok_bt), "clicked",
+ GTK_SIGNAL_FUNC(prefs_main_ok_cb), GTK_OBJECT(prefs_w));
+ GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
+ gtk_box_pack_start (GTK_BOX (bbox), ok_bt, TRUE, TRUE, 0);
+ gtk_widget_grab_default(ok_bt);
+ gtk_widget_show(ok_bt);
+
+ save_bt = gtk_button_new_with_label ("Save");
+ gtk_signal_connect(GTK_OBJECT(save_bt), "clicked",
+ GTK_SIGNAL_FUNC(prefs_main_save_cb), GTK_OBJECT(prefs_w));
+ GTK_WIDGET_SET_FLAGS(save_bt, GTK_CAN_DEFAULT);
+ gtk_box_pack_start (GTK_BOX (bbox), save_bt, TRUE, TRUE, 0);
+ gtk_widget_show(save_bt);
+
+ cancel_bt = gtk_button_new_with_label ("Cancel");
+ gtk_signal_connect(GTK_OBJECT(cancel_bt), "clicked",
+ GTK_SIGNAL_FUNC(prefs_main_cancel_cb), GTK_OBJECT(prefs_w));
+ GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
+ gtk_box_pack_start (GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0);
+ gtk_widget_show(cancel_bt);
+
+ gtk_widget_show(prefs_w);
+}
+
+void
+prefs_main_ok_cb(GtkWidget *ok_bt, gpointer parent_w)
+{
+ printer_prefs_ok(gtk_object_get_data(GTK_OBJECT(parent_w), E_PRINT_PAGE_KEY));
+ filter_prefs_ok(gtk_object_get_data(GTK_OBJECT(parent_w), E_FILTER_PAGE_KEY));
+ column_prefs_ok(gtk_object_get_data(GTK_OBJECT(parent_w), E_COLUMN_PAGE_KEY));
+ gtk_widget_destroy(GTK_WIDGET(parent_w));
+}
+
+void
+prefs_main_save_cb(GtkWidget *save_bt, gpointer parent_w)
+{
+ printer_prefs_save(gtk_object_get_data(GTK_OBJECT(parent_w), E_PRINT_PAGE_KEY));
+ filter_prefs_save(gtk_object_get_data(GTK_OBJECT(parent_w), E_FILTER_PAGE_KEY));
+ column_prefs_save(gtk_object_get_data(GTK_OBJECT(parent_w), E_COLUMN_PAGE_KEY));
+ write_prefs();
+}
+
+void
+prefs_main_cancel_cb(GtkWidget *cancel_bt, gpointer parent_w)
+{
+ printer_prefs_cancel(gtk_object_get_data(GTK_OBJECT(parent_w), E_PRINT_PAGE_KEY));
+ filter_prefs_cancel(gtk_object_get_data(GTK_OBJECT(parent_w), E_FILTER_PAGE_KEY));
+ column_prefs_cancel(gtk_object_get_data(GTK_OBJECT(parent_w), E_COLUMN_PAGE_KEY));
+ gtk_widget_destroy(GTK_WIDGET(parent_w));
+}
+
--- /dev/null
+/* prefs_dlg.h
+ * Definitions for preference handling routines
+ *
+ * $Id: prefs_dlg.h,v 1.1 1999/09/09 03:32:03 gram Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __PREFS_DLG_H__
+#define __PREFS_DLG_H__
+
+#ifndef __PREFS_H__
+#include "prefs.h"
+#endif
+
+
+#define E_PR_PG_NONE -1
+#define E_PR_PG_PRINTING 0
+#define E_PR_PG_FILTER 1
+#define E_PR_PG_COLUMN 2
+
+#define E_FILT_TE_PTR_KEY "filter_te_ptr"
+
+void prefs_cb(GtkWidget *, gpointer);
+
+#endif
#include "print.h"
#endif
-#ifndef __PREFS_H__
-#include "prefs.h"
+#ifndef __PREFS_DLG_H__
+#include "prefs_dlg.h"
#endif
#ifndef __UTIL_H__
#include "print.h"
#endif
-#ifndef __PREFS_H__
-#include "prefs.h"
+#ifndef __PREFS_DLG_H__
+#include "prefs_dlg.h"
#endif
#ifndef __UTIL_H__
/* prefs.c
* Routines for handling preferences
*
- * $Id: prefs.c,v 1.21 1999/09/09 02:42:25 gram Exp $
+ * $Id: prefs.c,v 1.22 1999/09/09 03:31:50 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#include <direct.h>
#endif
-#include <gtk/gtk.h>
-
#include <stdlib.h>
#include <ctype.h>
#include <errno.h>
#include <sys/stat.h>
-#include "gtk/main.h"
+#include "globals.h"
#include "packet.h"
#include "file.h"
#include "prefs.h"
#include "column.h"
#include "print.h"
-#include "gtk/print_prefs.h"
-#include "filter.h"
#include "util.h"
/* Internal functions */
static int set_pref(gchar*, gchar*);
-static void write_prefs();
-static void prefs_main_ok_cb(GtkWidget *, gpointer);
-static void prefs_main_save_cb(GtkWidget *, gpointer);
-static void prefs_main_cancel_cb(GtkWidget *, gpointer);
static GList *get_string_list(gchar *);
static void clear_string_list(GList *);
-e_prefs prefs;
-static int init_prefs = 1;
-
#define PF_NAME "preferences"
-#define E_PRINT_PAGE_KEY "printer_options_page"
-#define E_FILTER_PAGE_KEY "filter_options_page"
-#define E_COLUMN_PAGE_KEY "column_options_page"
-
+static int init_prefs = 1;
static gchar *pf_path = NULL;
-void
-prefs_cb(GtkWidget *w, gpointer sp) {
- GtkWidget *prefs_w, *main_vb, *top_hb, *bbox, *prefs_nb,
- *ok_bt, *save_bt, *cancel_bt;
- GtkWidget *print_pg, *filter_pg, *column_pg, *filter_te, *label;
-
-/* GtkWidget *nlabel; */
- gint start_page = (gint) sp;
-
- filter_pg = NULL;
- filter_te = NULL;
-
- prefs_w = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title(GTK_WINDOW(prefs_w), "Ethereal: Preferences");
-
- /* Container for each row of widgets */
- main_vb = gtk_vbox_new(FALSE, 5);
- gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
- gtk_container_add(GTK_CONTAINER(prefs_w), main_vb);
- gtk_widget_show(main_vb);
-
- /* Top row: Preferences notebook */
- top_hb = gtk_hbox_new(FALSE, 1);
- gtk_container_add(GTK_CONTAINER(main_vb), top_hb);
- gtk_widget_show(top_hb);
-
- prefs_nb = gtk_notebook_new();
- gtk_container_add(GTK_CONTAINER(main_vb), prefs_nb);
- gtk_widget_show(prefs_nb);
-
- /* General prefs */
-/* nlabel = gtk_label_new("Nothing here yet...");
- gtk_widget_show (nlabel);
-
- label = gtk_label_new ("General");
- gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), nlabel, label);
- */
- /* Printing prefs */
- print_pg = printer_prefs_show();
- gtk_object_set_data(GTK_OBJECT(prefs_w), E_PRINT_PAGE_KEY, print_pg);
- label = gtk_label_new ("Printing");
- gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), print_pg, label);
-
- /* Filter prefs */
- if (w)
- filter_te = gtk_object_get_data(GTK_OBJECT(w), E_FILT_TE_PTR_KEY);
- filter_pg = filter_prefs_show(filter_te);
-
- /* Pass along the entry widget pointer from the calling widget */
- gtk_object_set_data(GTK_OBJECT(filter_pg), E_FILT_TE_PTR_KEY, filter_te);
- gtk_object_set_data(GTK_OBJECT(prefs_w), E_FILTER_PAGE_KEY, filter_pg);
- label = gtk_label_new ("Filters");
- gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), filter_pg, label);
- /* Column prefs */
- column_pg = column_prefs_show();
- gtk_object_set_data(GTK_OBJECT(prefs_w), E_COLUMN_PAGE_KEY, column_pg);
- label = gtk_label_new ("Columns");
- gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), column_pg, label);
-
- /* Jump to the specified page, if it was supplied */
- if (start_page > E_PR_PG_NONE)
- gtk_notebook_set_page(GTK_NOTEBOOK(prefs_nb), start_page);
-
- /* Button row: OK and cancel buttons */
- bbox = gtk_hbutton_box_new();
- gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
- gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
- gtk_container_add(GTK_CONTAINER(main_vb), bbox);
- gtk_widget_show(bbox);
-
- ok_bt = gtk_button_new_with_label ("OK");
- gtk_signal_connect(GTK_OBJECT(ok_bt), "clicked",
- GTK_SIGNAL_FUNC(prefs_main_ok_cb), GTK_OBJECT(prefs_w));
- GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
- gtk_box_pack_start (GTK_BOX (bbox), ok_bt, TRUE, TRUE, 0);
- gtk_widget_grab_default(ok_bt);
- gtk_widget_show(ok_bt);
-
- save_bt = gtk_button_new_with_label ("Save");
- gtk_signal_connect(GTK_OBJECT(save_bt), "clicked",
- GTK_SIGNAL_FUNC(prefs_main_save_cb), GTK_OBJECT(prefs_w));
- GTK_WIDGET_SET_FLAGS(save_bt, GTK_CAN_DEFAULT);
- gtk_box_pack_start (GTK_BOX (bbox), save_bt, TRUE, TRUE, 0);
- gtk_widget_show(save_bt);
-
- cancel_bt = gtk_button_new_with_label ("Cancel");
- gtk_signal_connect(GTK_OBJECT(cancel_bt), "clicked",
- GTK_SIGNAL_FUNC(prefs_main_cancel_cb), GTK_OBJECT(prefs_w));
- GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
- gtk_box_pack_start (GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0);
- gtk_widget_show(cancel_bt);
-
- gtk_widget_show(prefs_w);
-}
-
-void
-prefs_main_ok_cb(GtkWidget *ok_bt, gpointer parent_w)
-{
- printer_prefs_ok(gtk_object_get_data(GTK_OBJECT(parent_w), E_PRINT_PAGE_KEY));
- filter_prefs_ok(gtk_object_get_data(GTK_OBJECT(parent_w), E_FILTER_PAGE_KEY));
- column_prefs_ok(gtk_object_get_data(GTK_OBJECT(parent_w), E_COLUMN_PAGE_KEY));
- gtk_widget_destroy(GTK_WIDGET(parent_w));
-}
-
-void
-prefs_main_save_cb(GtkWidget *save_bt, gpointer parent_w)
-{
- printer_prefs_save(gtk_object_get_data(GTK_OBJECT(parent_w), E_PRINT_PAGE_KEY));
- filter_prefs_save(gtk_object_get_data(GTK_OBJECT(parent_w), E_FILTER_PAGE_KEY));
- column_prefs_save(gtk_object_get_data(GTK_OBJECT(parent_w), E_COLUMN_PAGE_KEY));
- write_prefs();
-}
-
-void
-prefs_main_cancel_cb(GtkWidget *cancel_bt, gpointer parent_w)
-{
- printer_prefs_cancel(gtk_object_get_data(GTK_OBJECT(parent_w), E_PRINT_PAGE_KEY));
- filter_prefs_cancel(gtk_object_get_data(GTK_OBJECT(parent_w), E_FILTER_PAGE_KEY));
- column_prefs_cancel(gtk_object_get_data(GTK_OBJECT(parent_w), E_COLUMN_PAGE_KEY));
- gtk_widget_destroy(GTK_WIDGET(parent_w));
-}
-
/* Parse through a list of comma-separated, quoted strings. Return a
list of the string data */
static GList *
}
void
-write_prefs() {
+write_prefs(void) {
FILE *pf;
struct stat s_buf;
/* prefs.h
* Definitions for preference handling routines
*
- * $Id: prefs.h,v 1.7 1999/07/23 08:29:24 guy Exp $
+ * $Id: prefs.h,v 1.8 1999/09/09 03:31:50 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
extern e_prefs prefs;
-#define E_PR_PG_NONE -1
-#define E_PR_PG_PRINTING 0
-#define E_PR_PG_FILTER 1
-#define E_PR_PG_COLUMN 2
-
-#define E_FILT_TE_PTR_KEY "filter_te_ptr"
-
-void prefs_cb(GtkWidget *, gpointer);
e_prefs* read_prefs(char **);
+void write_prefs(void);
#endif /* prefs.h */
git.samba.org / metze / wireshark / wip.git / commitdiff