osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

NCP-over-IP bug fix (it wasn't skipping the NCP-over-{TCP,UDP} header 

before passing the packet on to the request and reply dissectors), from
David Eisner.

svn path=/trunk/; revision=3693
This commit is contained in:
Guy Harris 2001-07-12 01:48:05 +00:00
parent 318682adca
commit 22317b5058
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AUTHORS
View File

@ -735,6 +735,10 @@ Scott Renfro <scott@renfro.org> {
SSL/TLS support
}
David Eisner <cradle@Glue.umd.edu> {
NCP-over-IP bug fix
}
Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c.

1
doc/ethereal.pod.template
View File

@ -1131,6 +1131,7 @@ B<http://www.ethereal.com>.
Aamer Akhter <aakhter@cisco.com>
Pekka Savola <pekkas@netcore.fi>
Scott Renfro <scott@renfro.org>
David Eisner <cradle@Glue.umd.edu>
Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to give his
permission to use his version of snprintf.c.

9
packet-ncp.c
View File

@ -3,7 +3,7 @@
* Gilbert Ramirez <gram@xiexie.org>
* Modified to allow NCP over TCP/IP decodes by James Coe <jammer@cin.net>
*
* $Id: packet-ncp.c,v 1.48 2001/06/18 02:17:49 guy Exp $
* $Id: packet-ncp.c,v 1.49 2001/07/12 01:48:03 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -259,6 +259,7 @@ dissect_ncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint16 nw_connection;
int hdr_offset = 0;
int commhdr;
tvbuff_t *next_tvb;
if (check_col(pinfo->fd, COL_PROTOCOL))
col_set_str(pinfo->fd, COL_PROTOCOL, "NCP");
@ -307,11 +308,13 @@ dissect_ncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (header.type == 0x1111 || header.type == 0x2222) {
dissect_ncp_request(tvb, pinfo, nw_connection,
next_tvb = tvb_new_subset( tvb, hdr_offset, -1, -1 );
dissect_ncp_request(next_tvb, pinfo, nw_connection,
header.sequence, header.type, ncp_tree, tree);
}
else if (header.type == 0x3333) {
dissect_ncp_reply(tvb, pinfo, nw_connection,
next_tvb = tvb_new_subset( tvb, hdr_offset, -1, -1 );
dissect_ncp_reply(next_tvb, pinfo, nw_connection,
header.sequence, ncp_tree, tree);
}
else if ( header.type == 0x5555 ||