diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-09-21 04:41:37 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-09-21 04:41:37 +0000 |
| commit | c312f69abcbd44c8ca982f16d086c5bef05783f7 (patch) | |
| tree | a96809a3c62e1475a013044d5a312bfc58622083 /wiretap/pppdump.c | |
| parent | 66752e74e9cd57d06556d6d2f093514e1102b634 (diff) | |
| download | wireshark-c312f69abcbd44c8ca982f16d086c5bef05783f7.tar.gz | |
Make sure to pass the sent/received direction from pppdump.c in
pseudo_header.
Use generic "p2p_phdr" instead of "lapd_phdr". Modify toshiba.c and
packet-lapd.c to take that into account.
Add frame.p2p_dir, a filterable field, 0=sent, 1=recvd
Make p2p_dir available in packe_info, as I think it will be needed
in VJ COMP and UNCOMP dissection.
Rename WTAP_ENCAP_TR to WTAP_ENCAP_TOKEN_RING.
Mention pppd-log support in man page.
Mention atmsnoop in README.
svn path=/trunk/; revision=2455
Diffstat (limited to 'wiretap/pppdump.c')
| -rw-r--r-- | wiretap/pppdump.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/wiretap/pppdump.c b/wiretap/pppdump.c index 5a7c030198..5e1ba5e1cd 100644 --- a/wiretap/pppdump.c +++ b/wiretap/pppdump.c @@ -1,6 +1,6 @@ /* pppdump.c * - * $Id: pppdump.c,v 1.2 2000/09/19 17:35:08 gram Exp $ + * $Id: pppdump.c,v 1.3 2000/09/21 04:41:35 gram Exp $ * * Copyright (c) 2000 by Gilbert Ramirez <gram@xiexie.org> * @@ -197,7 +197,7 @@ pppdump_open(wtap *wth, int *err) state->offset = 5; file_seek(wth->fh, 5, SEEK_SET); - wth->file_encap = WTAP_ENCAP_PPP; + wth->file_encap = WTAP_ENCAP_PPP_WITH_PHDR; wth->file_type = WTAP_FILE_PPPDUMP; wth->snapshot_length = 8192; /* just guessing */ @@ -254,7 +254,9 @@ pppdump_read(wtap *wth, int *err, int *data_offset) wth->phdr.caplen = num_bytes; wth->phdr.ts.tv_sec = state->timestamp; wth->phdr.ts.tv_usec = state->tenths * 100000; - wth->phdr.pkt_encap = WTAP_ENCAP_PPP; + wth->phdr.pkt_encap = WTAP_ENCAP_PPP_WITH_PHDR; + + wth->pseudo_header.p2p.sent = (direction == DIRECTION_SENT ? TRUE : FALSE); return TRUE; } @@ -541,6 +543,8 @@ pppdump_seek_read (wtap *wth, return -1; } + pseudo_header->p2p.sent = (pid->dir == DIRECTION_SENT ? TRUE : FALSE); + return 0; } |