diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-01-25 06:14:14 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-01-25 06:14:14 +0000 |
| commit | 32d63ecb303df930ec2521c0064c23697c96142d (patch) | |
| tree | b1874a0778b3163345ccecf56d1ae88804b2f7cb /packet-ldp.c | |
| parent | a8649c0e747b150c444b1f7cfa6f7ca82ff4fa3e (diff) | |
Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto ="
statements.
Move the setting of the Protocol column in various dissectors before
anything is fetched from the packet, and also clear the Info column at
that point in those and some other dissectors, so that if an exception
is thrown, the columns don't reflect the previous protocol.
"Tvbuffify" the Mobile IP dissector (it took old-style arguments, and
then converted them into tvbuff arguments, so there wasn't much to do,
other than to fix references to "fd" to refer to "pinfo->fd").
In the SCTP dissector, refer to the port type and source and destination
ports through "pinfo" rather than through the global "pi", as it's a
tvbuffified dissector.
In the SMTP and Time Protocol dissectors, use "pinfo->match_port" rather
than "TCP_PORT_SMTP" when checking whether the packet is a request or
reply, just in case somebody makes a non-standard port be dissected as
SMTP or Time. (Also, remove a bogus comment from the Time dissector; it
was probably cut-and-pasted from the TFTP dissector.)
svn path=/trunk/; revision=2938
Diffstat (limited to 'packet-ldp.c')
| -rw-r--r-- | packet-ldp.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/packet-ldp.c b/packet-ldp.c index fa3b23915e..7edade1830 100644 --- a/packet-ldp.c +++ b/packet-ldp.c @@ -1,7 +1,7 @@ /* packet-ldp.c * Routines for ldp packet disassembly * - * $Id: packet-ldp.c,v 1.13 2001/01/09 06:31:38 guy Exp $ + * $Id: packet-ldp.c,v 1.14 2001/01/25 06:14:14 guy Exp $ * * Copyright (c) November 2000 by Richard Sharpe <rsharpe@ns.aus.com> * @@ -541,13 +541,10 @@ dissect_ldp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset = 0, msg_cnt = 0; guint16 ldp_message = 0; - CHECK_DISPLAY_AS_DATA(proto_ldp, tvb, pinfo, tree); - - pinfo->current_proto = "LDP"; - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "LDP"); + if (check_col(pinfo->fd, COL_INFO)) + col_clear(pinfo->fd, COL_INFO); if (tree) { /* Build the tree info ..., this is wrong! FIXME */ |