1998-09-16 02:39:15 +00:00
|
|
|
/* file.c
|
|
|
|
|
* File I/O routines
|
|
|
|
|
*
|
1999-11-29 01:40:49 +00:00
|
|
|
* $Id: file.c,v 1.124 1999/11/29 01:40:49 guy Exp $
|
1998-09-16 03:22:19 +00:00
|
|
|
*
|
1998-09-16 02:39:15 +00:00
|
|
|
* 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 <gtk/gtk.h>
|
1998-11-12 00:06:47 +00:00
|
|
|
|
1998-09-16 02:39:15 +00:00
|
|
|
#include <stdio.h>
|
1999-07-13 02:53:26 +00:00
|
|
|
|
|
|
|
|
#ifdef HAVE_UNISTD_H
|
1998-09-16 02:39:15 +00:00
|
|
|
#include <unistd.h>
|
1999-07-13 02:53:26 +00:00
|
|
|
#endif
|
|
|
|
|
|
1999-08-22 07:19:28 +00:00
|
|
|
#include <time.h>
|
|
|
|
|
|
1999-07-13 02:53:26 +00:00
|
|
|
#ifdef HAVE_IO_H
|
|
|
|
|
#include <io.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-07-28 20:39:42 +00:00
|
|
|
#include <stdlib.h>
|
1998-09-27 22:12:47 +00:00
|
|
|
#include <string.h>
|
1998-09-16 02:39:15 +00:00
|
|
|
#include <sys/stat.h>
|
|
|
|
|
#include <errno.h>
|
1999-05-11 18:51:10 +00:00
|
|
|
#include <fcntl.h>
|
1999-09-30 07:15:19 +00:00
|
|
|
#include <signal.h>
|
1998-09-16 02:39:15 +00:00
|
|
|
|
1998-10-10 03:32:20 +00:00
|
|
|
#ifdef NEED_SNPRINTF_H
|
1998-10-13 07:03:37 +00:00
|
|
|
# ifdef HAVE_STDARG_H
|
|
|
|
|
# include <stdarg.h>
|
|
|
|
|
# else
|
|
|
|
|
# include <varargs.h>
|
|
|
|
|
# endif
|
1998-10-10 03:32:20 +00:00
|
|
|
# include "snprintf.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-06-14 21:46:36 +00:00
|
|
|
#ifdef NEED_STRERROR_H
|
|
|
|
|
#include "strerror.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
1998-09-16 02:39:15 +00:00
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
|
|
|
# include <sys/types.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_NETINET_IN_H
|
|
|
|
|
# include <netinet/in.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-09-30 16:24:07 +00:00
|
|
|
#ifdef HAVE_SYS_WAIT_H
|
|
|
|
|
# include <sys/wait.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-09-09 02:42:40 +00:00
|
|
|
#include "gtk/main.h"
|
1999-06-19 03:14:32 +00:00
|
|
|
#include "column.h"
|
1999-09-01 03:04:24 +00:00
|
|
|
#include "gtk/menu.h"
|
1998-09-16 02:39:15 +00:00
|
|
|
#include "packet.h"
|
1999-07-23 08:29:24 +00:00
|
|
|
#include "print.h"
|
1998-09-16 02:39:15 +00:00
|
|
|
#include "file.h"
|
|
|
|
|
#include "util.h"
|
1999-09-09 02:42:40 +00:00
|
|
|
#include "gtk/proto_draw.h"
|
1999-07-07 22:52:57 +00:00
|
|
|
#include "dfilter.h"
|
1999-08-14 04:23:22 +00:00
|
|
|
#include "timestamp.h"
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
#include "conversation.h"
|
1999-11-19 22:32:00 +00:00
|
|
|
#include "globals.h"
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
|
|
|
|
|
#ifndef __RESOLV_H__
|
|
|
|
|
#include "resolv.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-10-22 08:11:40 +00:00
|
|
|
#include "packet-atalk.h"
|
|
|
|
|
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
#include "packet-ipv6.h"
|
1998-09-16 02:39:15 +00:00
|
|
|
|
1999-10-22 08:53:41 +00:00
|
|
|
#include "packet-sna.h"
|
|
|
|
|
|
1999-10-22 08:56:13 +00:00
|
|
|
#include "packet-vines.h"
|
|
|
|
|
|
1998-09-16 02:39:15 +00:00
|
|
|
extern GtkWidget *packet_list, *prog_bar, *info_bar, *byte_view, *tree_view;
|
|
|
|
|
extern guint file_ctx;
|
1999-05-11 18:51:10 +00:00
|
|
|
extern int sync_pipe[];
|
|
|
|
|
|
1999-07-28 20:53:40 +00:00
|
|
|
guint cap_input_id;
|
1999-09-19 15:54:54 +00:00
|
|
|
gboolean auto_scroll_live = FALSE;
|
1998-09-16 02:39:15 +00:00
|
|
|
|
1998-12-29 04:05:38 +00:00
|
|
|
static guint32 firstsec, firstusec;
|
1999-08-14 04:23:22 +00:00
|
|
|
static guint32 prevsec, prevusec;
|
1998-09-16 02:39:15 +00:00
|
|
|
|
1998-11-15 05:29:17 +00:00
|
|
|
static void wtap_dispatch_cb(u_char *, const struct wtap_pkthdr *, int,
|
|
|
|
|
const u_char *);
|
|
|
|
|
|
1999-07-28 03:29:02 +00:00
|
|
|
static void freeze_clist(capture_file *cf);
|
|
|
|
|
static void thaw_clist(capture_file *cf);
|
|
|
|
|
|
1999-08-28 01:51:58 +00:00
|
|
|
/* Update the progress bar this many times when reading a file. */
|
|
|
|
|
#define N_PROGBAR_UPDATES 100
|
1999-08-05 16:46:04 +00:00
|
|
|
|
1998-09-16 02:39:15 +00:00
|
|
|
int
|
|
|
|
|
open_cap_file(char *fname, capture_file *cf) {
|
Split "load_cap_file()" into "open_cap_file()" and "read_cap_file()".
The former, which used to be called by "load_cap_file()", now just opens
the file and, if the open succeeds, closes any capture file we
previously had open, reinitializes any protocols that need
reinitialization, and saves information about the new capture file in
the "capture_file" structure to which it was passed a pointer. The
latter reads the file already opened by "read_cap_file()".
For "File/Open", call "open_cap_file()" before dismissing the file
selection box; if it fails, "open_cap_file()" will have popped up a
message box complaining about it - just return, leaving the file
selection box open so the user can, after dismissing the message box,
either try again with a different file name, or dismiss the file
selection box. (Other file selection boxes should be made to work the
same way.) If "open_cap_file()" succeeds, dismiss the file selection
box, and read the capture file in.
svn path=/trunk/; revision=492
1999-08-15 00:26:11 +00:00
|
|
|
wtap *wth;
|
1999-08-15 06:59:13 +00:00
|
|
|
int err;
|
1999-09-22 01:26:50 +00:00
|
|
|
FILE_T fh;
|
1999-09-23 04:39:01 +00:00
|
|
|
int fd;
|
|
|
|
|
struct stat cf_stat;
|
1998-09-16 02:39:15 +00:00
|
|
|
|
1999-08-15 06:59:13 +00:00
|
|
|
wth = wtap_open_offline(fname, &err);
|
|
|
|
|
if (wth == NULL)
|
Split "load_cap_file()" into "open_cap_file()" and "read_cap_file()".
The former, which used to be called by "load_cap_file()", now just opens
the file and, if the open succeeds, closes any capture file we
previously had open, reinitializes any protocols that need
reinitialization, and saves information about the new capture file in
the "capture_file" structure to which it was passed a pointer. The
latter reads the file already opened by "read_cap_file()".
For "File/Open", call "open_cap_file()" before dismissing the file
selection box; if it fails, "open_cap_file()" will have popped up a
message box complaining about it - just return, leaving the file
selection box open so the user can, after dismissing the message box,
either try again with a different file name, or dismiss the file
selection box. (Other file selection boxes should be made to work the
same way.) If "open_cap_file()" succeeds, dismiss the file selection
box, and read the capture file in.
svn path=/trunk/; revision=492
1999-08-15 00:26:11 +00:00
|
|
|
goto fail;
|
1998-09-16 02:39:15 +00:00
|
|
|
|
1999-08-15 06:59:13 +00:00
|
|
|
/* Find the size of the file. */
|
|
|
|
|
fh = wtap_file(wth);
|
1999-09-23 04:39:01 +00:00
|
|
|
fd = wtap_fd(wth);
|
|
|
|
|
if (fstat(fd, &cf_stat) < 0) {
|
|
|
|
|
err = errno;
|
|
|
|
|
wtap_close(wth);
|
|
|
|
|
goto fail;
|
|
|
|
|
}
|
1998-09-16 02:39:15 +00:00
|
|
|
|
Split "load_cap_file()" into "open_cap_file()" and "read_cap_file()".
The former, which used to be called by "load_cap_file()", now just opens
the file and, if the open succeeds, closes any capture file we
previously had open, reinitializes any protocols that need
reinitialization, and saves information about the new capture file in
the "capture_file" structure to which it was passed a pointer. The
latter reads the file already opened by "read_cap_file()".
For "File/Open", call "open_cap_file()" before dismissing the file
selection box; if it fails, "open_cap_file()" will have popped up a
message box complaining about it - just return, leaving the file
selection box open so the user can, after dismissing the message box,
either try again with a different file name, or dismiss the file
selection box. (Other file selection boxes should be made to work the
same way.) If "open_cap_file()" succeeds, dismiss the file selection
box, and read the capture file in.
svn path=/trunk/; revision=492
1999-08-15 00:26:11 +00:00
|
|
|
/* The open succeeded. Close whatever capture file we had open,
|
|
|
|
|
and fill in the information for this file. */
|
|
|
|
|
close_cap_file(cf, info_bar, file_ctx);
|
|
|
|
|
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
/* Initialize the table of conversations. */
|
|
|
|
|
conversation_init();
|
|
|
|
|
|
Split "load_cap_file()" into "open_cap_file()" and "read_cap_file()".
The former, which used to be called by "load_cap_file()", now just opens
the file and, if the open succeeds, closes any capture file we
previously had open, reinitializes any protocols that need
reinitialization, and saves information about the new capture file in
the "capture_file" structure to which it was passed a pointer. The
latter reads the file already opened by "read_cap_file()".
For "File/Open", call "open_cap_file()" before dismissing the file
selection box; if it fails, "open_cap_file()" will have popped up a
message box complaining about it - just return, leaving the file
selection box open so the user can, after dismissing the message box,
either try again with a different file name, or dismiss the file
selection box. (Other file selection boxes should be made to work the
same way.) If "open_cap_file()" succeeds, dismiss the file selection
box, and read the capture file in.
svn path=/trunk/; revision=492
1999-08-15 00:26:11 +00:00
|
|
|
/* Initialize protocol-specific variables */
|
Provide a general mechanism by which dissectors can register "init"
routines, which are called before a dissection pass is made over all the
packets in a capture - the "init" routine would clear out any state
information that needs to be initialized before such a dissection pass.
Make the NCP, SMB, AFS, and ONC RPC dissectors register their "init"
routines with that mechanism, have the code that reads in a capture file
call the routine that calls all registered "init" routines rather than
calling a wired-in set of "init" routines, and also have the code that
runs a filtering or colorizing pass over all the packets call that
routine, as a filtering or colorizing pass is a dissection pass.
Have the ONC RPC "init" routine zero out the table of RPC calls, so that
it completely erases any state from the previous dissection pass (so
that, for example, if you run a filtering pass, it doesn't mark any
non-duplicate packets as duplicates because it remembers them from the
previous pass).
svn path=/trunk/; revision=1050
1999-11-17 21:58:33 +00:00
|
|
|
init_all_protocols();
|
Split "load_cap_file()" into "open_cap_file()" and "read_cap_file()".
The former, which used to be called by "load_cap_file()", now just opens
the file and, if the open succeeds, closes any capture file we
previously had open, reinitializes any protocols that need
reinitialization, and saves information about the new capture file in
the "capture_file" structure to which it was passed a pointer. The
latter reads the file already opened by "read_cap_file()".
For "File/Open", call "open_cap_file()" before dismissing the file
selection box; if it fails, "open_cap_file()" will have popped up a
message box complaining about it - just return, leaving the file
selection box open so the user can, after dismissing the message box,
either try again with a different file name, or dismiss the file
selection box. (Other file selection boxes should be made to work the
same way.) If "open_cap_file()" succeeds, dismiss the file selection
box, and read the capture file in.
svn path=/trunk/; revision=492
1999-08-15 00:26:11 +00:00
|
|
|
|
|
|
|
|
cf->wth = wth;
|
1999-08-15 06:59:13 +00:00
|
|
|
cf->fh = fh;
|
1999-09-23 04:39:01 +00:00
|
|
|
cf->filed = fd;
|
|
|
|
|
cf->f_len = cf_stat.st_size;
|
Split "load_cap_file()" into "open_cap_file()" and "read_cap_file()".
The former, which used to be called by "load_cap_file()", now just opens
the file and, if the open succeeds, closes any capture file we
previously had open, reinitializes any protocols that need
reinitialization, and saves information about the new capture file in
the "capture_file" structure to which it was passed a pointer. The
latter reads the file already opened by "read_cap_file()".
For "File/Open", call "open_cap_file()" before dismissing the file
selection box; if it fails, "open_cap_file()" will have popped up a
message box complaining about it - just return, leaving the file
selection box open so the user can, after dismissing the message box,
either try again with a different file name, or dismiss the file
selection box. (Other file selection boxes should be made to work the
same way.) If "open_cap_file()" succeeds, dismiss the file selection
box, and read the capture file in.
svn path=/trunk/; revision=492
1999-08-15 00:26:11 +00:00
|
|
|
|
|
|
|
|
/* set the file name because we need it to set the follow stream filter */
|
|
|
|
|
cf->filename = g_strdup(fname);
|
|
|
|
|
|
|
|
|
|
cf->cd_t = wtap_file_type(cf->wth);
|
Check in Olivier Abad's patch to add dissectors for LAP-B and X.25, and
wiretap support for RADCOM Ltd.'s WAN/LAN analyzers (see
http://www.radcom-inc.com/
). Note: as I remember, IEEE 802.2/ISO 8022 LLC has somewhat of an SDLC
flavor to it, just as I think LAP, LAPB, LAPD, and so on do, so we may
be able to combine some of the LLC dissection and the LAPB dissection
into common code that could, conceivably be used for other SDLC-flavored
protocols.
Make "S" a mnemonic for "Summary" in the "Tools" menu.
Move the routine, used for the "Tools/Summary" display, that turns a
wiretap file type into a descriptive string for it into the wiretap
library itself, expand on some of its descriptions, and add an entry for
files from a RADCOM analyzer.
Have "Tools/Summary" display the snapshot length for the capture.
svn path=/trunk/; revision=416
1999-08-02 02:04:38 +00:00
|
|
|
cf->cd_t_desc = wtap_file_type_string(cf->wth);
|
Split "load_cap_file()" into "open_cap_file()" and "read_cap_file()".
The former, which used to be called by "load_cap_file()", now just opens
the file and, if the open succeeds, closes any capture file we
previously had open, reinitializes any protocols that need
reinitialization, and saves information about the new capture file in
the "capture_file" structure to which it was passed a pointer. The
latter reads the file already opened by "read_cap_file()".
For "File/Open", call "open_cap_file()" before dismissing the file
selection box; if it fails, "open_cap_file()" will have popped up a
message box complaining about it - just return, leaving the file
selection box open so the user can, after dismissing the message box,
either try again with a different file name, or dismiss the file
selection box. (Other file selection boxes should be made to work the
same way.) If "open_cap_file()" succeeds, dismiss the file selection
box, and read the capture file in.
svn path=/trunk/; revision=492
1999-08-15 00:26:11 +00:00
|
|
|
cf->count = 0;
|
|
|
|
|
cf->drops = 0;
|
|
|
|
|
cf->esec = 0;
|
|
|
|
|
cf->eusec = 0;
|
|
|
|
|
cf->snap = wtap_snapshot_length(cf->wth);
|
1999-08-28 01:51:58 +00:00
|
|
|
cf->update_progbar = FALSE;
|
|
|
|
|
cf->progbar_quantum = 0;
|
|
|
|
|
cf->progbar_nextstep = 0;
|
Split "load_cap_file()" into "open_cap_file()" and "read_cap_file()".
The former, which used to be called by "load_cap_file()", now just opens
the file and, if the open succeeds, closes any capture file we
previously had open, reinitializes any protocols that need
reinitialization, and saves information about the new capture file in
the "capture_file" structure to which it was passed a pointer. The
latter reads the file already opened by "read_cap_file()".
For "File/Open", call "open_cap_file()" before dismissing the file
selection box; if it fails, "open_cap_file()" will have popped up a
message box complaining about it - just return, leaving the file
selection box open so the user can, after dismissing the message box,
either try again with a different file name, or dismiss the file
selection box. (Other file selection boxes should be made to work the
same way.) If "open_cap_file()" succeeds, dismiss the file selection
box, and read the capture file in.
svn path=/trunk/; revision=492
1999-08-15 00:26:11 +00:00
|
|
|
firstsec = 0, firstusec = 0;
|
|
|
|
|
prevsec = 0, prevusec = 0;
|
|
|
|
|
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
return (0);
|
Split "load_cap_file()" into "open_cap_file()" and "read_cap_file()".
The former, which used to be called by "load_cap_file()", now just opens
the file and, if the open succeeds, closes any capture file we
previously had open, reinitializes any protocols that need
reinitialization, and saves information about the new capture file in
the "capture_file" structure to which it was passed a pointer. The
latter reads the file already opened by "read_cap_file()".
For "File/Open", call "open_cap_file()" before dismissing the file
selection box; if it fails, "open_cap_file()" will have popped up a
message box complaining about it - just return, leaving the file
selection box open so the user can, after dismissing the message box,
either try again with a different file name, or dismiss the file
selection box. (Other file selection boxes should be made to work the
same way.) If "open_cap_file()" succeeds, dismiss the file selection
box, and read the capture file in.
svn path=/trunk/; revision=492
1999-08-15 00:26:11 +00:00
|
|
|
|
|
|
|
|
fail:
|
|
|
|
|
simple_dialog(ESD_TYPE_WARN, NULL,
|
|
|
|
|
file_open_error_message(err, FALSE), fname);
|
|
|
|
|
return (err);
|
1998-09-16 02:39:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Reset everything to a pristine state */
|
|
|
|
|
void
|
1999-03-23 03:14:46 +00:00
|
|
|
close_cap_file(capture_file *cf, void *w, guint context) {
|
1999-08-10 04:13:37 +00:00
|
|
|
frame_data *fd, *fd_next;
|
|
|
|
|
|
1998-09-16 02:39:15 +00:00
|
|
|
if (cf->fh) {
|
1999-09-22 01:26:50 +00:00
|
|
|
file_close(cf->fh);
|
1998-09-16 02:39:15 +00:00
|
|
|
cf->fh = NULL;
|
|
|
|
|
}
|
1998-11-12 00:06:47 +00:00
|
|
|
if (cf->wth) {
|
1999-06-19 01:14:51 +00:00
|
|
|
wtap_close(cf->wth);
|
|
|
|
|
cf->wth = NULL;
|
|
|
|
|
}
|
1999-08-10 04:13:37 +00:00
|
|
|
for (fd = cf->plist; fd != NULL; fd = fd_next) {
|
|
|
|
|
fd_next = fd->next;
|
|
|
|
|
g_free(fd);
|
1999-06-19 01:14:51 +00:00
|
|
|
}
|
1999-08-15 19:18:46 +00:00
|
|
|
if (cf->rfcode != NULL) {
|
|
|
|
|
dfilter_destroy(cf->rfcode);
|
|
|
|
|
cf->rfcode = NULL;
|
|
|
|
|
}
|
1999-08-10 04:13:37 +00:00
|
|
|
cf->plist = NULL;
|
|
|
|
|
cf->plist_end = NULL;
|
Have "close_cap_file()" disable all menu items that make sense only if
you have a capture.
Leave the job of enabling and disabling menu items that make sense only
if you have a capture (except for "File/Save" and "File/Save As...", for
now) up to "load_cap_file()", "close_cap_file()", and the like - don't
scatter that stuff throughout the code.
Disable "File/Print Packet" if no packet is selected; enable it only if
a packet is selected.
If there's a selected packet, and a display filter is run:
if the selected packet passed the filter, re-select it;
if the selected packet didn't pass the filter, un-select it.
If we've opened a live "pcap" capture, but can't do the capture because
we can't get the netmask info, or can't parse the capture filter string,
or can't install the filter, close the live capture and the dump and
delete the dump file.
If we failed to open a live "pcap" capture, don't try to read the
capture file - it doesn't exist.
svn path=/trunk/; revision=384
1999-07-24 02:42:52 +00:00
|
|
|
unselect_packet(cf); /* nothing to select */
|
1998-09-16 02:39:15 +00:00
|
|
|
|
|
|
|
|
gtk_clist_freeze(GTK_CLIST(packet_list));
|
|
|
|
|
gtk_clist_clear(GTK_CLIST(packet_list));
|
|
|
|
|
gtk_clist_thaw(GTK_CLIST(packet_list));
|
|
|
|
|
gtk_statusbar_pop(GTK_STATUSBAR(w), context);
|
Have "close_cap_file()" disable all menu items that make sense only if
you have a capture.
Leave the job of enabling and disabling menu items that make sense only
if you have a capture (except for "File/Save" and "File/Save As...", for
now) up to "load_cap_file()", "close_cap_file()", and the like - don't
scatter that stuff throughout the code.
Disable "File/Print Packet" if no packet is selected; enable it only if
a packet is selected.
If there's a selected packet, and a display filter is run:
if the selected packet passed the filter, re-select it;
if the selected packet didn't pass the filter, un-select it.
If we've opened a live "pcap" capture, but can't do the capture because
we can't get the netmask info, or can't parse the capture filter string,
or can't install the filter, close the live capture and the dump and
delete the dump file.
If we failed to open a live "pcap" capture, don't try to read the
capture file - it doesn't exist.
svn path=/trunk/; revision=384
1999-07-24 02:42:52 +00:00
|
|
|
|
|
|
|
|
/* Disable all menu items that make sense only if you have a capture. */
|
|
|
|
|
set_menu_sensitivity("/File/Save", FALSE);
|
|
|
|
|
set_menu_sensitivity("/File/Save As...", FALSE);
|
|
|
|
|
set_menu_sensitivity("/File/Close", FALSE);
|
1999-07-27 02:04:38 +00:00
|
|
|
set_menu_sensitivity("/File/Reload", FALSE);
|
Have "close_cap_file()" disable all menu items that make sense only if
you have a capture.
Leave the job of enabling and disabling menu items that make sense only
if you have a capture (except for "File/Save" and "File/Save As...", for
now) up to "load_cap_file()", "close_cap_file()", and the like - don't
scatter that stuff throughout the code.
Disable "File/Print Packet" if no packet is selected; enable it only if
a packet is selected.
If there's a selected packet, and a display filter is run:
if the selected packet passed the filter, re-select it;
if the selected packet didn't pass the filter, un-select it.
If we've opened a live "pcap" capture, but can't do the capture because
we can't get the netmask info, or can't parse the capture filter string,
or can't install the filter, close the live capture and the dump and
delete the dump file.
If we failed to open a live "pcap" capture, don't try to read the
capture file - it doesn't exist.
svn path=/trunk/; revision=384
1999-07-24 02:42:52 +00:00
|
|
|
set_menu_sensitivity("/File/Print...", FALSE);
|
|
|
|
|
set_menu_sensitivity("/Display/Options...", FALSE);
|
1999-11-06 06:28:07 +00:00
|
|
|
set_menu_sensitivity("/Display/Match Selected", FALSE);
|
|
|
|
|
set_menu_sensitivity("/Display/Colorize Display...", FALSE);
|
|
|
|
|
set_menu_sensitivity("/Display/Find Frame...", FALSE);
|
1999-11-08 01:03:40 +00:00
|
|
|
set_menu_sensitivity("/Display/Go To Frame...", FALSE);
|
1999-11-06 06:28:07 +00:00
|
|
|
set_menu_sensitivity("/Display/Collapse All", FALSE);
|
|
|
|
|
set_menu_sensitivity("/Display/Expand All", FALSE);
|
|
|
|
|
set_menu_sensitivity("/Tools/Follow TCP Stream", FALSE);
|
|
|
|
|
set_menu_sensitivity("/Tools/Graph", FALSE);
|
Have "close_cap_file()" disable all menu items that make sense only if
you have a capture.
Leave the job of enabling and disabling menu items that make sense only
if you have a capture (except for "File/Save" and "File/Save As...", for
now) up to "load_cap_file()", "close_cap_file()", and the like - don't
scatter that stuff throughout the code.
Disable "File/Print Packet" if no packet is selected; enable it only if
a packet is selected.
If there's a selected packet, and a display filter is run:
if the selected packet passed the filter, re-select it;
if the selected packet didn't pass the filter, un-select it.
If we've opened a live "pcap" capture, but can't do the capture because
we can't get the netmask info, or can't parse the capture filter string,
or can't install the filter, close the live capture and the dump and
delete the dump file.
If we failed to open a live "pcap" capture, don't try to read the
capture file - it doesn't exist.
svn path=/trunk/; revision=384
1999-07-24 02:42:52 +00:00
|
|
|
set_menu_sensitivity("/Tools/Summary", FALSE);
|
1998-09-16 02:39:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
1999-08-15 19:18:46 +00:00
|
|
|
read_cap_file(capture_file *cf) {
|
1998-09-16 02:39:15 +00:00
|
|
|
gchar *name_ptr, *load_msg, *load_fmt = " Loading: %s...";
|
1998-10-12 01:40:57 +00:00
|
|
|
gchar *done_fmt = " File: %s Drops: %d";
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
int success;
|
|
|
|
|
int err;
|
1998-09-16 02:39:15 +00:00
|
|
|
size_t msg_len;
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
char *errmsg;
|
|
|
|
|
char errmsg_errno[1024+1];
|
1999-08-22 07:19:28 +00:00
|
|
|
gchar err_str[2048+1];
|
1998-09-16 02:39:15 +00:00
|
|
|
|
1999-08-15 01:02:26 +00:00
|
|
|
if ((name_ptr = (gchar *) strrchr(cf->filename, '/')) == NULL)
|
|
|
|
|
name_ptr = cf->filename;
|
1998-09-16 02:39:15 +00:00
|
|
|
else
|
|
|
|
|
name_ptr++;
|
1999-08-07 01:25:04 +00:00
|
|
|
|
1999-08-10 07:16:47 +00:00
|
|
|
load_msg = g_malloc(strlen(name_ptr) + strlen(load_fmt) + 2);
|
|
|
|
|
sprintf(load_msg, load_fmt, name_ptr);
|
|
|
|
|
gtk_statusbar_push(GTK_STATUSBAR(info_bar), file_ctx, load_msg);
|
1999-08-28 01:51:58 +00:00
|
|
|
|
|
|
|
|
cf->update_progbar = TRUE;
|
|
|
|
|
/* Update the progress bar when it gets to this value. */
|
|
|
|
|
cf->progbar_nextstep = 0;
|
|
|
|
|
/* When we reach the value that triggers a progress bar update,
|
|
|
|
|
bump that value by this amount. */
|
1999-09-23 04:39:01 +00:00
|
|
|
cf->progbar_quantum = cf->f_len/N_PROGBAR_UPDATES;
|
1999-08-10 07:16:47 +00:00
|
|
|
|
|
|
|
|
freeze_clist(cf);
|
1999-08-26 07:01:44 +00:00
|
|
|
proto_tree_is_visible = FALSE;
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
success = wtap_loop(cf->wth, 0, wtap_dispatch_cb, (u_char *) cf, &err);
|
1999-08-10 07:16:47 +00:00
|
|
|
wtap_close(cf->wth);
|
|
|
|
|
cf->wth = NULL;
|
1999-09-23 04:39:01 +00:00
|
|
|
cf->filed = open(cf->filename, O_RDONLY);
|
|
|
|
|
cf->fh = filed_open(cf->filed, "r");
|
1999-09-13 23:45:22 +00:00
|
|
|
cf->unfiltered_count = cf->count;
|
1999-11-06 06:28:07 +00:00
|
|
|
cf->current_frame = cf->first_displayed;
|
|
|
|
|
/* Make the first row the selected row. */
|
|
|
|
|
gtk_clist_select_row(GTK_CLIST(packet_list), 0, -1);
|
1999-08-10 07:16:47 +00:00
|
|
|
thaw_clist(cf);
|
1999-09-23 04:39:01 +00:00
|
|
|
|
1999-09-22 01:26:50 +00:00
|
|
|
gtk_progress_set_activity_mode(GTK_PROGRESS(prog_bar), FALSE);
|
|
|
|
|
gtk_progress_set_value(GTK_PROGRESS(prog_bar), 0);
|
1998-09-16 02:39:15 +00:00
|
|
|
|
|
|
|
|
gtk_statusbar_pop(GTK_STATUSBAR(info_bar), file_ctx);
|
|
|
|
|
|
1999-08-10 07:16:47 +00:00
|
|
|
msg_len = strlen(name_ptr) + strlen(done_fmt) + 64;
|
|
|
|
|
load_msg = g_realloc(load_msg, msg_len);
|
|
|
|
|
|
|
|
|
|
if (cf->user_saved || !cf->save_file)
|
|
|
|
|
snprintf(load_msg, msg_len, done_fmt, name_ptr, cf->drops);
|
|
|
|
|
else
|
|
|
|
|
snprintf(load_msg, msg_len, done_fmt, "<none>", cf->drops);
|
|
|
|
|
|
|
|
|
|
gtk_statusbar_push(GTK_STATUSBAR(info_bar), file_ctx, load_msg);
|
|
|
|
|
g_free(load_msg);
|
|
|
|
|
|
|
|
|
|
/* Enable menu items that make sense if you have a capture. */
|
|
|
|
|
set_menu_sensitivity("/File/Close", TRUE);
|
|
|
|
|
set_menu_sensitivity("/File/Reload", TRUE);
|
|
|
|
|
set_menu_sensitivity("/File/Print...", TRUE);
|
|
|
|
|
set_menu_sensitivity("/Display/Options...", TRUE);
|
1999-11-06 06:28:07 +00:00
|
|
|
set_menu_sensitivity("/Display/Match Selected", TRUE);
|
|
|
|
|
set_menu_sensitivity("/Display/Colorize Display...", TRUE);
|
|
|
|
|
set_menu_sensitivity("/Display/Find Frame...", TRUE);
|
1999-11-08 01:03:40 +00:00
|
|
|
set_menu_sensitivity("/Display/Go To Frame...", TRUE);
|
1999-11-06 06:28:07 +00:00
|
|
|
set_menu_sensitivity("/Tools/Follow TCP Stream", TRUE);
|
|
|
|
|
set_menu_sensitivity("/Tools/Graph", TRUE);
|
1999-08-10 07:16:47 +00:00
|
|
|
set_menu_sensitivity("/Tools/Summary", TRUE);
|
|
|
|
|
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
if (!success) {
|
|
|
|
|
/* Put up a message box noting that the read failed somewhere along
|
|
|
|
|
the line. Don't throw out the stuff we managed to read, though,
|
|
|
|
|
if any. */
|
|
|
|
|
switch (err) {
|
|
|
|
|
|
|
|
|
|
case WTAP_ERR_CANT_READ:
|
|
|
|
|
errmsg = "An attempt to read from the file failed for"
|
|
|
|
|
" some unknown reason.";
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case WTAP_ERR_SHORT_READ:
|
|
|
|
|
errmsg = "The capture file appears to have been cut short"
|
|
|
|
|
" in the middle of a packet.";
|
|
|
|
|
break;
|
|
|
|
|
|
DLT_NULL, from "libpcap", means different things on different platforms
and in different capture files; throw in some heuristics to try to
figure out whether the 4-byte header is:
1) PPP-over-HDLC (some version of ISDN4BSD?);
2) big-endian AF_ value (BSD on big-endian platforms);
3) little-endian AF_ value (BSD on little-endian platforms);
4) two octets of 0 followed by an Ethernet type (Linux, at least
on little-endian platforms, as mutated by "libpcap").
Make a separate Wiretap encapsulation type, WTAP_ENCAP_NULL,
corresponding to DLT_NULL.
Have the PPP code dissect the frame if it's PPP-over-HDLC, and have
"ethertype()" dissect the Ethernet type and the rest of the packet if
it's a Linux-style header; dissect it ourselves only if it's an AF_
value.
Have Wiretap impose a maximum packet size of 65535 bytes, so that it
fails more gracefully when handed a corrupt "libpcap" capture file
(other capture file formats with more than a 16-bit capture length
field, if any, will have that check added later), and put that size in
"wtap.h" and have Ethereal use it as its notion of a maximum packet
size.
Have Ethereal put up a "this file appears to be damaged or corrupt"
message box if Wiretap returns a WTAP_ERR_BAD_RECORD error when opening
or reading a capture file.
Include loopback interfaces in the list of interfaces offered by the
"Capture" dialog box, but put them at the end of the list so that it
doesn't default to a loopback interface unless there are no other
interfaces. Also, don't require that an interface in the list have an
IP address associated with it, and only put one entry in the list for a
given interface (SIOCGIFCONF returns one entry per interface *address*,
not per *interface* - and even if you were to use only IP addresses, an
interface could conceivably have more than one IP address).
Exclusively use Wiretap encapsulation types internally, even when
capturing; don't use DLT_ types.
svn path=/trunk/; revision=540
1999-08-22 00:47:56 +00:00
|
|
|
case WTAP_ERR_BAD_RECORD:
|
|
|
|
|
errmsg = "The capture file appears to be damaged or corrupt.";
|
|
|
|
|
break;
|
|
|
|
|
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
default:
|
1999-08-22 02:52:48 +00:00
|
|
|
sprintf(errmsg_errno, "An error occurred while reading the"
|
|
|
|
|
" capture file: %s.", wtap_strerror(err));
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
errmsg = errmsg_errno;
|
|
|
|
|
break;
|
|
|
|
|
}
|
1999-08-22 07:19:28 +00:00
|
|
|
snprintf(err_str, sizeof err_str, errmsg);
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
simple_dialog(ESD_TYPE_WARN, NULL, err_str);
|
|
|
|
|
return (err);
|
|
|
|
|
} else
|
|
|
|
|
return (0);
|
1998-09-16 02:39:15 +00:00
|
|
|
}
|
|
|
|
|
|
1999-07-13 02:53:26 +00:00
|
|
|
#ifdef HAVE_LIBPCAP
|
1999-05-11 18:51:10 +00:00
|
|
|
void
|
|
|
|
|
cap_file_input_cb (gpointer data, gint source, GdkInputCondition condition) {
|
|
|
|
|
|
|
|
|
|
capture_file *cf = (capture_file *)data;
|
1999-09-23 05:55:56 +00:00
|
|
|
char buffer[256+1], *p = buffer, *q = buffer;
|
1999-07-28 20:17:24 +00:00
|
|
|
int nread;
|
|
|
|
|
int to_read = 0;
|
|
|
|
|
gboolean exit_loop = FALSE;
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
int err;
|
1999-09-30 07:15:19 +00:00
|
|
|
int wstatus;
|
|
|
|
|
int wsignal;
|
|
|
|
|
char *msg;
|
|
|
|
|
char *sigmsg;
|
|
|
|
|
char sigmsg_buf[6+1+3+1];
|
|
|
|
|
char *coredumped;
|
1999-05-11 18:51:10 +00:00
|
|
|
|
|
|
|
|
/* avoid reentrancy problems and stack overflow */
|
|
|
|
|
gtk_input_remove(cap_input_id);
|
1999-07-20 05:13:24 +00:00
|
|
|
|
1999-07-28 20:17:24 +00:00
|
|
|
if ((nread = read(sync_pipe[0], buffer, 256)) <= 0) {
|
1999-05-11 18:51:10 +00:00
|
|
|
|
1999-07-20 05:13:24 +00:00
|
|
|
/* The child has closed the sync pipe, meaning it's not going to be
|
1999-09-30 07:15:19 +00:00
|
|
|
capturing any more packets. Pick up its exit status, and
|
|
|
|
|
complain if it died of a signal. */
|
|
|
|
|
if (wait(&wstatus) != -1) {
|
|
|
|
|
/* XXX - are there any platforms on which we can run that *don't*
|
|
|
|
|
support POSIX.1's <sys/wait.h> and macros therein? */
|
|
|
|
|
wsignal = wstatus & 0177;
|
|
|
|
|
coredumped = "";
|
|
|
|
|
if (wstatus == 0177) {
|
|
|
|
|
/* It stopped, rather than exiting. "Should not happen." */
|
|
|
|
|
msg = "stopped";
|
|
|
|
|
wsignal = (wstatus >> 8) & 0xFF;
|
|
|
|
|
} else {
|
|
|
|
|
msg = "terminated";
|
|
|
|
|
if (wstatus & 0200)
|
|
|
|
|
coredumped = " - core dumped";
|
|
|
|
|
}
|
|
|
|
|
if (wsignal != 0) {
|
|
|
|
|
switch (wsignal) {
|
|
|
|
|
|
|
|
|
|
case SIGHUP:
|
|
|
|
|
sigmsg = "Hangup";
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SIGINT:
|
|
|
|
|
sigmsg = "Interrupted";
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SIGQUIT:
|
|
|
|
|
sigmsg = "Quit";
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SIGILL:
|
|
|
|
|
sigmsg = "Illegal instruction";
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SIGTRAP:
|
|
|
|
|
sigmsg = "Trace trap";
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SIGABRT:
|
|
|
|
|
sigmsg = "Abort";
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SIGFPE:
|
|
|
|
|
sigmsg = "Arithmetic exception";
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SIGKILL:
|
|
|
|
|
sigmsg = "Killed";
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SIGBUS:
|
|
|
|
|
sigmsg = "Bus error";
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SIGSEGV:
|
|
|
|
|
sigmsg = "Segmentation violation";
|
|
|
|
|
break;
|
|
|
|
|
|
1999-09-30 16:24:07 +00:00
|
|
|
/* http://metalab.unc.edu/pub/Linux/docs/HOWTO/GCC-HOWTO
|
|
|
|
|
Linux is POSIX compliant. These are not POSIX-defined signals ---
|
|
|
|
|
ISO/IEC 9945-1:1990 (IEEE Std 1003.1-1990), paragraph B.3.3.1.1 sez:
|
|
|
|
|
|
|
|
|
|
``The signals SIGBUS, SIGEMT, SIGIOT, SIGTRAP, and SIGSYS
|
|
|
|
|
were omitted from POSIX.1 because their behavior is
|
|
|
|
|
implementation dependent and could not be adequately catego-
|
|
|
|
|
rized. Conforming implementations may deliver these sig-
|
|
|
|
|
nals, but must document the circumstances under which they
|
|
|
|
|
are delivered and note any restrictions concerning their
|
|
|
|
|
delivery.''
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifdef SIGSYS
|
1999-09-30 07:15:19 +00:00
|
|
|
case SIGSYS:
|
|
|
|
|
sigmsg = "Bad system call";
|
|
|
|
|
break;
|
1999-09-30 16:24:07 +00:00
|
|
|
#endif
|
1999-09-30 07:15:19 +00:00
|
|
|
|
|
|
|
|
case SIGPIPE:
|
|
|
|
|
sigmsg = "Broken pipe";
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SIGALRM:
|
|
|
|
|
sigmsg = "Alarm clock";
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SIGTERM:
|
|
|
|
|
sigmsg = "Terminated";
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
sprintf(sigmsg_buf, "Signal %d", wsignal);
|
|
|
|
|
sigmsg = sigmsg_buf;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
simple_dialog(ESD_TYPE_WARN, NULL,
|
|
|
|
|
"Child capture process %s: %s%s", msg, sigmsg, coredumped);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read what remains of the capture file, and stop capture (restore
|
|
|
|
|
menu items) */
|
1999-05-11 18:51:10 +00:00
|
|
|
gtk_clist_freeze(GTK_CLIST(packet_list));
|
1999-07-20 05:13:24 +00:00
|
|
|
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
/* XXX - do something if this fails? */
|
|
|
|
|
wtap_loop(cf->wth, 0, wtap_dispatch_cb, (u_char *) cf, &err);
|
1999-06-19 03:14:32 +00:00
|
|
|
|
1999-07-28 03:29:02 +00:00
|
|
|
thaw_clist(cf);
|
1999-09-19 15:54:54 +00:00
|
|
|
if (auto_scroll_live)
|
|
|
|
|
gtk_clist_moveto(GTK_CLIST(packet_list),
|
|
|
|
|
cf->plist_end->row, -1, 1.0, 1.0);
|
1999-05-11 18:51:10 +00:00
|
|
|
|
|
|
|
|
wtap_close(cf->wth);
|
|
|
|
|
cf->wth = NULL;
|
1999-06-15 04:48:57 +00:00
|
|
|
set_menu_sensitivity("/File/Open...", TRUE);
|
1999-05-11 18:51:10 +00:00
|
|
|
set_menu_sensitivity("/File/Close", TRUE);
|
1999-11-29 01:40:49 +00:00
|
|
|
set_menu_sensitivity("/File/Save", TRUE);
|
1999-07-23 08:29:24 +00:00
|
|
|
set_menu_sensitivity("/File/Print...", TRUE);
|
1999-07-27 02:04:38 +00:00
|
|
|
set_menu_sensitivity("/File/Reload", TRUE);
|
1999-06-19 01:14:51 +00:00
|
|
|
set_menu_sensitivity("/Capture/Start...", TRUE);
|
1999-06-22 22:02:39 +00:00
|
|
|
set_menu_sensitivity("/Tools/Summary", TRUE);
|
1999-05-11 18:51:10 +00:00
|
|
|
gtk_statusbar_push(GTK_STATUSBAR(info_bar), file_ctx, " File: <none>");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
1999-07-28 20:17:24 +00:00
|
|
|
buffer[nread] = '\0';
|
|
|
|
|
|
|
|
|
|
while(!exit_loop) {
|
|
|
|
|
/* look for (possibly multiple) '*' */
|
|
|
|
|
switch (*q) {
|
|
|
|
|
case '*' :
|
|
|
|
|
to_read += atoi(p);
|
|
|
|
|
p = q + 1;
|
|
|
|
|
q++;
|
|
|
|
|
break;
|
|
|
|
|
case '\0' :
|
|
|
|
|
/* XXX should handle the case of a pipe full (i.e. no star found) */
|
|
|
|
|
exit_loop = TRUE;
|
|
|
|
|
break;
|
|
|
|
|
default :
|
|
|
|
|
q++;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-06-19 03:14:32 +00:00
|
|
|
|
1999-07-28 20:17:24 +00:00
|
|
|
gtk_clist_freeze(GTK_CLIST(packet_list));
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
/* XXX - do something if this fails? */
|
|
|
|
|
wtap_loop(cf->wth, to_read, wtap_dispatch_cb, (u_char *) cf, &err);
|
1999-05-11 18:51:10 +00:00
|
|
|
gtk_clist_thaw(GTK_CLIST(packet_list));
|
1999-09-19 15:54:54 +00:00
|
|
|
if (auto_scroll_live)
|
|
|
|
|
gtk_clist_moveto(GTK_CLIST(packet_list), cf->plist_end->row, -1, 1.0, 1.0);
|
1999-05-11 18:51:10 +00:00
|
|
|
|
|
|
|
|
/* restore pipe handler */
|
|
|
|
|
cap_input_id = gtk_input_add_full (sync_pipe[0],
|
|
|
|
|
GDK_INPUT_READ,
|
|
|
|
|
cap_file_input_cb,
|
|
|
|
|
NULL,
|
|
|
|
|
(gpointer) cf,
|
|
|
|
|
NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
tail_cap_file(char *fname, capture_file *cf) {
|
|
|
|
|
int err;
|
1999-07-28 03:29:02 +00:00
|
|
|
int i;
|
1999-05-11 18:51:10 +00:00
|
|
|
|
|
|
|
|
err = open_cap_file(fname, cf);
|
|
|
|
|
if ((err == 0) && (cf->cd_t != WTAP_FILE_UNKNOWN)) {
|
|
|
|
|
|
1999-06-15 04:48:57 +00:00
|
|
|
set_menu_sensitivity("/File/Open...", FALSE);
|
1999-08-14 01:33:29 +00:00
|
|
|
set_menu_sensitivity("/Display/Options...", TRUE);
|
1999-11-06 06:28:07 +00:00
|
|
|
set_menu_sensitivity("/Display/Match Selected", TRUE);
|
|
|
|
|
set_menu_sensitivity("/Display/Colorize Display...", TRUE);
|
|
|
|
|
set_menu_sensitivity("/Display/Find Frame...", TRUE);
|
1999-11-08 01:03:40 +00:00
|
|
|
set_menu_sensitivity("/Display/Go To Frame...", TRUE);
|
1999-11-06 06:28:07 +00:00
|
|
|
set_menu_sensitivity("/Tools/Follow TCP Stream", TRUE);
|
|
|
|
|
set_menu_sensitivity("/Tools/Graph", TRUE);
|
|
|
|
|
set_menu_sensitivity("/Tools/Summary", TRUE);
|
1999-06-19 01:14:51 +00:00
|
|
|
set_menu_sensitivity("/Capture/Start...", FALSE);
|
1999-07-11 08:40:52 +00:00
|
|
|
|
1999-07-28 03:29:02 +00:00
|
|
|
for (i = 0; i < cf->cinfo.num_cols; i++) {
|
|
|
|
|
if (get_column_resize_type(cf->cinfo.col_fmt[i]) == RESIZE_LIVE)
|
|
|
|
|
gtk_clist_set_column_auto_resize(GTK_CLIST(packet_list), i, TRUE);
|
|
|
|
|
else {
|
|
|
|
|
gtk_clist_set_column_auto_resize(GTK_CLIST(packet_list), i, FALSE);
|
|
|
|
|
gtk_clist_set_column_width(GTK_CLIST(packet_list), i,
|
|
|
|
|
cf->cinfo.col_width[i]);
|
|
|
|
|
gtk_clist_set_column_resizeable(GTK_CLIST(packet_list), i, TRUE);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-09-23 05:55:56 +00:00
|
|
|
cf->fh = file_open(fname, "r");
|
1999-07-28 20:53:40 +00:00
|
|
|
|
1999-05-11 18:51:10 +00:00
|
|
|
cap_input_id = gtk_input_add_full (sync_pipe[0],
|
|
|
|
|
GDK_INPUT_READ,
|
|
|
|
|
cap_file_input_cb,
|
|
|
|
|
NULL,
|
|
|
|
|
(gpointer) cf,
|
|
|
|
|
NULL);
|
|
|
|
|
gtk_statusbar_push(GTK_STATUSBAR(info_bar), file_ctx,
|
|
|
|
|
" <live capture in progress>");
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
close(sync_pipe[0]);
|
|
|
|
|
}
|
|
|
|
|
return err;
|
|
|
|
|
}
|
1999-09-19 15:54:54 +00:00
|
|
|
#endif /* HAVE_LIBPCAP */
|
1999-05-11 18:51:10 +00:00
|
|
|
|
1999-08-14 04:23:22 +00:00
|
|
|
/* To do: Add check_col checks to the col_add* routines */
|
|
|
|
|
|
|
|
|
|
static void
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
col_set_abs_time(frame_data *fd, int col)
|
1999-08-14 04:23:22 +00:00
|
|
|
{
|
|
|
|
|
struct tm *tmp;
|
|
|
|
|
time_t then;
|
|
|
|
|
|
|
|
|
|
then = fd->abs_secs;
|
|
|
|
|
tmp = localtime(&then);
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
snprintf(fd->cinfo->col_data[col], COL_MAX_LEN, "%02d:%02d:%02d.%04ld",
|
1999-08-14 04:23:22 +00:00
|
|
|
tmp->tm_hour,
|
|
|
|
|
tmp->tm_min,
|
|
|
|
|
tmp->tm_sec,
|
|
|
|
|
(long)fd->abs_usecs/100);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
col_set_rel_time(frame_data *fd, int col)
|
1999-08-14 04:23:22 +00:00
|
|
|
{
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
snprintf(fd->cinfo->col_data[col], COL_MAX_LEN, "%d.%06d", fd->rel_secs,
|
|
|
|
|
fd->rel_usecs);
|
1999-08-14 04:23:22 +00:00
|
|
|
}
|
|
|
|
|
|
1998-11-15 05:29:17 +00:00
|
|
|
static void
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
col_set_delta_time(frame_data *fd, int col)
|
1999-06-19 01:14:51 +00:00
|
|
|
{
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
snprintf(fd->cinfo->col_data[col], COL_MAX_LEN, "%d.%06d", fd->del_secs,
|
|
|
|
|
fd->del_usecs);
|
1999-08-14 04:23:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Add "command-line-specified" time. */
|
|
|
|
|
static void
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
col_set_cls_time(frame_data *fd, int col)
|
1999-08-14 04:23:22 +00:00
|
|
|
{
|
|
|
|
|
switch (timestamp_type) {
|
|
|
|
|
case ABSOLUTE:
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
col_set_abs_time(fd, col);
|
1999-08-14 04:23:22 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case RELATIVE:
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
col_set_rel_time(fd, col);
|
1999-08-14 04:23:22 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DELTA:
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
col_set_delta_time(fd, col);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
col_set_addr(frame_data *fd, int col, address *addr, gboolean is_res)
|
|
|
|
|
{
|
|
|
|
|
u_int ipv4_addr;
|
|
|
|
|
struct e_in6_addr ipv6_addr;
|
1999-10-22 08:11:40 +00:00
|
|
|
struct atalk_ddp_addr ddp_addr;
|
1999-10-22 08:53:41 +00:00
|
|
|
struct sna_fid_type_4_addr sna_fid_type_4_addr;
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
|
|
|
|
|
switch (addr->type) {
|
|
|
|
|
|
|
|
|
|
case AT_ETHER:
|
|
|
|
|
if (is_res)
|
|
|
|
|
strncpy(fd->cinfo->col_data[col], get_ether_name(addr->data), COL_MAX_LEN);
|
|
|
|
|
else
|
|
|
|
|
strncpy(fd->cinfo->col_data[col], ether_to_str(addr->data), COL_MAX_LEN);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case AT_IPv4:
|
|
|
|
|
memcpy(&ipv4_addr, addr->data, sizeof ipv4_addr);
|
|
|
|
|
if (is_res)
|
|
|
|
|
strncpy(fd->cinfo->col_data[col], get_hostname(ipv4_addr), COL_MAX_LEN);
|
|
|
|
|
else
|
|
|
|
|
strncpy(fd->cinfo->col_data[col], ip_to_str(addr->data), COL_MAX_LEN);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case AT_IPv6:
|
|
|
|
|
memcpy(&ipv6_addr.s6_addr, addr->data, sizeof ipv6_addr.s6_addr);
|
|
|
|
|
if (is_res)
|
|
|
|
|
strncpy(fd->cinfo->col_data[col], get_hostname6(&ipv6_addr), COL_MAX_LEN);
|
|
|
|
|
else
|
|
|
|
|
strncpy(fd->cinfo->col_data[col], ip6_to_str(&ipv6_addr), COL_MAX_LEN);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case AT_IPX:
|
|
|
|
|
strncpy(fd->cinfo->col_data[col],
|
|
|
|
|
ipx_addr_to_str(pntohl(&addr->data[0]), &addr->data[4]), COL_MAX_LEN);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case AT_SNA:
|
|
|
|
|
switch (addr->len) {
|
|
|
|
|
|
|
|
|
|
case 1:
|
|
|
|
|
snprintf(fd->cinfo->col_data[col], COL_MAX_LEN, "%04X", addr->data[0]);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 2:
|
|
|
|
|
snprintf(fd->cinfo->col_data[col], COL_MAX_LEN, "%04X",
|
|
|
|
|
pntohs(&addr->data[0]));
|
1999-08-14 04:23:22 +00:00
|
|
|
break;
|
1999-10-22 08:53:41 +00:00
|
|
|
|
|
|
|
|
case SNA_FID_TYPE_4_ADDR_LEN:
|
|
|
|
|
memcpy(&sna_fid_type_4_addr, addr->data, SNA_FID_TYPE_4_ADDR_LEN);
|
|
|
|
|
strncpy(fd->cinfo->col_data[col],
|
|
|
|
|
sna_fid_type_4_addr_to_str(&sna_fid_type_4_addr), COL_MAX_LEN);
|
|
|
|
|
break;
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
1999-10-22 08:11:40 +00:00
|
|
|
case AT_ATALK:
|
|
|
|
|
memcpy(&ddp_addr, addr->data, sizeof ddp_addr);
|
|
|
|
|
strncpy(fd->cinfo->col_data[col], atalk_addr_to_str(&ddp_addr),
|
|
|
|
|
COL_MAX_LEN);
|
|
|
|
|
break;
|
|
|
|
|
|
1999-10-22 08:30:04 +00:00
|
|
|
case AT_VINES:
|
|
|
|
|
strncpy(fd->cinfo->col_data[col], vines_addr_to_str(&addr->data[0]),
|
|
|
|
|
COL_MAX_LEN);
|
|
|
|
|
break;
|
|
|
|
|
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
fd->cinfo->col_data[col][COL_MAX_LEN - 1] = '\0';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
col_set_port(frame_data *fd, int col, port_type ptype, guint32 port,
|
|
|
|
|
gboolean is_res)
|
|
|
|
|
{
|
|
|
|
|
switch (ptype) {
|
|
|
|
|
|
|
|
|
|
case PT_TCP:
|
|
|
|
|
if (is_res)
|
|
|
|
|
strncpy(fd->cinfo->col_data[col], get_tcp_port(port), COL_MAX_LEN);
|
|
|
|
|
else
|
|
|
|
|
snprintf(fd->cinfo->col_data[col], COL_MAX_LEN, "%u", port);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case PT_UDP:
|
|
|
|
|
if (is_res)
|
|
|
|
|
strncpy(fd->cinfo->col_data[col], get_udp_port(port), COL_MAX_LEN);
|
|
|
|
|
else
|
|
|
|
|
snprintf(fd->cinfo->col_data[col], COL_MAX_LEN, "%u", port);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
break;
|
1999-08-14 04:23:22 +00:00
|
|
|
}
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
fd->cinfo->col_data[col][COL_MAX_LEN - 1] = '\0';
|
1999-08-14 04:23:22 +00:00
|
|
|
}
|
|
|
|
|
|
1999-09-12 06:11:51 +00:00
|
|
|
static void
|
|
|
|
|
fill_in_columns(frame_data *fd)
|
|
|
|
|
{
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < fd->cinfo->num_cols; i++) {
|
|
|
|
|
switch (fd->cinfo->col_fmt[i]) {
|
|
|
|
|
|
|
|
|
|
case COL_NUMBER:
|
|
|
|
|
snprintf(fd->cinfo->col_data[i], COL_MAX_LEN, "%u", fd->num);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_CLS_TIME:
|
|
|
|
|
col_set_cls_time(fd, i);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_ABS_TIME:
|
|
|
|
|
col_set_abs_time(fd, i);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_REL_TIME:
|
|
|
|
|
col_set_rel_time(fd, i);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_DELTA_TIME:
|
|
|
|
|
col_set_delta_time(fd, i);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_DEF_SRC:
|
|
|
|
|
case COL_RES_SRC: /* COL_DEF_SRC is currently just like COL_RES_SRC */
|
|
|
|
|
col_set_addr(fd, i, &pi.src, TRUE);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_UNRES_SRC:
|
|
|
|
|
col_set_addr(fd, i, &pi.src, FALSE);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_DEF_DL_SRC:
|
|
|
|
|
case COL_RES_DL_SRC:
|
|
|
|
|
col_set_addr(fd, i, &pi.dl_src, TRUE);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_UNRES_DL_SRC:
|
|
|
|
|
col_set_addr(fd, i, &pi.dl_src, FALSE);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_DEF_NET_SRC:
|
|
|
|
|
case COL_RES_NET_SRC:
|
|
|
|
|
col_set_addr(fd, i, &pi.net_src, TRUE);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_UNRES_NET_SRC:
|
|
|
|
|
col_set_addr(fd, i, &pi.net_src, FALSE);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_DEF_DST:
|
|
|
|
|
case COL_RES_DST: /* COL_DEF_DST is currently just like COL_RES_DST */
|
|
|
|
|
col_set_addr(fd, i, &pi.dst, TRUE);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_UNRES_DST:
|
|
|
|
|
col_set_addr(fd, i, &pi.dst, FALSE);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_DEF_DL_DST:
|
|
|
|
|
case COL_RES_DL_DST:
|
|
|
|
|
col_set_addr(fd, i, &pi.dl_dst, TRUE);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_UNRES_DL_DST:
|
|
|
|
|
col_set_addr(fd, i, &pi.dl_dst, FALSE);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_DEF_NET_DST:
|
|
|
|
|
case COL_RES_NET_DST:
|
|
|
|
|
col_set_addr(fd, i, &pi.net_dst, TRUE);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_UNRES_NET_DST:
|
|
|
|
|
col_set_addr(fd, i, &pi.net_dst, FALSE);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_DEF_SRC_PORT:
|
|
|
|
|
case COL_RES_SRC_PORT: /* COL_DEF_SRC_PORT is currently just like COL_RES_SRC_PORT */
|
|
|
|
|
col_set_port(fd, i, pi.ptype, pi.srcport, TRUE);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_UNRES_SRC_PORT:
|
|
|
|
|
col_set_port(fd, i, pi.ptype, pi.srcport, FALSE);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_DEF_DST_PORT:
|
|
|
|
|
case COL_RES_DST_PORT: /* COL_DEF_DST_PORT is currently just like COL_RES_DST_PORT */
|
|
|
|
|
col_set_port(fd, i, pi.ptype, pi.destport, TRUE);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_UNRES_DST_PORT:
|
|
|
|
|
col_set_port(fd, i, pi.ptype, pi.destport, FALSE);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_PROTOCOL: /* currently done by dissectors */
|
|
|
|
|
case COL_INFO: /* currently done by dissectors */
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COL_PACKET_LENGTH:
|
|
|
|
|
snprintf(fd->cinfo->col_data[i], COL_MAX_LEN, "%d", fd->pkt_len);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case NUM_COL_FMTS: /* keep compiler happy - shouldn't get here */
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-09-12 06:11:51 +00:00
|
|
|
}
|
|
|
|
|
|
1999-08-14 04:23:22 +00:00
|
|
|
static void
|
|
|
|
|
add_packet_to_packet_list(frame_data *fdata, capture_file *cf, const u_char *buf)
|
|
|
|
|
{
|
|
|
|
|
gint i, row;
|
1999-08-24 16:27:23 +00:00
|
|
|
gint crow;
|
|
|
|
|
gint color;
|
1999-08-14 04:23:22 +00:00
|
|
|
proto_tree *protocol_tree;
|
|
|
|
|
|
1999-09-12 06:11:51 +00:00
|
|
|
fdata->num = cf->count;
|
|
|
|
|
|
1999-08-14 04:23:22 +00:00
|
|
|
/* If we don't have the time stamp of the first packet in the
|
|
|
|
|
capture, it's because this is the first packet. Save the time
|
|
|
|
|
stamp of this packet as the time stamp of the first packet. */
|
1998-12-29 04:05:38 +00:00
|
|
|
if (!firstsec && !firstusec) {
|
|
|
|
|
firstsec = fdata->abs_secs;
|
|
|
|
|
firstusec = fdata->abs_usecs;
|
1998-09-16 02:39:15 +00:00
|
|
|
}
|
1998-09-27 22:12:47 +00:00
|
|
|
|
|
|
|
|
/* Get the time elapsed between the first packet and this packet. */
|
1998-12-29 04:05:38 +00:00
|
|
|
cf->esec = fdata->abs_secs - firstsec;
|
|
|
|
|
if (firstusec <= fdata->abs_usecs) {
|
|
|
|
|
cf->eusec = fdata->abs_usecs - firstusec;
|
1998-09-16 02:39:15 +00:00
|
|
|
} else {
|
1998-12-29 04:05:38 +00:00
|
|
|
cf->eusec = (fdata->abs_usecs + 1000000) - firstusec;
|
1998-09-16 02:39:15 +00:00
|
|
|
cf->esec--;
|
|
|
|
|
}
|
1998-12-29 04:05:38 +00:00
|
|
|
|
1998-11-17 04:29:13 +00:00
|
|
|
fdata->cinfo = &cf->cinfo;
|
|
|
|
|
for (i = 0; i < fdata->cinfo->num_cols; i++) {
|
|
|
|
|
fdata->cinfo->col_data[i][0] = '\0';
|
|
|
|
|
}
|
1999-08-14 04:23:22 +00:00
|
|
|
|
1999-08-24 16:27:23 +00:00
|
|
|
/* Apply the filters */
|
Provide a general mechanism by which dissectors can register "init"
routines, which are called before a dissection pass is made over all the
packets in a capture - the "init" routine would clear out any state
information that needs to be initialized before such a dissection pass.
Make the NCP, SMB, AFS, and ONC RPC dissectors register their "init"
routines with that mechanism, have the code that reads in a capture file
call the routine that calls all registered "init" routines rather than
calling a wired-in set of "init" routines, and also have the code that
runs a filtering or colorizing pass over all the packets call that
routine, as a filtering or colorizing pass is a dissection pass.
Have the ONC RPC "init" routine zero out the table of RPC calls, so that
it completely erases any state from the previous dissection pass (so
that, for example, if you run a filtering pass, it doesn't mark any
non-duplicate packets as duplicates because it remembers them from the
previous pass).
svn path=/trunk/; revision=1050
1999-11-17 21:58:33 +00:00
|
|
|
if (cf->dfcode != NULL || CFILTERS_CONTAINS_FILTER(cf)) {
|
1999-07-11 08:40:52 +00:00
|
|
|
protocol_tree = proto_tree_create_root();
|
|
|
|
|
dissect_packet(buf, fdata, protocol_tree);
|
1999-10-12 05:01:07 +00:00
|
|
|
if (cf->dfcode != NULL)
|
1999-10-12 04:21:13 +00:00
|
|
|
fdata->passed_dfilter = dfilter_apply(cf->dfcode, protocol_tree, cf->pd);
|
1999-08-24 16:27:23 +00:00
|
|
|
else
|
|
|
|
|
fdata->passed_dfilter = TRUE;
|
1999-08-28 23:47:50 +00:00
|
|
|
/* Apply color filters. */
|
1999-08-24 16:27:23 +00:00
|
|
|
color = -1;
|
|
|
|
|
for(crow = 0; cf->colors->num_of_filters &&
|
|
|
|
|
crow < cf->colors->num_of_filters; crow++) {
|
1999-09-29 14:41:34 +00:00
|
|
|
|
|
|
|
|
if(color_filter(cf,crow)->c_colorfilter == NULL) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
1999-08-24 16:27:23 +00:00
|
|
|
if(dfilter_apply(color_filter(cf,crow)->c_colorfilter, protocol_tree,
|
1999-10-12 04:21:13 +00:00
|
|
|
cf->pd)){
|
1999-08-24 16:27:23 +00:00
|
|
|
color = crow;
|
1999-08-28 23:47:50 +00:00
|
|
|
break;
|
1999-08-24 16:27:23 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-08-04 23:43:42 +00:00
|
|
|
proto_tree_free(protocol_tree);
|
1999-07-11 08:40:52 +00:00
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
dissect_packet(buf, fdata, NULL);
|
|
|
|
|
fdata->passed_dfilter = TRUE;
|
1999-08-24 16:27:23 +00:00
|
|
|
color = -1;
|
1999-07-11 08:40:52 +00:00
|
|
|
}
|
1999-07-07 22:52:57 +00:00
|
|
|
if (fdata->passed_dfilter) {
|
1999-08-14 04:23:22 +00:00
|
|
|
/* If we don't have the time stamp of the previous displayed packet,
|
|
|
|
|
it's because this is the first displayed packet. Save the time
|
|
|
|
|
stamp of this packet as the time stamp of the previous displayed
|
|
|
|
|
packet. */
|
|
|
|
|
if (!prevsec && !prevusec) {
|
|
|
|
|
prevsec = fdata->abs_secs;
|
|
|
|
|
prevusec = fdata->abs_usecs;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Get the time elapsed between the first packet and this packet. */
|
|
|
|
|
fdata->rel_secs = cf->esec;
|
|
|
|
|
fdata->rel_usecs = cf->eusec;
|
|
|
|
|
|
|
|
|
|
/* Get the time elapsed between the previous displayed packet and
|
|
|
|
|
this packet. */
|
|
|
|
|
fdata->del_secs = fdata->abs_secs - prevsec;
|
|
|
|
|
if (prevusec <= fdata->abs_usecs) {
|
|
|
|
|
fdata->del_usecs = fdata->abs_usecs - prevusec;
|
|
|
|
|
} else {
|
|
|
|
|
fdata->del_usecs = (fdata->abs_usecs + 1000000) - prevusec;
|
|
|
|
|
fdata->del_secs--;
|
|
|
|
|
}
|
|
|
|
|
prevsec = fdata->abs_secs;
|
|
|
|
|
prevusec = fdata->abs_usecs;
|
|
|
|
|
|
1999-09-12 06:11:51 +00:00
|
|
|
fill_in_columns(fdata);
|
1999-08-14 04:23:22 +00:00
|
|
|
|
|
|
|
|
row = gtk_clist_append(GTK_CLIST(packet_list), fdata->cinfo->col_data);
|
|
|
|
|
fdata->row = row;
|
|
|
|
|
|
1999-09-12 06:11:51 +00:00
|
|
|
if (cf->colors->color_filters && (color != -1)){
|
|
|
|
|
gtk_clist_set_background(GTK_CLIST(packet_list), row,
|
1999-08-24 16:27:23 +00:00
|
|
|
&(color_filter(cf,color)->bg_color));
|
1999-09-12 06:11:51 +00:00
|
|
|
gtk_clist_set_foreground(GTK_CLIST(packet_list), row,
|
1999-08-24 16:27:23 +00:00
|
|
|
&(color_filter(cf,color)->fg_color));
|
1999-09-12 06:11:51 +00:00
|
|
|
} else {
|
|
|
|
|
gtk_clist_set_background(GTK_CLIST(packet_list), row, &WHITE);
|
|
|
|
|
gtk_clist_set_foreground(GTK_CLIST(packet_list), row, &BLACK);
|
|
|
|
|
}
|
1999-08-24 16:27:23 +00:00
|
|
|
|
1999-11-06 06:28:07 +00:00
|
|
|
/* If we haven't yet seen the first frame, this is it. */
|
|
|
|
|
if (cf->first_displayed == NULL)
|
|
|
|
|
cf->first_displayed = fdata;
|
|
|
|
|
|
|
|
|
|
/* This is the last frame we've seen so far. */
|
|
|
|
|
cf->last_displayed = fdata;
|
|
|
|
|
|
|
|
|
|
/* If this was the current frame, remember the row it's in, so
|
|
|
|
|
we can arrange that it's on the screen when we're done. */
|
|
|
|
|
if (cf->current_frame == fdata)
|
|
|
|
|
cf->current_row = row;
|
1999-08-10 04:13:37 +00:00
|
|
|
} else
|
1999-08-14 04:23:22 +00:00
|
|
|
fdata->row = -1; /* not in the display */
|
1998-11-17 04:29:13 +00:00
|
|
|
fdata->cinfo = NULL;
|
1999-06-19 01:14:51 +00:00
|
|
|
}
|
1998-09-27 22:12:47 +00:00
|
|
|
|
1999-06-19 01:14:51 +00:00
|
|
|
static void
|
|
|
|
|
wtap_dispatch_cb(u_char *user, const struct wtap_pkthdr *phdr, int offset,
|
|
|
|
|
const u_char *buf) {
|
|
|
|
|
frame_data *fdata;
|
|
|
|
|
capture_file *cf = (capture_file *) user;
|
1999-08-10 04:13:37 +00:00
|
|
|
int passed;
|
1999-08-08 01:29:24 +00:00
|
|
|
proto_tree *protocol_tree;
|
1999-08-10 04:13:37 +00:00
|
|
|
frame_data *plist_end;
|
1999-09-23 04:39:01 +00:00
|
|
|
int file_pos;
|
|
|
|
|
float prog_val;
|
1999-06-19 01:14:51 +00:00
|
|
|
|
1999-08-28 01:51:58 +00:00
|
|
|
/* Update the progress bar, but do it only N_PROGBAR_UPDATES times;
|
|
|
|
|
when we update it, we have to run the GTK+ main loop to get it
|
|
|
|
|
to repaint what's pending, and doing so may involve an "ioctl()"
|
|
|
|
|
to see if there's any pending input from an X server, and doing
|
|
|
|
|
that for every packet can be costly, especially on a big file.
|
|
|
|
|
|
|
|
|
|
Do so only if we were told to do so; when reading a capture file
|
|
|
|
|
being updated by a live capture, we don't do so (as we're not
|
|
|
|
|
"done" until the capture stops, so we don't know how close to
|
|
|
|
|
"done" we are. */
|
1999-09-23 04:39:01 +00:00
|
|
|
|
|
|
|
|
if (cf->update_progbar && offset >= cf->progbar_nextstep) {
|
|
|
|
|
file_pos = lseek(cf->filed, 0, SEEK_CUR);
|
|
|
|
|
prog_val = (gfloat) file_pos / (gfloat) cf->f_len;
|
|
|
|
|
gtk_progress_bar_update(GTK_PROGRESS_BAR(prog_bar), prog_val);
|
|
|
|
|
cf->progbar_nextstep += cf->progbar_quantum;
|
1999-09-22 01:26:50 +00:00
|
|
|
while (gtk_events_pending())
|
1999-09-23 04:39:01 +00:00
|
|
|
gtk_main_iteration();
|
1999-08-28 01:51:58 +00:00
|
|
|
}
|
1999-09-23 04:39:01 +00:00
|
|
|
|
1999-06-19 01:14:51 +00:00
|
|
|
/* Allocate the next list entry, and add it to the list. */
|
|
|
|
|
fdata = (frame_data *) g_malloc(sizeof(frame_data));
|
|
|
|
|
|
1999-08-10 06:54:12 +00:00
|
|
|
fdata->next = NULL;
|
1999-11-06 06:28:07 +00:00
|
|
|
fdata->prev = NULL;
|
1999-06-19 01:14:51 +00:00
|
|
|
fdata->pkt_len = phdr->len;
|
|
|
|
|
fdata->cap_len = phdr->caplen;
|
|
|
|
|
fdata->file_off = offset;
|
|
|
|
|
fdata->lnk_t = phdr->pkt_encap;
|
|
|
|
|
fdata->abs_secs = phdr->ts.tv_sec;
|
|
|
|
|
fdata->abs_usecs = phdr->ts.tv_usec;
|
1999-11-22 06:24:56 +00:00
|
|
|
fdata->encoding = CHAR_ASCII;
|
1999-08-20 06:55:20 +00:00
|
|
|
fdata->pseudo_header = phdr->pseudo_header;
|
1999-07-07 22:52:57 +00:00
|
|
|
fdata->cinfo = NULL;
|
1999-06-19 01:14:51 +00:00
|
|
|
|
1999-08-08 01:29:24 +00:00
|
|
|
passed = TRUE;
|
1999-08-15 19:18:46 +00:00
|
|
|
if (cf->rfcode) {
|
1999-10-12 05:01:07 +00:00
|
|
|
protocol_tree = proto_tree_create_root();
|
|
|
|
|
dissect_packet(buf, fdata, protocol_tree);
|
|
|
|
|
passed = dfilter_apply(cf->rfcode, protocol_tree, cf->pd);
|
|
|
|
|
proto_tree_free(protocol_tree);
|
1999-08-14 18:51:26 +00:00
|
|
|
}
|
1999-08-08 01:29:24 +00:00
|
|
|
if (passed) {
|
1999-08-10 04:13:37 +00:00
|
|
|
plist_end = cf->plist_end;
|
1999-11-06 06:28:07 +00:00
|
|
|
fdata->prev = plist_end;
|
1999-08-10 04:13:37 +00:00
|
|
|
if (plist_end != NULL)
|
|
|
|
|
plist_end->next = fdata;
|
|
|
|
|
else
|
|
|
|
|
cf->plist = fdata;
|
|
|
|
|
cf->plist_end = fdata;
|
1999-08-08 01:29:24 +00:00
|
|
|
|
|
|
|
|
cf->count++;
|
|
|
|
|
add_packet_to_packet_list(fdata, cf, buf);
|
1999-08-10 04:13:37 +00:00
|
|
|
} else
|
|
|
|
|
g_free(fdata);
|
1999-07-11 08:40:52 +00:00
|
|
|
}
|
|
|
|
|
|
1999-11-25 18:02:25 +00:00
|
|
|
int
|
1999-10-11 06:39:26 +00:00
|
|
|
filter_packets(capture_file *cf, gchar *dftext)
|
1999-07-11 08:40:52 +00:00
|
|
|
{
|
1999-10-11 06:39:26 +00:00
|
|
|
dfilter *dfcode;
|
1999-08-05 16:46:04 +00:00
|
|
|
|
1999-10-11 06:39:26 +00:00
|
|
|
if (dftext == NULL) {
|
|
|
|
|
/* The new filter is an empty filter (i.e., display all packets). */
|
|
|
|
|
dfcode = NULL;
|
|
|
|
|
} else {
|
1999-07-11 08:40:52 +00:00
|
|
|
/*
|
1999-10-11 06:39:26 +00:00
|
|
|
* We have a filter; try to compile it.
|
1999-07-11 08:40:52 +00:00
|
|
|
*/
|
1999-10-12 05:01:07 +00:00
|
|
|
if (dfilter_compile(dftext, &dfcode) != 0) {
|
|
|
|
|
/* The attempt failed; report an error. */
|
1999-08-20 20:37:47 +00:00
|
|
|
simple_dialog(ESD_TYPE_WARN, NULL, dfilter_error_msg);
|
1999-11-25 18:02:25 +00:00
|
|
|
return 0;
|
1999-07-11 08:40:52 +00:00
|
|
|
}
|
1999-10-11 06:39:26 +00:00
|
|
|
|
|
|
|
|
/* Was it empty? */
|
1999-10-12 05:01:07 +00:00
|
|
|
if (dfcode == NULL) {
|
|
|
|
|
/* Yes - free the filter text, and set it to null. */
|
1999-10-11 06:39:26 +00:00
|
|
|
g_free(dftext);
|
|
|
|
|
dftext = NULL;
|
|
|
|
|
}
|
1999-07-07 22:52:57 +00:00
|
|
|
}
|
1999-06-22 03:39:07 +00:00
|
|
|
|
1999-10-11 06:39:26 +00:00
|
|
|
/* We have a valid filter. Replace the current filter. */
|
|
|
|
|
if (cf->dfilter != NULL)
|
|
|
|
|
g_free(cf->dfilter);
|
|
|
|
|
cf->dfilter = dftext;
|
|
|
|
|
if (cf->dfcode != NULL)
|
|
|
|
|
dfilter_destroy(cf->dfcode);
|
|
|
|
|
cf->dfcode = dfcode;
|
|
|
|
|
|
|
|
|
|
/* Now go through the list of packets we've read from the capture file,
|
|
|
|
|
applying the current display filter, and, if the packet passes the
|
|
|
|
|
display filter, add it to the summary display, appropriately
|
|
|
|
|
colored. (That's how we colorize the display - it's like filtering
|
|
|
|
|
the display, only we don't install a new filter.) */
|
|
|
|
|
colorize_packets(cf);
|
1999-11-25 18:02:25 +00:00
|
|
|
return 1;
|
1999-10-11 06:39:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
colorize_packets(capture_file *cf)
|
|
|
|
|
{
|
|
|
|
|
frame_data *fd;
|
|
|
|
|
guint32 progbar_quantum;
|
|
|
|
|
guint32 progbar_nextstep;
|
|
|
|
|
|
Provide a general mechanism by which dissectors can register "init"
routines, which are called before a dissection pass is made over all the
packets in a capture - the "init" routine would clear out any state
information that needs to be initialized before such a dissection pass.
Make the NCP, SMB, AFS, and ONC RPC dissectors register their "init"
routines with that mechanism, have the code that reads in a capture file
call the routine that calls all registered "init" routines rather than
calling a wired-in set of "init" routines, and also have the code that
runs a filtering or colorizing pass over all the packets call that
routine, as a filtering or colorizing pass is a dissection pass.
Have the ONC RPC "init" routine zero out the table of RPC calls, so that
it completely erases any state from the previous dissection pass (so
that, for example, if you run a filtering pass, it doesn't mark any
non-duplicate packets as duplicates because it remembers them from the
previous pass).
svn path=/trunk/; revision=1050
1999-11-17 21:58:33 +00:00
|
|
|
/* We need to re-initialize all the state information that protocols
|
|
|
|
|
keep, because we're making a fresh pass through all the packets. */
|
|
|
|
|
|
|
|
|
|
/* Initialize the table of conversations. */
|
|
|
|
|
conversation_init();
|
|
|
|
|
|
|
|
|
|
/* Initialize protocol-specific variables */
|
|
|
|
|
init_all_protocols();
|
|
|
|
|
|
1999-09-22 01:26:50 +00:00
|
|
|
gtk_progress_set_activity_mode(GTK_PROGRESS(prog_bar), FALSE);
|
|
|
|
|
|
1999-07-11 08:40:52 +00:00
|
|
|
/* Freeze the packet list while we redo it, so we don't get any
|
|
|
|
|
screen updates while it happens. */
|
|
|
|
|
gtk_clist_freeze(GTK_CLIST(packet_list));
|
|
|
|
|
|
|
|
|
|
/* Clear it out. */
|
|
|
|
|
gtk_clist_clear(GTK_CLIST(packet_list));
|
|
|
|
|
|
1999-11-06 06:28:07 +00:00
|
|
|
/* We don't yet know which will be the first and last frames displayed. */
|
|
|
|
|
cf->first_displayed = NULL;
|
|
|
|
|
cf->last_displayed = NULL;
|
|
|
|
|
|
Have "close_cap_file()" disable all menu items that make sense only if
you have a capture.
Leave the job of enabling and disabling menu items that make sense only
if you have a capture (except for "File/Save" and "File/Save As...", for
now) up to "load_cap_file()", "close_cap_file()", and the like - don't
scatter that stuff throughout the code.
Disable "File/Print Packet" if no packet is selected; enable it only if
a packet is selected.
If there's a selected packet, and a display filter is run:
if the selected packet passed the filter, re-select it;
if the selected packet didn't pass the filter, un-select it.
If we've opened a live "pcap" capture, but can't do the capture because
we can't get the netmask info, or can't parse the capture filter string,
or can't install the filter, close the live capture and the dump and
delete the dump file.
If we failed to open a live "pcap" capture, don't try to read the
capture file - it doesn't exist.
svn path=/trunk/; revision=384
1999-07-24 02:42:52 +00:00
|
|
|
/* If a packet was selected, we don't know yet what row, if any, it'll
|
|
|
|
|
get. */
|
1999-11-06 06:28:07 +00:00
|
|
|
cf->current_row = -1;
|
Have "close_cap_file()" disable all menu items that make sense only if
you have a capture.
Leave the job of enabling and disabling menu items that make sense only
if you have a capture (except for "File/Save" and "File/Save As...", for
now) up to "load_cap_file()", "close_cap_file()", and the like - don't
scatter that stuff throughout the code.
Disable "File/Print Packet" if no packet is selected; enable it only if
a packet is selected.
If there's a selected packet, and a display filter is run:
if the selected packet passed the filter, re-select it;
if the selected packet didn't pass the filter, un-select it.
If we've opened a live "pcap" capture, but can't do the capture because
we can't get the netmask info, or can't parse the capture filter string,
or can't install the filter, close the live capture and the dump and
delete the dump file.
If we failed to open a live "pcap" capture, don't try to read the
capture file - it doesn't exist.
svn path=/trunk/; revision=384
1999-07-24 02:42:52 +00:00
|
|
|
|
1999-08-14 03:36:30 +00:00
|
|
|
/* Iterate through the list of packets, calling a routine
|
|
|
|
|
to run the filter on the packet, see if it matches, and
|
|
|
|
|
put it in the display list if so. */
|
1999-07-11 08:40:52 +00:00
|
|
|
firstsec = 0;
|
|
|
|
|
firstusec = 0;
|
1999-08-14 04:23:22 +00:00
|
|
|
prevsec = 0;
|
|
|
|
|
prevusec = 0;
|
1999-08-05 16:46:04 +00:00
|
|
|
cf->unfiltered_count = cf->count;
|
1999-07-11 08:40:52 +00:00
|
|
|
cf->count = 0;
|
1999-08-05 16:46:04 +00:00
|
|
|
|
1999-08-26 07:01:44 +00:00
|
|
|
proto_tree_is_visible = FALSE;
|
|
|
|
|
|
1999-08-28 01:51:58 +00:00
|
|
|
/* Update the progress bar when it gets to this value. */
|
|
|
|
|
progbar_nextstep = 0;
|
|
|
|
|
/* When we reach the value that triggers a progress bar update,
|
|
|
|
|
bump that value by this amount. */
|
|
|
|
|
progbar_quantum = cf->unfiltered_count/N_PROGBAR_UPDATES;
|
1999-09-22 01:26:50 +00:00
|
|
|
gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(prog_bar), GTK_PROGRESS_LEFT_TO_RIGHT);
|
1999-08-28 01:51:58 +00:00
|
|
|
|
1999-08-10 04:13:37 +00:00
|
|
|
for (fd = cf->plist; fd != NULL; fd = fd->next) {
|
1999-08-28 01:51:58 +00:00
|
|
|
/* Update the progress bar, but do it only N_PROGBAR_UPDATES times;
|
|
|
|
|
when we update it, we have to run the GTK+ main loop to get it
|
|
|
|
|
to repaint what's pending, and doing so may involve an "ioctl()"
|
|
|
|
|
to see if there's any pending input from an X server, and doing
|
|
|
|
|
that for every packet can be costly, especially on a big file. */
|
|
|
|
|
if (cf->count >= progbar_nextstep) {
|
|
|
|
|
/* let's not divide by zero. I should never be started
|
|
|
|
|
* with unfiltered_count == 0, so let's assert that
|
|
|
|
|
*/
|
|
|
|
|
g_assert(cf->unfiltered_count > 0);
|
|
|
|
|
|
1999-09-24 05:22:28 +00:00
|
|
|
gtk_progress_bar_update(GTK_PROGRESS_BAR(prog_bar),
|
|
|
|
|
(gfloat) cf->count / cf->unfiltered_count);
|
1999-09-22 01:26:50 +00:00
|
|
|
|
1999-08-28 01:51:58 +00:00
|
|
|
progbar_nextstep += progbar_quantum;
|
|
|
|
|
while (gtk_events_pending())
|
|
|
|
|
gtk_main_iteration();
|
|
|
|
|
}
|
|
|
|
|
|
1999-08-10 04:13:37 +00:00
|
|
|
cf->count++;
|
|
|
|
|
|
1999-10-31 17:46:11 +00:00
|
|
|
wtap_seek_read (cf->cd_t, cf->fh, fd->file_off, cf->pd, fd->cap_len);
|
1999-08-10 04:13:37 +00:00
|
|
|
|
|
|
|
|
add_packet_to_packet_list(fd, cf, cf->pd);
|
|
|
|
|
}
|
1999-08-05 16:46:04 +00:00
|
|
|
|
1999-09-24 05:22:28 +00:00
|
|
|
gtk_progress_bar_update(GTK_PROGRESS_BAR(prog_bar), 0);
|
1999-07-11 08:40:52 +00:00
|
|
|
|
1999-11-06 06:28:07 +00:00
|
|
|
if (cf->current_row != -1) {
|
|
|
|
|
/* The current frame passed the filter; make sure it's visible. */
|
|
|
|
|
if (!gtk_clist_row_is_visible(GTK_CLIST(packet_list), cf->current_row))
|
|
|
|
|
gtk_clist_moveto(GTK_CLIST(packet_list), cf->current_row, -1, 0.0, 0.0);
|
|
|
|
|
if (cf->current_frame_is_selected) {
|
|
|
|
|
/* It was selected, so re-select it. */
|
|
|
|
|
gtk_clist_select_row(GTK_CLIST(packet_list), cf->current_row, -1);
|
|
|
|
|
}
|
1999-11-19 22:32:00 +00:00
|
|
|
finfo_selected = NULL;
|
Have "close_cap_file()" disable all menu items that make sense only if
you have a capture.
Leave the job of enabling and disabling menu items that make sense only
if you have a capture (except for "File/Save" and "File/Save As...", for
now) up to "load_cap_file()", "close_cap_file()", and the like - don't
scatter that stuff throughout the code.
Disable "File/Print Packet" if no packet is selected; enable it only if
a packet is selected.
If there's a selected packet, and a display filter is run:
if the selected packet passed the filter, re-select it;
if the selected packet didn't pass the filter, un-select it.
If we've opened a live "pcap" capture, but can't do the capture because
we can't get the netmask info, or can't parse the capture filter string,
or can't install the filter, close the live capture and the dump and
delete the dump file.
If we failed to open a live "pcap" capture, don't try to read the
capture file - it doesn't exist.
svn path=/trunk/; revision=384
1999-07-24 02:42:52 +00:00
|
|
|
} else {
|
1999-11-06 06:28:07 +00:00
|
|
|
/* The current frame didn't pass the filter; make the first frame
|
|
|
|
|
the current frame, and leave it unselected. */
|
Have "close_cap_file()" disable all menu items that make sense only if
you have a capture.
Leave the job of enabling and disabling menu items that make sense only
if you have a capture (except for "File/Save" and "File/Save As...", for
now) up to "load_cap_file()", "close_cap_file()", and the like - don't
scatter that stuff throughout the code.
Disable "File/Print Packet" if no packet is selected; enable it only if
a packet is selected.
If there's a selected packet, and a display filter is run:
if the selected packet passed the filter, re-select it;
if the selected packet didn't pass the filter, un-select it.
If we've opened a live "pcap" capture, but can't do the capture because
we can't get the netmask info, or can't parse the capture filter string,
or can't install the filter, close the live capture and the dump and
delete the dump file.
If we failed to open a live "pcap" capture, don't try to read the
capture file - it doesn't exist.
svn path=/trunk/; revision=384
1999-07-24 02:42:52 +00:00
|
|
|
unselect_packet(cf);
|
1999-11-06 06:28:07 +00:00
|
|
|
cf->current_frame = cf->first_displayed;
|
Have "close_cap_file()" disable all menu items that make sense only if
you have a capture.
Leave the job of enabling and disabling menu items that make sense only
if you have a capture (except for "File/Save" and "File/Save As...", for
now) up to "load_cap_file()", "close_cap_file()", and the like - don't
scatter that stuff throughout the code.
Disable "File/Print Packet" if no packet is selected; enable it only if
a packet is selected.
If there's a selected packet, and a display filter is run:
if the selected packet passed the filter, re-select it;
if the selected packet didn't pass the filter, un-select it.
If we've opened a live "pcap" capture, but can't do the capture because
we can't get the netmask info, or can't parse the capture filter string,
or can't install the filter, close the live capture and the dump and
delete the dump file.
If we failed to open a live "pcap" capture, don't try to read the
capture file - it doesn't exist.
svn path=/trunk/; revision=384
1999-07-24 02:42:52 +00:00
|
|
|
}
|
|
|
|
|
|
1999-07-11 08:40:52 +00:00
|
|
|
/* Unfreeze the packet list. */
|
|
|
|
|
gtk_clist_thaw(GTK_CLIST(packet_list));
|
1999-06-22 03:39:07 +00:00
|
|
|
}
|
|
|
|
|
|
1999-07-23 08:29:24 +00:00
|
|
|
int
|
1999-09-12 06:11:51 +00:00
|
|
|
print_packets(capture_file *cf, print_args_t *print_args)
|
1999-07-23 08:29:24 +00:00
|
|
|
{
|
1999-09-12 06:11:51 +00:00
|
|
|
int i;
|
1999-08-10 04:13:37 +00:00
|
|
|
frame_data *fd;
|
1999-09-13 23:45:22 +00:00
|
|
|
guint32 progbar_quantum;
|
|
|
|
|
guint32 progbar_nextstep;
|
|
|
|
|
guint32 count;
|
1999-08-10 04:13:37 +00:00
|
|
|
proto_tree *protocol_tree;
|
1999-09-12 06:11:51 +00:00
|
|
|
gint *col_widths = NULL;
|
|
|
|
|
gint data_width;
|
|
|
|
|
gboolean print_separator;
|
1999-08-10 04:13:37 +00:00
|
|
|
|
1999-09-12 06:11:51 +00:00
|
|
|
cf->print_fh = open_print_dest(print_args->to_file, print_args->dest);
|
1999-07-23 08:29:24 +00:00
|
|
|
if (cf->print_fh == NULL)
|
|
|
|
|
return FALSE; /* attempt to open destination failed */
|
|
|
|
|
|
1999-07-23 21:09:25 +00:00
|
|
|
/* XXX - printing multiple frames in PostScript looks as if it's
|
|
|
|
|
tricky - you have to deal with page boundaries, I think -
|
|
|
|
|
and I'll have to spend some time learning enough about
|
|
|
|
|
PostScript to figure it out, so, for now, we only print
|
|
|
|
|
multiple frames as text. */
|
|
|
|
|
#if 0
|
|
|
|
|
print_preamble(cf->print_fh);
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-09-12 06:11:51 +00:00
|
|
|
if (print_args->print_summary) {
|
|
|
|
|
/* We're printing packet summaries.
|
|
|
|
|
|
|
|
|
|
Find the widths for each of the columns - maximum of the
|
|
|
|
|
width of the title and the width of the data - and print
|
|
|
|
|
the column titles. */
|
|
|
|
|
col_widths = (gint *) g_malloc(sizeof(gint) * cf->cinfo.num_cols);
|
|
|
|
|
for (i = 0; i < cf->cinfo.num_cols; i++) {
|
|
|
|
|
/* Don't pad the last column. */
|
|
|
|
|
if (i == cf->cinfo.num_cols - 1)
|
|
|
|
|
col_widths[i] = 0;
|
|
|
|
|
else {
|
|
|
|
|
col_widths[i] = strlen(cf->cinfo.col_title[i]);
|
|
|
|
|
data_width = get_column_char_width(get_column_format(i));
|
|
|
|
|
if (data_width > col_widths[i])
|
|
|
|
|
col_widths[i] = data_width;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Right-justify the packet number column. */
|
|
|
|
|
if (cf->cinfo.col_fmt[i] == COL_NUMBER)
|
|
|
|
|
fprintf(cf->print_fh, "%*s", col_widths[i], cf->cinfo.col_title[i]);
|
|
|
|
|
else
|
|
|
|
|
fprintf(cf->print_fh, "%-*s", col_widths[i], cf->cinfo.col_title[i]);
|
|
|
|
|
if (i == cf->cinfo.num_cols - 1)
|
|
|
|
|
fputc('\n', cf->print_fh);
|
|
|
|
|
else
|
|
|
|
|
fputc(' ', cf->print_fh);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
print_separator = FALSE;
|
1999-08-26 07:01:44 +00:00
|
|
|
proto_tree_is_visible = TRUE;
|
|
|
|
|
|
1999-09-13 23:45:22 +00:00
|
|
|
/* Update the progress bar when it gets to this value. */
|
|
|
|
|
progbar_nextstep = 0;
|
|
|
|
|
/* When we reach the value that triggers a progress bar update,
|
|
|
|
|
bump that value by this amount. */
|
|
|
|
|
progbar_quantum = cf->unfiltered_count/N_PROGBAR_UPDATES;
|
|
|
|
|
/* Count of packets we've looked at. */
|
|
|
|
|
count = 0;
|
|
|
|
|
|
1999-09-12 06:11:51 +00:00
|
|
|
/* Iterate through the list of packets, printing the packets that
|
|
|
|
|
were selected by the current display filter. */
|
1999-08-10 04:13:37 +00:00
|
|
|
for (fd = cf->plist; fd != NULL; fd = fd->next) {
|
1999-09-13 23:45:22 +00:00
|
|
|
/* Update the progress bar, but do it only N_PROGBAR_UPDATES times;
|
|
|
|
|
when we update it, we have to run the GTK+ main loop to get it
|
|
|
|
|
to repaint what's pending, and doing so may involve an "ioctl()"
|
|
|
|
|
to see if there's any pending input from an X server, and doing
|
|
|
|
|
that for every packet can be costly, especially on a big file. */
|
|
|
|
|
if (count >= progbar_nextstep) {
|
|
|
|
|
/* let's not divide by zero. I should never be started
|
|
|
|
|
* with unfiltered_count == 0, so let's assert that
|
|
|
|
|
*/
|
|
|
|
|
g_assert(cf->unfiltered_count > 0);
|
|
|
|
|
|
|
|
|
|
gtk_progress_bar_update(GTK_PROGRESS_BAR(prog_bar),
|
|
|
|
|
(gfloat) count / cf->unfiltered_count);
|
|
|
|
|
progbar_nextstep += progbar_quantum;
|
|
|
|
|
while (gtk_events_pending())
|
|
|
|
|
gtk_main_iteration();
|
|
|
|
|
}
|
|
|
|
|
count++;
|
|
|
|
|
|
1999-09-12 06:11:51 +00:00
|
|
|
if (fd->passed_dfilter) {
|
|
|
|
|
wtap_seek_read (cf->cd_t, cf->fh, fd->file_off, cf->pd, fd->cap_len);
|
|
|
|
|
if (print_args->print_summary) {
|
|
|
|
|
/* Fill in the column information, but don't bother creating
|
|
|
|
|
the logical protocol tree. */
|
|
|
|
|
fd->cinfo = &cf->cinfo;
|
|
|
|
|
for (i = 0; i < fd->cinfo->num_cols; i++) {
|
|
|
|
|
fd->cinfo->col_data[i][0] = '\0';
|
|
|
|
|
}
|
|
|
|
|
dissect_packet(cf->pd, fd, NULL);
|
|
|
|
|
fill_in_columns(fd);
|
|
|
|
|
for (i = 0; i < cf->cinfo.num_cols; i++) {
|
|
|
|
|
/* Right-justify the packet number column. */
|
|
|
|
|
if (cf->cinfo.col_fmt[i] == COL_NUMBER)
|
|
|
|
|
fprintf(cf->print_fh, "%*s", col_widths[i], cf->cinfo.col_data[i]);
|
|
|
|
|
else
|
|
|
|
|
fprintf(cf->print_fh, "%-*s", col_widths[i], cf->cinfo.col_data[i]);
|
|
|
|
|
if (i == cf->cinfo.num_cols - 1)
|
|
|
|
|
fputc('\n', cf->print_fh);
|
|
|
|
|
else
|
|
|
|
|
fputc(' ', cf->print_fh);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (print_separator)
|
|
|
|
|
fputc('\n', cf->print_fh);
|
1999-08-10 04:13:37 +00:00
|
|
|
|
1999-09-12 06:11:51 +00:00
|
|
|
/* Create the logical protocol tree. */
|
|
|
|
|
protocol_tree = proto_tree_create_root();
|
|
|
|
|
dissect_packet(cf->pd, fd, protocol_tree);
|
1999-08-10 04:13:37 +00:00
|
|
|
|
1999-09-12 06:11:51 +00:00
|
|
|
/* Print the information in that tree. */
|
1999-09-29 22:19:24 +00:00
|
|
|
proto_tree_print(FALSE, print_args, (GNode *)protocol_tree,
|
1999-09-12 20:23:43 +00:00
|
|
|
cf->pd, fd, cf->print_fh);
|
1999-08-10 04:13:37 +00:00
|
|
|
|
1999-09-12 06:11:51 +00:00
|
|
|
proto_tree_free(protocol_tree);
|
1999-08-10 04:13:37 +00:00
|
|
|
|
1999-09-29 22:19:24 +00:00
|
|
|
if (print_args->print_hex) {
|
|
|
|
|
/* Print the full packet data as hex. */
|
1999-11-22 06:24:56 +00:00
|
|
|
print_hex_data(cf->print_fh, cf->pd, fd->cap_len, fd->encoding);
|
1999-09-29 22:19:24 +00:00
|
|
|
}
|
|
|
|
|
|
1999-09-12 06:11:51 +00:00
|
|
|
/* Print a blank line if we print anything after this. */
|
|
|
|
|
print_separator = TRUE;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-08-10 04:13:37 +00:00
|
|
|
}
|
1999-07-23 08:29:24 +00:00
|
|
|
|
1999-09-12 20:23:43 +00:00
|
|
|
if (col_widths != NULL)
|
|
|
|
|
g_free(col_widths);
|
|
|
|
|
|
1999-07-23 21:09:25 +00:00
|
|
|
#if 0
|
|
|
|
|
print_finale(cf->print_fh);
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-09-12 06:11:51 +00:00
|
|
|
close_print_dest(print_args->to_file, cf->print_fh);
|
1999-09-13 23:45:22 +00:00
|
|
|
|
|
|
|
|
gtk_progress_bar_update(GTK_PROGRESS_BAR(prog_bar), 0);
|
|
|
|
|
|
1999-07-23 08:29:24 +00:00
|
|
|
cf->print_fh = NULL;
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
1999-06-22 03:39:07 +00:00
|
|
|
/* Scan through the packet list and change all columns that use the
|
|
|
|
|
"command-line-specified" time stamp format to use the current
|
|
|
|
|
value of that format. */
|
|
|
|
|
void
|
|
|
|
|
change_time_formats(capture_file *cf)
|
|
|
|
|
{
|
1999-08-10 04:13:37 +00:00
|
|
|
frame_data *fd;
|
1999-06-22 03:39:07 +00:00
|
|
|
int i;
|
1999-07-22 21:14:13 +00:00
|
|
|
GtkStyle *pl_style;
|
1999-06-22 03:39:07 +00:00
|
|
|
|
|
|
|
|
/* Freeze the packet list while we redo it, so we don't get any
|
|
|
|
|
screen updates while it happens. */
|
1999-07-28 03:29:02 +00:00
|
|
|
freeze_clist(cf);
|
1999-06-22 03:39:07 +00:00
|
|
|
|
1999-08-14 03:36:30 +00:00
|
|
|
/* Iterate through the list of packets, checking whether the packet
|
|
|
|
|
is in a row of the summary list and, if so, whether there are
|
|
|
|
|
any columns that show the time in the "command-line-specified"
|
|
|
|
|
format and, if so, update that row. */
|
1999-08-10 04:13:37 +00:00
|
|
|
for (fd = cf->plist; fd != NULL; fd = fd->next) {
|
1999-08-14 03:36:30 +00:00
|
|
|
if (fd->row != -1) {
|
|
|
|
|
/* This packet is in the summary list, on row "fd->row". */
|
|
|
|
|
|
|
|
|
|
/* XXX - there really should be a way of checking "cf->cinfo" for this;
|
|
|
|
|
the answer isn't going to change from packet to packet, so we should
|
|
|
|
|
simply skip all the "change_time_formats()" work if we're not
|
|
|
|
|
changing anything. */
|
|
|
|
|
fd->cinfo = &cf->cinfo;
|
|
|
|
|
if (check_col(fd, COL_CLS_TIME)) {
|
|
|
|
|
/* There are columns that show the time in the "command-line-specified"
|
|
|
|
|
format; update them. */
|
|
|
|
|
for (i = 0; i < cf->cinfo.num_cols; i++) {
|
|
|
|
|
if (cf->cinfo.fmt_matx[i][COL_CLS_TIME]) {
|
|
|
|
|
/* This is one of the columns that shows the time in
|
|
|
|
|
"command-line-specified" format; update it. */
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
cf->cinfo.col_data[i][0] = '\0';
|
|
|
|
|
col_set_cls_time(fd, i);
|
1999-08-14 03:36:30 +00:00
|
|
|
gtk_clist_set_text(GTK_CLIST(packet_list), fd->row, i,
|
1999-08-10 04:13:37 +00:00
|
|
|
cf->cinfo.col_data[i]);
|
1999-08-14 03:36:30 +00:00
|
|
|
}
|
1999-08-10 04:13:37 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-06-22 03:39:07 +00:00
|
|
|
|
|
|
|
|
/* Set the column widths of those columns that show the time in
|
|
|
|
|
"command-line-specified" format. */
|
1999-07-22 21:14:13 +00:00
|
|
|
pl_style = gtk_widget_get_style(packet_list);
|
1999-06-22 03:39:07 +00:00
|
|
|
for (i = 0; i < cf->cinfo.num_cols; i++) {
|
|
|
|
|
if (cf->cinfo.fmt_matx[i][COL_CLS_TIME]) {
|
|
|
|
|
gtk_clist_set_column_width(GTK_CLIST(packet_list), i,
|
1999-07-22 21:14:13 +00:00
|
|
|
get_column_width(COL_CLS_TIME, pl_style->font));
|
1999-06-22 03:39:07 +00:00
|
|
|
}
|
|
|
|
|
}
|
1999-06-19 03:14:32 +00:00
|
|
|
|
1999-06-19 01:14:51 +00:00
|
|
|
/* Unfreeze the packet list. */
|
1999-07-28 03:29:02 +00:00
|
|
|
thaw_clist(cf);
|
1998-09-16 02:39:15 +00:00
|
|
|
}
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
|
1999-08-05 00:23:07 +00:00
|
|
|
static void
|
|
|
|
|
clear_tree_and_hex_views(void)
|
|
|
|
|
{
|
1999-08-15 07:28:23 +00:00
|
|
|
GList *selection;
|
|
|
|
|
GtkWidget *tmp_item;
|
|
|
|
|
|
1999-08-05 00:23:07 +00:00
|
|
|
/* Clear the hex dump. */
|
|
|
|
|
gtk_text_freeze(GTK_TEXT(byte_view));
|
|
|
|
|
gtk_text_set_point(GTK_TEXT(byte_view), 0);
|
|
|
|
|
gtk_text_forward_delete(GTK_TEXT(byte_view),
|
|
|
|
|
gtk_text_get_length(GTK_TEXT(byte_view)));
|
1999-08-07 01:25:04 +00:00
|
|
|
gtk_text_thaw(GTK_TEXT(byte_view));
|
1999-08-05 00:23:07 +00:00
|
|
|
|
1999-08-15 07:28:23 +00:00
|
|
|
/* Deselect any selected tree item. gtktree.c should
|
|
|
|
|
* do this when we clear_items, but it doesn't. I copied
|
|
|
|
|
* this while() loop from gtktree.c, gtk_real_tree_select_child()
|
|
|
|
|
*/
|
1999-08-15 23:40:33 +00:00
|
|
|
if (GTK_TREE(tree_view)->root_tree) {
|
|
|
|
|
selection = GTK_TREE(tree_view)->root_tree->selection;
|
|
|
|
|
while (selection) {
|
|
|
|
|
tmp_item = selection->data;
|
|
|
|
|
gtk_tree_item_deselect(GTK_TREE_ITEM(tmp_item));
|
|
|
|
|
gtk_widget_unref(tmp_item);
|
|
|
|
|
selection = selection->next;
|
|
|
|
|
}
|
|
|
|
|
g_list_free(GTK_TREE(tree_view)->root_tree->selection);
|
|
|
|
|
GTK_TREE(tree_view)->root_tree->selection = NULL;
|
1999-08-15 07:28:23 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Clear the protocol tree view. The length arg of -1
|
|
|
|
|
* means to clear all items up to the end. */
|
|
|
|
|
gtk_tree_clear_items(GTK_TREE(tree_view), 0, -1);
|
1999-08-05 00:23:07 +00:00
|
|
|
}
|
|
|
|
|
|
1999-11-06 06:54:24 +00:00
|
|
|
gboolean
|
1999-11-06 06:28:07 +00:00
|
|
|
find_packet(capture_file *cf, dfilter *sfcode)
|
|
|
|
|
{
|
|
|
|
|
frame_data *start_fd;
|
|
|
|
|
frame_data *fd;
|
|
|
|
|
frame_data *new_fd = NULL;
|
|
|
|
|
guint32 progbar_quantum;
|
|
|
|
|
guint32 progbar_nextstep;
|
|
|
|
|
int count;
|
|
|
|
|
proto_tree *protocol_tree;
|
|
|
|
|
|
|
|
|
|
start_fd = cf->current_frame;
|
|
|
|
|
if (start_fd != NULL) {
|
|
|
|
|
gtk_progress_set_activity_mode(GTK_PROGRESS(prog_bar), FALSE);
|
|
|
|
|
|
|
|
|
|
/* Iterate through the list of packets, starting at the packet we've
|
|
|
|
|
picked, calling a routine to run the filter on the packet, see if
|
|
|
|
|
it matches, and stop if so. */
|
|
|
|
|
count = 0;
|
|
|
|
|
fd = start_fd;
|
|
|
|
|
|
|
|
|
|
proto_tree_is_visible = FALSE;
|
|
|
|
|
|
|
|
|
|
/* Update the progress bar when it gets to this value. */
|
|
|
|
|
progbar_nextstep = 0;
|
|
|
|
|
/* When we reach the value that triggers a progress bar update,
|
|
|
|
|
bump that value by this amount.
|
|
|
|
|
|
|
|
|
|
We base the progress bar on the extent to which we've gone through
|
|
|
|
|
the displayed packets, as those are the only ones for which we
|
|
|
|
|
have to do a significant amount of work. */
|
|
|
|
|
progbar_quantum = cf->count/N_PROGBAR_UPDATES;
|
|
|
|
|
gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(prog_bar), GTK_PROGRESS_LEFT_TO_RIGHT);
|
|
|
|
|
|
|
|
|
|
fd = start_fd;
|
|
|
|
|
for (;;) {
|
|
|
|
|
/* Update the progress bar, but do it only N_PROGBAR_UPDATES times;
|
|
|
|
|
when we update it, we have to run the GTK+ main loop to get it
|
|
|
|
|
to repaint what's pending, and doing so may involve an "ioctl()"
|
|
|
|
|
to see if there's any pending input from an X server, and doing
|
|
|
|
|
that for every packet can be costly, especially on a big file. */
|
|
|
|
|
if (count >= progbar_nextstep) {
|
|
|
|
|
/* let's not divide by zero. I should never be started
|
|
|
|
|
* with count == 0, so let's assert that
|
|
|
|
|
*/
|
|
|
|
|
g_assert(cf->count > 0);
|
|
|
|
|
|
|
|
|
|
gtk_progress_bar_update(GTK_PROGRESS_BAR(prog_bar),
|
|
|
|
|
(gfloat) count / cf->count);
|
|
|
|
|
|
|
|
|
|
progbar_nextstep += progbar_quantum;
|
|
|
|
|
while (gtk_events_pending())
|
|
|
|
|
gtk_main_iteration();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Go past the current frame. */
|
|
|
|
|
if (cf->sbackward) {
|
|
|
|
|
/* Go on to the previous frame. */
|
|
|
|
|
fd = fd->prev;
|
|
|
|
|
if (fd == NULL)
|
|
|
|
|
fd = cf->plist_end; /* wrap around */
|
|
|
|
|
} else {
|
|
|
|
|
/* Go on to the next frame. */
|
|
|
|
|
fd = fd->next;
|
|
|
|
|
if (fd == NULL)
|
|
|
|
|
fd = cf->plist; /* wrap around */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (fd == start_fd) {
|
|
|
|
|
/* We're back to the frame we were on originally. The search
|
|
|
|
|
failed. */
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Is this packet in the display? */
|
|
|
|
|
if (fd->passed_dfilter) {
|
|
|
|
|
count++;
|
|
|
|
|
|
|
|
|
|
/* Yes. Does it match the search filter? */
|
|
|
|
|
protocol_tree = proto_tree_create_root();
|
|
|
|
|
wtap_seek_read(cf->cd_t, cf->fh, fd->file_off, cf->pd, fd->cap_len);
|
|
|
|
|
dissect_packet(cf->pd, fd, protocol_tree);
|
|
|
|
|
if (dfilter_apply(sfcode, protocol_tree, cf->pd)) {
|
|
|
|
|
new_fd = fd;
|
|
|
|
|
break; /* found it! */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
gtk_progress_bar_update(GTK_PROGRESS_BAR(prog_bar), 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (new_fd != NULL) {
|
|
|
|
|
/* We found a frame. Make it visible, and select it. */
|
|
|
|
|
if (!gtk_clist_row_is_visible(GTK_CLIST(packet_list), new_fd->row))
|
|
|
|
|
gtk_clist_moveto(GTK_CLIST(packet_list), new_fd->row, -1, 0.0, 0.0);
|
|
|
|
|
gtk_clist_select_row(GTK_CLIST(packet_list), new_fd->row, -1);
|
1999-11-06 06:54:24 +00:00
|
|
|
return TRUE; /* success */
|
|
|
|
|
} else
|
|
|
|
|
return FALSE; /* failure */
|
1999-11-06 06:28:07 +00:00
|
|
|
}
|
1999-08-15 07:28:23 +00:00
|
|
|
|
1999-11-08 01:03:40 +00:00
|
|
|
gboolean
|
|
|
|
|
goto_frame(capture_file *cf, guint fnumber)
|
|
|
|
|
{
|
|
|
|
|
frame_data *fd;
|
|
|
|
|
|
|
|
|
|
for (fd = cf->plist; fd != NULL && fd->num < fnumber; fd = fd->next)
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
if (fd != NULL && fd->passed_dfilter) {
|
|
|
|
|
/* We found that frame, and it's currently being displayed.
|
|
|
|
|
Make it visible, and select it. */
|
|
|
|
|
if (!gtk_clist_row_is_visible(GTK_CLIST(packet_list), fd->row))
|
|
|
|
|
gtk_clist_moveto(GTK_CLIST(packet_list), fd->row, -1, 0.0, 0.0);
|
|
|
|
|
gtk_clist_select_row(GTK_CLIST(packet_list), fd->row, -1);
|
|
|
|
|
return TRUE; /* success */
|
|
|
|
|
} else
|
|
|
|
|
return FALSE; /* failure */
|
|
|
|
|
}
|
|
|
|
|
|
1999-07-24 03:22:50 +00:00
|
|
|
/* Select the packet on a given row. */
|
|
|
|
|
void
|
|
|
|
|
select_packet(capture_file *cf, int row)
|
|
|
|
|
{
|
1999-08-10 04:13:37 +00:00
|
|
|
frame_data *fd;
|
|
|
|
|
int i;
|
|
|
|
|
|
1999-07-24 03:22:50 +00:00
|
|
|
/* Clear out whatever's currently in the hex dump. */
|
|
|
|
|
gtk_text_freeze(GTK_TEXT(byte_view));
|
|
|
|
|
gtk_text_set_point(GTK_TEXT(byte_view), 0);
|
|
|
|
|
gtk_text_forward_delete(GTK_TEXT(byte_view),
|
1999-08-07 01:25:04 +00:00
|
|
|
gtk_text_get_length(GTK_TEXT(byte_view)));
|
1999-07-24 03:22:50 +00:00
|
|
|
|
1999-08-10 04:13:37 +00:00
|
|
|
/* Search through the list of frames to see which one is in
|
|
|
|
|
this row. */
|
|
|
|
|
for (fd = cf->plist, i = 0; fd != NULL; fd = fd->next, i++) {
|
|
|
|
|
if (fd->row == row)
|
|
|
|
|
break;
|
|
|
|
|
}
|
1999-10-05 04:34:00 +00:00
|
|
|
|
|
|
|
|
g_assert(fd != NULL);
|
|
|
|
|
|
1999-11-06 06:28:07 +00:00
|
|
|
/* Record that this frame is the current frame, and that it's selected. */
|
|
|
|
|
cf->current_frame = fd;
|
|
|
|
|
cf->current_frame_is_selected = TRUE;
|
1999-07-24 03:22:50 +00:00
|
|
|
|
|
|
|
|
/* Get the data in that frame. */
|
1999-11-06 06:28:07 +00:00
|
|
|
wtap_seek_read (cf->cd_t, cf->fh, fd->file_off, cf->pd, fd->cap_len);
|
1999-07-24 03:22:50 +00:00
|
|
|
|
|
|
|
|
/* Create the logical protocol tree. */
|
|
|
|
|
if (cf->protocol_tree)
|
|
|
|
|
proto_tree_free(cf->protocol_tree);
|
|
|
|
|
cf->protocol_tree = proto_tree_create_root();
|
1999-08-26 07:01:44 +00:00
|
|
|
proto_tree_is_visible = TRUE;
|
1999-11-06 06:28:07 +00:00
|
|
|
dissect_packet(cf->pd, cf->current_frame, cf->protocol_tree);
|
1999-07-24 03:22:50 +00:00
|
|
|
|
|
|
|
|
/* Display the GUI protocol tree and hex dump. */
|
1999-08-05 00:23:07 +00:00
|
|
|
clear_tree_and_hex_views();
|
1999-07-24 03:22:50 +00:00
|
|
|
proto_tree_draw(cf->protocol_tree, tree_view);
|
1999-11-06 06:28:07 +00:00
|
|
|
packet_hex_print(GTK_TEXT(byte_view), cf->pd, cf->current_frame->cap_len,
|
1999-11-22 06:24:56 +00:00
|
|
|
-1, -1, cf->current_frame->encoding);
|
1999-07-24 03:22:50 +00:00
|
|
|
gtk_text_thaw(GTK_TEXT(byte_view));
|
|
|
|
|
|
|
|
|
|
/* A packet is selected, so "File/Print Packet" has something to print. */
|
|
|
|
|
set_menu_sensitivity("/File/Print Packet", TRUE);
|
1999-09-11 12:38:18 +00:00
|
|
|
set_menu_sensitivity("/Display/Collapse All", TRUE);
|
|
|
|
|
set_menu_sensitivity("/Display/Expand All", TRUE);
|
1999-07-24 03:22:50 +00:00
|
|
|
}
|
|
|
|
|
|
Have "close_cap_file()" disable all menu items that make sense only if
you have a capture.
Leave the job of enabling and disabling menu items that make sense only
if you have a capture (except for "File/Save" and "File/Save As...", for
now) up to "load_cap_file()", "close_cap_file()", and the like - don't
scatter that stuff throughout the code.
Disable "File/Print Packet" if no packet is selected; enable it only if
a packet is selected.
If there's a selected packet, and a display filter is run:
if the selected packet passed the filter, re-select it;
if the selected packet didn't pass the filter, un-select it.
If we've opened a live "pcap" capture, but can't do the capture because
we can't get the netmask info, or can't parse the capture filter string,
or can't install the filter, close the live capture and the dump and
delete the dump file.
If we failed to open a live "pcap" capture, don't try to read the
capture file - it doesn't exist.
svn path=/trunk/; revision=384
1999-07-24 02:42:52 +00:00
|
|
|
/* Unselect the selected packet, if any. */
|
|
|
|
|
void
|
|
|
|
|
unselect_packet(capture_file *cf)
|
|
|
|
|
{
|
1999-11-06 06:28:07 +00:00
|
|
|
cf->current_frame_is_selected = FALSE;
|
1999-07-24 03:22:50 +00:00
|
|
|
|
|
|
|
|
/* Destroy the protocol tree for that packet. */
|
|
|
|
|
if (cf->protocol_tree != NULL) {
|
|
|
|
|
proto_tree_free(cf->protocol_tree);
|
|
|
|
|
cf->protocol_tree = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
1999-11-19 22:32:00 +00:00
|
|
|
finfo_selected = NULL;
|
|
|
|
|
|
1999-08-05 00:23:07 +00:00
|
|
|
/* Clear out the display of that packet. */
|
|
|
|
|
clear_tree_and_hex_views();
|
Have "close_cap_file()" disable all menu items that make sense only if
you have a capture.
Leave the job of enabling and disabling menu items that make sense only
if you have a capture (except for "File/Save" and "File/Save As...", for
now) up to "load_cap_file()", "close_cap_file()", and the like - don't
scatter that stuff throughout the code.
Disable "File/Print Packet" if no packet is selected; enable it only if
a packet is selected.
If there's a selected packet, and a display filter is run:
if the selected packet passed the filter, re-select it;
if the selected packet didn't pass the filter, un-select it.
If we've opened a live "pcap" capture, but can't do the capture because
we can't get the netmask info, or can't parse the capture filter string,
or can't install the filter, close the live capture and the dump and
delete the dump file.
If we failed to open a live "pcap" capture, don't try to read the
capture file - it doesn't exist.
svn path=/trunk/; revision=384
1999-07-24 02:42:52 +00:00
|
|
|
|
|
|
|
|
/* No packet is selected, so "File/Print Packet" has nothing to print. */
|
|
|
|
|
set_menu_sensitivity("/File/Print Packet", FALSE);
|
1999-09-11 12:38:18 +00:00
|
|
|
set_menu_sensitivity("/Display/Collapse All", FALSE);
|
|
|
|
|
set_menu_sensitivity("/Display/Expand All", FALSE);
|
Have "close_cap_file()" disable all menu items that make sense only if
you have a capture.
Leave the job of enabling and disabling menu items that make sense only
if you have a capture (except for "File/Save" and "File/Save As...", for
now) up to "load_cap_file()", "close_cap_file()", and the like - don't
scatter that stuff throughout the code.
Disable "File/Print Packet" if no packet is selected; enable it only if
a packet is selected.
If there's a selected packet, and a display filter is run:
if the selected packet passed the filter, re-select it;
if the selected packet didn't pass the filter, un-select it.
If we've opened a live "pcap" capture, but can't do the capture because
we can't get the netmask info, or can't parse the capture filter string,
or can't install the filter, close the live capture and the dump and
delete the dump file.
If we failed to open a live "pcap" capture, don't try to read the
capture file - it doesn't exist.
svn path=/trunk/; revision=384
1999-07-24 02:42:52 +00:00
|
|
|
}
|
|
|
|
|
|
1999-07-28 03:29:02 +00:00
|
|
|
static void
|
|
|
|
|
freeze_clist(capture_file *cf)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
/* Make the column sizes static, so they don't adjust while
|
|
|
|
|
we're reading the capture file (freezing the clist doesn't
|
|
|
|
|
seem to suffice). */
|
|
|
|
|
for (i = 0; i < cf->cinfo.num_cols; i++)
|
|
|
|
|
gtk_clist_set_column_auto_resize(GTK_CLIST(packet_list), i, FALSE);
|
|
|
|
|
gtk_clist_freeze(GTK_CLIST(packet_list));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
thaw_clist(capture_file *cf)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < cf->cinfo.num_cols; i++) {
|
1999-07-28 03:38:42 +00:00
|
|
|
if (get_column_resize_type(cf->cinfo.col_fmt[i]) == RESIZE_MANUAL) {
|
|
|
|
|
/* Set this column's width to the appropriate value. */
|
|
|
|
|
gtk_clist_set_column_width(GTK_CLIST(packet_list), i,
|
|
|
|
|
cf->cinfo.col_width[i]);
|
|
|
|
|
} else {
|
|
|
|
|
/* Make this column's size dynamic, so that it adjusts to the
|
|
|
|
|
appropriate size. */
|
1999-07-28 03:29:02 +00:00
|
|
|
gtk_clist_set_column_auto_resize(GTK_CLIST(packet_list), i, TRUE);
|
1999-07-28 03:38:42 +00:00
|
|
|
}
|
1999-07-28 03:29:02 +00:00
|
|
|
}
|
|
|
|
|
gtk_clist_thaw(GTK_CLIST(packet_list));
|
|
|
|
|
|
|
|
|
|
/* Hopefully, the columns have now gotten their appropriate sizes;
|
|
|
|
|
make them resizeable - a column that auto-resizes cannot be
|
|
|
|
|
resized by the user, and *vice versa*. */
|
|
|
|
|
for (i = 0; i < cf->cinfo.num_cols; i++)
|
|
|
|
|
gtk_clist_set_column_resizeable(GTK_CLIST(packet_list), i, TRUE);
|
|
|
|
|
}
|
|
|
|
|
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
/* Tries to mv a file. If unsuccessful, tries to cp the file.
|
|
|
|
|
* Returns 0 on failure to do either, 1 on success of either
|
|
|
|
|
*/
|
|
|
|
|
int
|
|
|
|
|
file_mv(char *from, char *to)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
#define COPY_BUFFER_SIZE 8192
|
|
|
|
|
|
|
|
|
|
int retval;
|
|
|
|
|
|
1999-07-13 02:53:26 +00:00
|
|
|
#ifndef WIN32
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
/* try a hard link */
|
|
|
|
|
retval = link(from, to);
|
|
|
|
|
|
|
|
|
|
/* or try a copy */
|
|
|
|
|
if (retval < 0) {
|
1999-07-13 02:53:26 +00:00
|
|
|
#endif
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
retval = file_cp(from, to);
|
|
|
|
|
if (!retval) {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
1999-07-13 02:53:26 +00:00
|
|
|
#ifndef WIN32
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
}
|
1999-07-13 02:53:26 +00:00
|
|
|
#endif
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
|
|
|
|
|
unlink(from);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Copies a file.
|
|
|
|
|
* Returns 0 on failure to do either, 1 on success of either
|
|
|
|
|
*/
|
|
|
|
|
int
|
|
|
|
|
file_cp(char *from, char *to)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
#define COPY_BUFFER_SIZE 8192
|
|
|
|
|
|
|
|
|
|
int from_fd, to_fd, nread, nwritten;
|
|
|
|
|
char *buffer;
|
|
|
|
|
|
|
|
|
|
buffer = g_malloc(COPY_BUFFER_SIZE);
|
|
|
|
|
|
|
|
|
|
from_fd = open(from, O_RDONLY);
|
|
|
|
|
if (from_fd < 0) {
|
1999-07-23 08:29:24 +00:00
|
|
|
simple_dialog(ESD_TYPE_WARN, NULL,
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
file_open_error_message(errno, TRUE), from);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
to_fd = creat(to, 0644);
|
|
|
|
|
if (to_fd < 0) {
|
1999-07-23 08:29:24 +00:00
|
|
|
simple_dialog(ESD_TYPE_WARN, NULL,
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
file_open_error_message(errno, TRUE), to);
|
|
|
|
|
close(from_fd);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
while( (nread = read(from_fd, buffer, COPY_BUFFER_SIZE)) > 0) {
|
|
|
|
|
nwritten = write(to_fd, buffer, nread);
|
|
|
|
|
if (nwritten < nread) {
|
|
|
|
|
if (nwritten < 0) {
|
1999-07-23 08:29:24 +00:00
|
|
|
simple_dialog(ESD_TYPE_WARN, NULL,
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
file_write_error_message(errno), to);
|
|
|
|
|
} else {
|
1999-07-23 08:29:24 +00:00
|
|
|
simple_dialog(ESD_TYPE_WARN, NULL,
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
"The file \"%s\" could not be saved: tried writing %d, wrote %d.\n",
|
|
|
|
|
to, nread, nwritten);
|
|
|
|
|
}
|
|
|
|
|
close(from_fd);
|
|
|
|
|
close(to_fd);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (nread < 0) {
|
1999-07-23 08:29:24 +00:00
|
|
|
simple_dialog(ESD_TYPE_WARN, NULL,
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
file_read_error_message(errno), from);
|
|
|
|
|
close(from_fd);
|
|
|
|
|
close(to_fd);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
close(from_fd);
|
|
|
|
|
close(to_fd);
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
file_open_error_message(int err, int for_writing)
|
|
|
|
|
{
|
|
|
|
|
char *errmsg;
|
|
|
|
|
static char errmsg_errno[1024+1];
|
|
|
|
|
|
|
|
|
|
switch (err) {
|
|
|
|
|
|
1999-08-15 06:59:13 +00:00
|
|
|
case WTAP_ERR_NOT_REGULAR_FILE:
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
errmsg = "The file \"%s\" is invalid.";
|
|
|
|
|
break;
|
|
|
|
|
|
1999-08-15 06:59:13 +00:00
|
|
|
case WTAP_ERR_FILE_UNKNOWN_FORMAT:
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
case WTAP_ERR_UNSUPPORTED:
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
errmsg = "The file \"%s\" is not a capture file in a format Ethereal understands.";
|
|
|
|
|
break;
|
|
|
|
|
|
DLT_NULL, from "libpcap", means different things on different platforms
and in different capture files; throw in some heuristics to try to
figure out whether the 4-byte header is:
1) PPP-over-HDLC (some version of ISDN4BSD?);
2) big-endian AF_ value (BSD on big-endian platforms);
3) little-endian AF_ value (BSD on little-endian platforms);
4) two octets of 0 followed by an Ethernet type (Linux, at least
on little-endian platforms, as mutated by "libpcap").
Make a separate Wiretap encapsulation type, WTAP_ENCAP_NULL,
corresponding to DLT_NULL.
Have the PPP code dissect the frame if it's PPP-over-HDLC, and have
"ethertype()" dissect the Ethernet type and the rest of the packet if
it's a Linux-style header; dissect it ourselves only if it's an AF_
value.
Have Wiretap impose a maximum packet size of 65535 bytes, so that it
fails more gracefully when handed a corrupt "libpcap" capture file
(other capture file formats with more than a 16-bit capture length
field, if any, will have that check added later), and put that size in
"wtap.h" and have Ethereal use it as its notion of a maximum packet
size.
Have Ethereal put up a "this file appears to be damaged or corrupt"
message box if Wiretap returns a WTAP_ERR_BAD_RECORD error when opening
or reading a capture file.
Include loopback interfaces in the list of interfaces offered by the
"Capture" dialog box, but put them at the end of the list so that it
doesn't default to a loopback interface unless there are no other
interfaces. Also, don't require that an interface in the list have an
IP address associated with it, and only put one entry in the list for a
given interface (SIOCGIFCONF returns one entry per interface *address*,
not per *interface* - and even if you were to use only IP addresses, an
interface could conceivably have more than one IP address).
Exclusively use Wiretap encapsulation types internally, even when
capturing; don't use DLT_ types.
svn path=/trunk/; revision=540
1999-08-22 00:47:56 +00:00
|
|
|
case WTAP_ERR_BAD_RECORD:
|
|
|
|
|
errmsg = "The file \"%s\" appears to be damaged or corrupt.";
|
|
|
|
|
break;
|
|
|
|
|
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
case WTAP_ERR_CANT_OPEN:
|
|
|
|
|
if (for_writing)
|
|
|
|
|
errmsg = "The file \"%s\" could not be created for some unknown reason.";
|
|
|
|
|
else
|
|
|
|
|
errmsg = "The file \"%s\" could not be opened for some unknown reason.";
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case WTAP_ERR_SHORT_READ:
|
|
|
|
|
errmsg = "The file \"%s\" appears to have been cut short"
|
|
|
|
|
" in the middle of a packet.";
|
|
|
|
|
break;
|
|
|
|
|
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
case ENOENT:
|
|
|
|
|
if (for_writing)
|
|
|
|
|
errmsg = "The path to the file \"%s\" does not exist.";
|
|
|
|
|
else
|
|
|
|
|
errmsg = "The file \"%s\" does not exist.";
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case EACCES:
|
|
|
|
|
if (for_writing)
|
|
|
|
|
errmsg = "You do not have permission to create or write to the file \"%s\".";
|
|
|
|
|
else
|
1999-08-15 06:59:13 +00:00
|
|
|
errmsg = "You do not have permission to read the file \"%s\".";
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
1999-08-22 02:52:48 +00:00
|
|
|
sprintf(errmsg_errno, "The file \"%%s\" could not be opened: %s.",
|
|
|
|
|
wtap_strerror(err));
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
errmsg = errmsg_errno;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return errmsg;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
file_read_error_message(int err)
|
|
|
|
|
{
|
|
|
|
|
static char errmsg_errno[1024+1];
|
|
|
|
|
|
1999-08-22 02:52:48 +00:00
|
|
|
sprintf(errmsg_errno, "An error occurred while reading from the file \"%%s\": %s.",
|
|
|
|
|
wtap_strerror(err));
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
return errmsg_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
file_write_error_message(int err)
|
|
|
|
|
{
|
|
|
|
|
char *errmsg;
|
|
|
|
|
static char errmsg_errno[1024+1];
|
|
|
|
|
|
|
|
|
|
switch (err) {
|
|
|
|
|
|
|
|
|
|
case ENOSPC:
|
|
|
|
|
errmsg = "The file \"%s\" could not be saved because there is no space left on the file system.";
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
#ifdef EDQUOT
|
|
|
|
|
case EDQUOT:
|
|
|
|
|
errmsg = "The file \"%s\" could not be saved because you are too close to, or over, your disk quota.";
|
|
|
|
|
break;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
default:
|
1999-08-22 02:52:48 +00:00
|
|
|
sprintf(errmsg_errno, "An error occurred while writing to the file \"%%s\": %s.",
|
|
|
|
|
wtap_strerror(err));
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
errmsg = errmsg_errno;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return errmsg;
|
|
|
|
|
}
|