aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/file_access.c
diff options
context:
space:
mode:
authorLuis Ontanon <luis.ontanon@gmail.com>2005-06-10 16:01:16 +0000
committerLuis Ontanon <luis.ontanon@gmail.com>2005-06-10 16:01:16 +0000
commite0dc2b2a9a2bcb48a556d920357c81379f5fad9c (patch)
treecf65b6b113548c512bd614c87967bf15dfb40582 /wiretap/file_access.c
parent428b2d8bbe9de41061e92e9afc62dc121645f72c (diff)
Initial checkin of the 32 bit tektronix k12 binary format (rf5)
There is still much to do, but at the very least it can import files allowing the user to choose which protocols handle the diferent sources. svn path=/trunk/; revision=14606
Diffstat (limited to 'wiretap/file_access.c')
-rw-r--r--wiretap/file_access.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c
index 26f782e593..c7061a4ace 100644
--- a/wiretap/file_access.c
+++ b/wiretap/file_access.c
@@ -74,6 +74,7 @@
#include "erf.h"
#include "hcidump.h"
#include "network_instruments.h"
+#include "k12.h"
/* The open_file_* routines should return:
*
@@ -110,7 +111,8 @@ static int (*const open_routines[])(wtap *, int *, char **) = {
network_instruments_open,
airopeek9_open,
dbs_etherwatch_open,
-
+ k12_open,
+
/* Files that don't have magic bytes at a fixed location,
* but that instead require a heuristic of some sort to
* identify them. This includes the ASCII trace files that
@@ -296,6 +298,7 @@ wtap* wtap_open_offline(const char *filename, int *err, char **err_info,
return NULL;
}
wth->data_offset = 0;
+
switch ((*open_routines[i])(wth, err, err_info)) {
case -1:
@@ -495,7 +498,11 @@ static const struct file_type_info {
/* WTAP_FILE_EYESDN */
{ "EyeSDN USB S0/E1 ISDN trace format", NULL,
- NULL, NULL },
+ NULL, NULL },
+
+ /* WTAP_FILE_K12 */
+ { "Tektronix K12xx 32-bit .rf5 format", "rf5",
+ NULL, NULL },
};
/* Name that should be somewhat descriptive. */