From d7e6e0e384967a4d3ac1f57d6446f5a04e83b3c6 Mon Sep 17 00:00:00 2001 From: Gilbert Ramirez Date: Fri, 19 May 2000 23:07:04 +0000 Subject: Add wtap-int.h. Move definitions relevant to the internal workins of wiretap to that file, leave public definitions in wtap.h. Rename "union pseudo_header" to "union wtap_pseudo_header". Make the wtap_pseudo_header pointer available in packet_info struct. svn path=/trunk/; revision=1989 --- wiretap/ngsniffer.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'wiretap/ngsniffer.c') diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c index b7c352a848..465bacea89 100644 --- a/wiretap/ngsniffer.c +++ b/wiretap/ngsniffer.c @@ -1,6 +1,6 @@ /* ngsniffer.c * - * $Id: ngsniffer.c,v 1.41 2000/05/19 08:18:16 guy Exp $ + * $Id: ngsniffer.c,v 1.42 2000/05/19 23:06:59 gram Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez @@ -63,7 +63,7 @@ #include #include #include -#include "wtap.h" +#include "wtap-int.h" #include "file_wrappers.h" #include "buffer.h" #include "ngsniffer.h" @@ -248,21 +248,21 @@ static double Usec[] = { 15.0, 0.838096, 15.0, 0.5, 2.0, 1.0, 0.1 }; static int ngsniffer_read(wtap *wth, int *err); static int ngsniffer_seek_read(wtap *wth, int seek_off, - union pseudo_header *pseudo_header, u_char *pd, int packet_size); + union wtap_pseudo_header *pseudo_header, u_char *pd, int packet_size); static int ngsniffer_read_rec_header(FILE_T fh, guint16 *typep, guint16 *lengthp, int *err); static int ngsniffer_read_frame2(FILE_T fh, struct frame2_rec *frame2, int *err); -static void set_pseudo_header_frame2(union pseudo_header *pseudo_header, +static void set_pseudo_header_frame2(union wtap_pseudo_header *pseudo_header, struct frame2_rec *frame2); static int ngsniffer_read_frame4(FILE_T fh, struct frame4_rec *frame4, int *err); -static void set_pseudo_header_frame4(union pseudo_header *pseudo_header, +static void set_pseudo_header_frame4(union wtap_pseudo_header *pseudo_header, struct frame4_rec *frame4); static int ngsniffer_read_rec_data(FILE_T fh, char *pd, int length, int *err); static void ngsniffer_close(wtap *wth); static gboolean ngsniffer_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, - const union pseudo_header *pseudo_header, const u_char *pd, int *err); + const union wtap_pseudo_header *pseudo_header, const u_char *pd, int *err); static gboolean ngsniffer_dump_close(wtap_dumper *wdh, int *err); int ngsniffer_open(wtap *wth, int *err) @@ -577,7 +577,7 @@ found: } static int ngsniffer_seek_read(wtap *wth, int seek_off, - union pseudo_header *pseudo_header, u_char *pd, int packet_size) + union wtap_pseudo_header *pseudo_header, u_char *pd, int packet_size) { int ret; int err; /* XXX - return this */ @@ -684,7 +684,7 @@ static int ngsniffer_read_frame2(FILE_T fh, struct frame2_rec *frame2, return 0; } -static void set_pseudo_header_frame2(union pseudo_header *pseudo_header, +static void set_pseudo_header_frame2(union wtap_pseudo_header *pseudo_header, struct frame2_rec *frame2) { /* @@ -728,7 +728,7 @@ static int ngsniffer_read_frame4(FILE_T fh, struct frame4_rec *frame4, return 0; } -static void set_pseudo_header_frame4(union pseudo_header *pseudo_header, +static void set_pseudo_header_frame4(union wtap_pseudo_header *pseudo_header, struct frame4_rec *frame4) { pseudo_header->ngsniffer_atm.AppTrafType = frame4->atm_info.AppTrafType; @@ -834,7 +834,7 @@ gboolean ngsniffer_dump_open(wtap_dumper *wdh, int *err) /* Write a record for a packet to a dump file. Returns TRUE on success, FALSE on failure. */ static gboolean ngsniffer_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, - const union pseudo_header *pseudo_header, const u_char *pd, int *err) + const union wtap_pseudo_header *pseudo_header, const u_char *pd, int *err) { ngsniffer_dump_t *priv = wdh->dump.ngsniffer; struct frame2_rec rec_hdr; -- cgit v1.2.3