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

The Frame Relay DLCI is a virtual circuit identifer, not a source or 

destination address, so yank out the AT_DLCI stuff.

Clean up indentation.

svn path=/trunk/; revision=6455
This commit is contained in:
Guy Harris 2002-10-19 00:40:05 +00:00
parent a4d1704b63
commit dbfeea3620
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/column-utils.c
View File

@ -1,7 +1,7 @@
/* column-utils.c
* Routines for column utilities.
*
* $Id: column-utils.c,v 1.22 2002/10/19 00:10:50 guy Exp $
* $Id: column-utils.c,v 1.23 2002/10/19 00:40:05 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -477,15 +477,6 @@ col_set_addr(packet_info *pinfo, int col, address *addr, gboolean is_res,
pinfo->cinfo->col_data[col] = pinfo->cinfo->col_buf[col];
break;
case AT_DLCI:
snprintf(pinfo->cinfo->col_buf[col], COL_MAX_LEN, "%u",
*(guint16 *)(addr->data));
pinfo->cinfo->col_buf[col][COL_MAX_LEN - 1] = '\0';
strcpy(pinfo->cinfo->col_expr[col], "fr.dlci");
pinfo->cinfo->col_data[col] = pinfo->cinfo->col_buf[col];
strcpy(pinfo->cinfo->col_expr_val[col],pinfo->cinfo->col_buf[col]);
break;
case AT_ARCNET:
snprintf(pinfo->cinfo->col_buf[col], COL_MAX_LEN, "%02X",
addr->data[0]);

3
epan/packet_info.h
View File

@ -1,7 +1,7 @@
/* packet_info.h
* Definitions for packet info structures and routines
*
* $Id: packet_info.h,v 1.21 2002/10/18 21:40:13 guy Exp $
* $Id: packet_info.h,v 1.22 2002/10/19 00:40:05 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -39,7 +39,6 @@ typedef enum {
AT_ATALK, /* Appletalk DDP */
AT_VINES, /* Banyan Vines */
AT_OSI, /* OSI NSAP */
AT_DLCI, /* Frame Relay DLCI */
AT_ARCNET /* ARCNET */
} address_type;

10
packet-fr.c
View File

@ -3,7 +3,7 @@
*
* Copyright 2001, Paul Ionescu <paul@acorp.ro>
*
* $Id: packet-fr.c,v 1.30 2002/08/28 21:00:13 jmayer Exp $
* $Id: packet-fr.c,v 1.31 2002/10/19 00:40:03 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -155,13 +155,13 @@ static void dissect_fr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
}
else {
}
else {
if(check_col(pinfo->cinfo, COL_RES_DL_DST))
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
}
}
/*XXX We should check the EA bits and use that to generate the address. */
@ -198,8 +198,6 @@ static void dissect_fr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
offset++;
SET_ADDRESS(&pinfo->dl_src, AT_DLCI, 2, (guint8*)&address);
dissect_fr_nlpid(tvb, offset, pinfo, tree, ti, fr_tree, fr_ctrl);
} else {
if (address == 0) {