diff options
| author | Michael Tüxen <tuexen@fh-muenster.de> | 2009-06-27 12:41:06 +0000 |
|---|---|---|
| committer | Michael Tüxen <tuexen@fh-muenster.de> | 2009-06-27 12:41:06 +0000 |
| commit | 6ce8546ecdc8925371fc88bb4e544354d57fbd07 (patch) | |
| tree | 263b7783977db9a4b30fced9b3c1b5d4c95159d5 /wiretap/pcap-common.c | |
| parent | 11a65d398b5fc6037c67d9e97a3cf3896929f971 (diff) | |
| download | wireshark-6ce8546ecdc8925371fc88bb4e544354d57fbd07.tar.gz | |
This patch
* adds an encapsulation argument to pcap_write_phdr.
* writes the pseudo header when writing pcapng files.
This fixes a bug where you could not write pcapng files
when using encapsulations requiring pseudo headers.
svn path=/trunk/; revision=28859
Diffstat (limited to 'wiretap/pcap-common.c')
| -rw-r--r-- | wiretap/pcap-common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 9184bfd484..7c0899eb7b 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -1440,7 +1440,7 @@ pcap_get_phdr_size(int encap, const union wtap_pseudo_header *pseudo_header) } gboolean -pcap_write_phdr(wtap_dumper *wdh, const union wtap_pseudo_header *pseudo_header, +pcap_write_phdr(wtap_dumper *wdh, int encap, const union wtap_pseudo_header *pseudo_header, int *err) { guint8 atm_hdr[SUNATM_LEN]; @@ -1454,7 +1454,7 @@ pcap_write_phdr(wtap_dumper *wdh, const union wtap_pseudo_header *pseudo_header, size_t nwritten; size_t size; - switch (wdh->encap) { + switch (encap) { case WTAP_ENCAP_ATM_PDUS: /* |