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

The user data in an X.25 call request packet is - at least for IP and, 

if I correctly read the Windows NT DDK documentation on WAN drivers, for
PPP as well - an ISO NLPID, so use the "nlpid.h" values where they
exist.

Currently doesn't treat NLPID_PPP as PPP, but if we get a PPP-over-X.25
capture, we may find that it should do so.

svn path=/trunk/; revision=1577
This commit is contained in:
Guy Harris 2000-01-29 09:19:02 +00:00
parent 65b4006f46
commit 1a9d19e2b0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packet-x25.c
View File

@ -2,7 +2,7 @@
* Routines for x25 packet disassembly
* Olivier Abad <abad@daba.dhis.net>
*
* $Id: packet-x25.c,v 1.15 2000/01/24 03:51:35 guy Exp $
* $Id: packet-x25.c,v 1.16 2000/01/29 09:19:02 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -37,6 +37,7 @@
#include <stdlib.h>
#include <string.h>
#include "packet.h"
#include "nlpid.h"
#define FROM_DCE 0x80
@ -1413,7 +1414,7 @@ dissect_x25(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
if (IS_DATA_IN_FRAME(localoffset)) /* user data */
{
if (pd[localoffset] == 0xCC)
if (pd[localoffset] == NLPID_IP)
{
x25_hash_add_proto_start(vc, fd->abs_secs,
fd->abs_usecs, dissect_ip);
@ -1427,6 +1428,8 @@ dissect_x25(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
pd[localoffset+2] == 0x01 &&
pd[localoffset+3] == 0x00)
{
/* XXX - is there an NLPID for COTP and, if so, is it
any of those octets? */
x25_hash_add_proto_start(vc, fd->abs_secs,
fd->abs_usecs, dissect_cotp);
if (x25_tree)
@ -1435,6 +1438,7 @@ dissect_x25(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
localoffset += 4;
}
else {
/* XXX - handle the other NLPIDs, e.g. NLPID_PPP? */
if (x25_tree)
proto_tree_add_text(x25_tree, localoffset,
pi.captured_len-localoffset, "Data");