diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 1999-01-07 16:15:37 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 1999-01-07 16:15:37 +0000 |
| commit | 7757b2e72b9b84d1262acdd61124f450fb0199f8 (patch) | |
| tree | 8602e5907bc45a8c177a131334bde39f7b60137a /wiretap/wtap.c | |
| parent | f8046a1f2976386b093d24b69c6b934c21107dad (diff) | |
I removed the per-file encapsulation type from wiretap, and make all filetypes
provide a per-packet encapsulation type. this required minor modifications to
ethereal.
svn path=/trunk/; revision=162
Diffstat (limited to 'wiretap/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index f8e02cd8e8..1f5dac1334 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -1,6 +1,6 @@ /* wtap.c * - * $Id: wtap.c,v 1.3 1998/11/15 05:29:16 guy Exp $ + * $Id: wtap.c,v 1.4 1999/01/07 16:15:36 gram Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu> @@ -33,11 +33,6 @@ int wtap_file_type(wtap *wth) return wth->file_type; } -int wtap_encapsulation(wtap *wth) -{ - return wth->encapsulation; -} - int wtap_snapshot_length(wtap *wth) { @@ -46,7 +41,27 @@ int wtap_snapshot_length(wtap *wth) void wtap_close(wtap *wth) { - /* XXX - free up memory? */ + /* free up memory. If any capture structure ever allocates + * its own memory, it would be better to make a *close() function + * for each filetype, like pcap_close(0, lanalyzer_close(), etc. + * But for now this will work. */ + switch(wth->file_type) { + case WTAP_FILE_PCAP: + free(wth->capture.pcap); + break; + + case WTAP_FILE_LANALYZER: + free(wth->capture.lanalyzer); + break; + + case WTAP_FILE_NGSNIFFER: + free(wth->capture.ngsniffer); + break; + + default: + /* nothing */ + } + fclose(wth->fh); } |