aboutsummaryrefslogtreecommitdiffstats
path: root/packet-lapd.c
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>2000-09-21 04:41:37 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>2000-09-21 04:41:37 +0000
commitc312f69abcbd44c8ca982f16d086c5bef05783f7 (patch)
treea96809a3c62e1475a013044d5a312bfc58622083 /packet-lapd.c
parent66752e74e9cd57d06556d6d2f093514e1102b634 (diff)
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 'packet-lapd.c')
-rw-r--r--packet-lapd.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/packet-lapd.c b/packet-lapd.c
index 6566bd4b2b..68f0a4b0ae 100644
--- a/packet-lapd.c
+++ b/packet-lapd.c
@@ -2,7 +2,7 @@
* Routines for LAPD frame disassembly
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-lapd.c,v 1.13 2000/08/13 14:08:24 deniel Exp $
+ * $Id: packet-lapd.c,v 1.14 2000/09/21 04:41:07 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -106,19 +106,19 @@ dissect_lapd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
sapi = (address & LAPD_SAPI) >> LAPD_SAPI_SHIFT;
lapd_header_len = 2; /* address */
- if (pinfo->pseudo_header->lapd.from_network_to_user) {
- is_response = cr ? FALSE : TRUE;
+ if (pinfo->pseudo_header->p2p.sent) {
+ is_response = cr ? TRUE : FALSE;
if(check_col(pinfo->fd, COL_RES_DL_DST))
- col_add_str(pinfo->fd, COL_RES_DL_DST, "User");
+ col_add_str(pinfo->fd, COL_RES_DL_DST, "Network");
if(check_col(pinfo->fd, COL_RES_DL_SRC))
- col_add_str(pinfo->fd, COL_RES_DL_SRC, "Network");
+ col_add_str(pinfo->fd, COL_RES_DL_SRC, "User");
}
else {
- is_response = cr ? TRUE : FALSE;
+ is_response = cr ? FALSE : TRUE;
if(check_col(pinfo->fd, COL_RES_DL_DST))
- col_add_str(pinfo->fd, COL_RES_DL_DST, "Network");
+ col_add_str(pinfo->fd, COL_RES_DL_DST, "User");
if(check_col(pinfo->fd, COL_RES_DL_SRC))
- col_add_str(pinfo->fd, COL_RES_DL_SRC, "User");
+ col_add_str(pinfo->fd, COL_RES_DL_SRC, "Network");
}