diff options
author | Guy Harris <guy@alum.mit.edu> | 2014-05-09 05:18:49 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2014-05-09 05:21:01 +0000 |
commit | a1b1c8bed54b1576e4f0e9e7f583844a12d142bf (patch) | |
tree | fcadd72c61f9d936451163e83cc1be843073f3b4 /wiretap/btsnoop.c | |
parent | a651f3e5edb2f148a0e5f495b5cba0e7fa43e002 (diff) |
Revert "Refactor Wiretap"
This reverts commit 1abeb277f5e6bd27fbaebfecc8184e37ba9d008a.
This isn't building, and looks as if it requires significant work to fix.
Change-Id: I622b1bb243e353e874883a302ab419532b7601f2
Reviewed-on: https://code.wireshark.org/review/1568
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/btsnoop.c')
-rw-r--r-- | wiretap/btsnoop.c | 90 |
1 files changed, 42 insertions, 48 deletions
diff --git a/wiretap/btsnoop.c b/wiretap/btsnoop.c index 569371b328..b7c0b4c5c5 100644 --- a/wiretap/btsnoop.c +++ b/wiretap/btsnoop.c @@ -21,7 +21,6 @@ #include "config.h" #include <errno.h> #include <string.h> -#include "wftap-int.h" #include "wtap-int.h" #include "file_wrappers.h" #include "buffer.h" @@ -74,14 +73,14 @@ struct btsnooprec_hdr { static const gint64 KUnixTimeBase = G_GINT64_CONSTANT(0x00dcddb30f2f8000); /* offset from symbian - unix time */ -static gboolean btsnoop_read(wftap *wfth, int *err, gchar **err_info, - gint64 *data_offset); -static gboolean btsnoop_seek_read(wftap *wfth, gint64 seek_off, - void* header, Buffer *buf, int *err, gchar **err_info); -static gboolean btsnoop_read_record(wftap *wfth, FILE_T fh, +static gboolean btsnoop_read(wtap *wth, int *err, gchar **err_info, + gint64 *data_offset); +static gboolean btsnoop_seek_read(wtap *wth, gint64 seek_off, + struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info); +static gboolean btsnoop_read_record(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info); -int btsnoop_open(wftap *wfth, int *err, gchar **err_info) +int btsnoop_open(wtap *wth, int *err, gchar **err_info) { int bytes_read; char magic[sizeof btsnoop_magic]; @@ -91,9 +90,9 @@ int btsnoop_open(wftap *wfth, int *err, gchar **err_info) /* Read in the string that should be at the start of a "btsnoop" file */ errno = WTAP_ERR_CANT_READ; - bytes_read = file_read(magic, sizeof magic, wfth->fh); + bytes_read = file_read(magic, sizeof magic, wth->fh); if (bytes_read != sizeof magic) { - *err = file_error(wfth->fh, err_info); + *err = file_error(wth->fh, err_info); if (*err != 0 && *err != WTAP_ERR_SHORT_READ) return -1; return 0; @@ -105,9 +104,9 @@ int btsnoop_open(wftap *wfth, int *err, gchar **err_info) /* Read the rest of the header. */ errno = WTAP_ERR_CANT_READ; - bytes_read = file_read(&hdr, sizeof hdr, wfth->fh); + bytes_read = file_read(&hdr, sizeof hdr, wth->fh); if (bytes_read != sizeof hdr) { - *err = file_error(wfth->fh, err_info); + *err = file_error(wth->fh, err_info); if (*err == 0) *err = WTAP_ERR_SHORT_READ; return -1; @@ -152,36 +151,34 @@ int btsnoop_open(wftap *wfth, int *err, gchar **err_info) return -1; } - wfth->subtype_read = btsnoop_read; - wfth->subtype_seek_read = btsnoop_seek_read; - wfth->file_encap = file_encap; - wfth->snapshot_length = 0; /* not available in header */ - wfth->tsprecision = WTAP_FILE_TSPREC_USEC; - wfth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_BTSNOOP; + wth->subtype_read = btsnoop_read; + wth->subtype_seek_read = btsnoop_seek_read; + wth->file_encap = file_encap; + wth->snapshot_length = 0; /* not available in header */ + wth->tsprecision = WTAP_FILE_TSPREC_USEC; + wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_BTSNOOP; return 1; } -static gboolean btsnoop_read(wftap *wfth, int *err, gchar **err_info, +static gboolean btsnoop_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) { - wtap* wth = (wtap*)wfth->tap_specific_data; - *data_offset = file_tell(wfth->fh); + *data_offset = file_tell(wth->fh); - return btsnoop_read_record(wfth, wfth->fh, &wth->phdr, wfth->frame_buffer, + return btsnoop_read_record(wth, wth->fh, &wth->phdr, wth->frame_buffer, err, err_info); } -static gboolean btsnoop_seek_read(wftap *wfth, gint64 seek_off, - void* header, Buffer *buf, int *err, gchar **err_info) +static gboolean btsnoop_seek_read(wtap *wth, gint64 seek_off, + struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info) { - struct wtap_pkthdr *phdr = (struct wtap_pkthdr *)header; - if (file_seek(wfth->random_fh, seek_off, SEEK_SET, err) == -1) + if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1) return FALSE; - return btsnoop_read_record(wfth, wfth->random_fh, phdr, buf, err, err_info); + return btsnoop_read_record(wth, wth->random_fh, phdr, buf, err, err_info); } -static gboolean btsnoop_read_record(wftap *wfth, FILE_T fh, +static gboolean btsnoop_read_record(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info) { int bytes_read; @@ -224,12 +221,10 @@ static gboolean btsnoop_read_record(wftap *wfth, FILE_T fh, phdr->ts.nsecs = (guint)((ts % 1000000) * 1000); phdr->caplen = packet_size; phdr->len = orig_size; - switch(wfth->file_encap) + if(wth->file_encap == WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR) { - case WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR: phdr->pseudo_header.p2p.sent = (flags & KHciLoggerControllerToHost) ? FALSE : TRUE; - break; - case WTAP_ENCAP_BLUETOOTH_HCI: + } else if(wth->file_encap == WTAP_ENCAP_BLUETOOTH_HCI) { phdr->pseudo_header.bthci.sent = (flags & KHciLoggerControllerToHost) ? FALSE : TRUE; if(flags & KHciLoggerCommandOrEvent) { @@ -246,13 +241,12 @@ static gboolean btsnoop_read_record(wftap *wfth, FILE_T fh, { phdr->pseudo_header.bthci.channel = BTHCI_CHANNEL_ACL; } - break; - case WTAP_ENCAP_BLUETOOTH_LINUX_MONITOR: + } else if (wth->file_encap == WTAP_ENCAP_BLUETOOTH_LINUX_MONITOR) { phdr->pseudo_header.btmon.opcode = flags & 0xFFFF; phdr->pseudo_header.btmon.adapter_id = flags >> 16; - break; } + /* Read packet data. */ return wtap_read_packet_bytes(fh, buf, phdr->caplen, err, err_info); } @@ -303,7 +297,7 @@ static guint8 btsnoop_lookup_flags(guint8 hci_type, gboolean sent, guint8 *flags return FALSE; } -static gboolean btsnoop_dump_partial_rec_hdr(wftap_dumper *wdh _U_, +static gboolean btsnoop_dump_partial_rec_hdr(wtap_dumper *wdh _U_, const struct wtap_pkthdr *phdr, const union wtap_pseudo_header *pseudo_header, const guint8 *pd, int *err, @@ -330,10 +324,10 @@ static gboolean btsnoop_dump_partial_rec_hdr(wftap_dumper *wdh _U_, } /* FIXME: How do we support multiple backends?*/ -static gboolean btsnoop_dump_h1(wftap_dumper *wdh, void* header, +static gboolean btsnoop_dump_h1(wtap_dumper *wdh, + const struct wtap_pkthdr *phdr, const guint8 *pd, int *err) { - const struct wtap_pkthdr *phdr = (const struct wtap_pkthdr *)header; const union wtap_pseudo_header *pseudo_header = &phdr->pseudo_header; struct btsnooprec_hdr rec_hdr; @@ -352,7 +346,7 @@ static gboolean btsnoop_dump_h1(wftap_dumper *wdh, void* header, rec_hdr.incl_len = GUINT32_TO_BE(phdr->caplen-1); rec_hdr.orig_len = GUINT32_TO_BE(phdr->len-1); - if (!wftap_dump_file_write(wdh, &rec_hdr, sizeof rec_hdr, err)) + if (!wtap_dump_file_write(wdh, &rec_hdr, sizeof rec_hdr, err)) return FALSE; wdh->bytes_dumped += sizeof rec_hdr; @@ -360,7 +354,7 @@ static gboolean btsnoop_dump_h1(wftap_dumper *wdh, void* header, /* Skip HCI packet type */ ++pd; - if (!wftap_dump_file_write(wdh, pd, phdr->caplen-1, err)) + if (!wtap_dump_file_write(wdh, pd, phdr->caplen-1, err)) return FALSE; wdh->bytes_dumped += phdr->caplen-1; @@ -368,7 +362,7 @@ static gboolean btsnoop_dump_h1(wftap_dumper *wdh, void* header, return TRUE; } -static gboolean btsnoop_dump_h4(wftap_dumper *wdh, +static gboolean btsnoop_dump_h4(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, const guint8 *pd, int *err) { @@ -387,12 +381,12 @@ static gboolean btsnoop_dump_h4(wftap_dumper *wdh, rec_hdr.incl_len = GUINT32_TO_BE(phdr->caplen); rec_hdr.orig_len = GUINT32_TO_BE(phdr->len); - if (!wftap_dump_file_write(wdh, &rec_hdr, sizeof rec_hdr, err)) + if (!wtap_dump_file_write(wdh, &rec_hdr, sizeof rec_hdr, err)) return FALSE; wdh->bytes_dumped += sizeof rec_hdr; - if (!wftap_dump_file_write(wdh, pd, phdr->caplen, err)) + if (!wtap_dump_file_write(wdh, pd, phdr->caplen, err)) return FALSE; wdh->bytes_dumped += phdr->caplen; @@ -401,7 +395,7 @@ static gboolean btsnoop_dump_h4(wftap_dumper *wdh, } /* FIXME: How do we support multiple backends?*/ -gboolean btsnoop_dump_open_h1(wftap_dumper *wdh, int *err) +gboolean btsnoop_dump_open_h1(wtap_dumper *wdh, int *err) { struct btsnoop_hdr file_hdr; @@ -423,7 +417,7 @@ gboolean btsnoop_dump_open_h1(wftap_dumper *wdh, int *err) return FALSE; } - if (!wftap_dump_file_write(wdh, btsnoop_magic, sizeof btsnoop_magic, err)) + if (!wtap_dump_file_write(wdh, btsnoop_magic, sizeof btsnoop_magic, err)) return FALSE; wdh->bytes_dumped += sizeof btsnoop_magic; @@ -433,7 +427,7 @@ gboolean btsnoop_dump_open_h1(wftap_dumper *wdh, int *err) /* HCI type encoded in first byte */ file_hdr.datalink = GUINT32_TO_BE(KHciLoggerDatalinkTypeH1); - if (!wftap_dump_file_write(wdh, &file_hdr, sizeof file_hdr, err)) + if (!wtap_dump_file_write(wdh, &file_hdr, sizeof file_hdr, err)) return FALSE; wdh->bytes_dumped += sizeof file_hdr; @@ -443,7 +437,7 @@ gboolean btsnoop_dump_open_h1(wftap_dumper *wdh, int *err) /* Returns TRUE on success, FALSE on failure; sets "*err" to an error code on failure */ -gboolean btsnoop_dump_open_h4(wftap_dumper *wdh, int *err) +gboolean btsnoop_dump_open_h4(wtap_dumper *wdh, int *err) { struct btsnoop_hdr file_hdr; @@ -465,7 +459,7 @@ gboolean btsnoop_dump_open_h4(wftap_dumper *wdh, int *err) return FALSE; } - if (!wftap_dump_file_write(wdh, btsnoop_magic, sizeof btsnoop_magic, err)) + if (!wtap_dump_file_write(wdh, btsnoop_magic, sizeof btsnoop_magic, err)) return FALSE; wdh->bytes_dumped += sizeof btsnoop_magic; @@ -475,7 +469,7 @@ gboolean btsnoop_dump_open_h4(wftap_dumper *wdh, int *err) /* HCI type encoded in first byte */ file_hdr.datalink = GUINT32_TO_BE(KHciLoggerDatalinkTypeH4); - if (!wftap_dump_file_write(wdh, &file_hdr, sizeof file_hdr, err)) + if (!wtap_dump_file_write(wdh, &file_hdr, sizeof file_hdr, err)) return FALSE; wdh->bytes_dumped += sizeof file_hdr; |