diff options
| author | Michael Tüxen <tuexen@fh-muenster.de> | 2009-05-22 07:33:58 +0000 |
|---|---|---|
| committer | Michael Tüxen <tuexen@fh-muenster.de> | 2009-05-22 07:33:58 +0000 |
| commit | 83aa6f473f0dd5d54e5838201d120ba2e90a5592 (patch) | |
| tree | 4bca1f83dae43548dfa26ed50d44fc42a3ee95e1 /wiretap/pcapng.c | |
| parent | 3c6b6dc1a37347e78b8bd955dec171c42df17998 (diff) | |
| download | wireshark-83aa6f473f0dd5d54e5838201d120ba2e90a5592.tar.gz wireshark-83aa6f473f0dd5d54e5838201d120ba2e90a5592.tar.bz2 wireshark-83aa6f473f0dd5d54e5838201d120ba2e90a5592.zip | |
From Aaron Turner: Use wtap_wtap_encap_to_pcap_encap() instead of
fixed mapping for ethernet only.
svn path=/trunk/; revision=28443
Diffstat (limited to 'wiretap/pcapng.c')
| -rw-r--r-- | wiretap/pcapng.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index 3879ae38aa..3b7e287c3f 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -1573,7 +1573,7 @@ pcapng_dump_open(wtap_dumper *wdh, gboolean cant_seek _U_, int *err) /* write the interface description block */ wblock.type = BLOCK_TYPE_IDB; - wblock.data.if_descr.link_type = wdh->encap; + wblock.data.if_descr.link_type = wtap_wtap_encap_to_pcap_encap(wdh->encap); wblock.data.if_descr.snap_len = wdh->snaplen; /* XXX - options unused */ @@ -1598,8 +1598,8 @@ int pcapng_dump_can_write_encap(int encap) if (encap == WTAP_ENCAP_PER_PACKET) return WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED; - /* XXX - for now we only support Ethernet */ - if (encap != WTAP_ENCAP_ETHERNET) + /* Make sure we can figure out this DLT type */ + if (wtap_wtap_encap_to_pcap_encap(encap) == -1) return WTAP_ERR_UNSUPPORTED_ENCAP; return 0; |