diff options
Diffstat (limited to 'wiretap/visual.c')
| -rw-r--r-- | wiretap/visual.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/wiretap/visual.c b/wiretap/visual.c index a4d4f67395..2f495c5c77 100644 --- a/wiretap/visual.c +++ b/wiretap/visual.c @@ -430,16 +430,9 @@ static gboolean visual_read(wtap *wth, int *err, gchar **err_info, /* Fill in the encapsulation. Visual files have a media type in the file header and an encapsulation type in each packet header. Files with a media type of HDLC can be either Cisco EtherType or PPP. */ - if (wth->file_encap == WTAP_ENCAP_CHDLC_WITH_PHDR) - { - /* examine first two octets to verify encapsulation */ - buf = buffer_start_ptr(wth->frame_buffer); - if ((0xff == buf[0]) && (0x03 == buf[1])) - { - /* It is actually PPP */ - wth->phdr.pkt_encap = WTAP_ENCAP_PPP_WITH_PHDR; - } - } + if ((wth->file_encap == WTAP_ENCAP_CHDLC_WITH_PHDR) && (vpkt_hdr.encap_hint == 14)) + wth->phdr.pkt_encap = WTAP_ENCAP_PPP_WITH_PHDR; + return TRUE; } |