1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a "proto_item_append_text()" routine, which is like

Browse Source 
"proto_item_set_text()" except that it appends the result of the
formatting to the item's current text, rather than replacing the item's
current text.  Use it in the DNS dissector.

svn path=/trunk/; revision=3880
This commit is contained in:
Guy Harris 2001-08-29 00:51:10 +00:00
parent aa4cd01b9b
commit fbe8da33f5
8 changed files with 83 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
doc/README.developer
View File

@ -1,4 +1,4 @@
$Id: README.developer,v 1.33 2001/08/28 08:28:16 guy Exp $ $Id: README.developer,v 1.34 2001/08/29 00:51:07 guy Exp $
This file is a HOWTO for Ethereal developers. It describes how to start coding This file is a HOWTO for Ethereal developers. It describes how to start coding
a Ethereal protocol dissector and the use some of the important functions and a Ethereal protocol dissector and the use some of the important functions and
@ -85,7 +85,7 @@ code inside
is needed only if you are using the "snprintf()" function. is needed only if you are using the "snprintf()" function.
The "$Id: README.developer,v 1.33 2001/08/28 08:28:16 guy Exp $" The "$Id: README.developer,v 1.34 2001/08/29 00:51:07 guy Exp $"
in the comment will be updated by CVS when the file is in the comment will be updated by CVS when the file is
checked in; it will allow the RCS "ident" command to report which checked in; it will allow the RCS "ident" command to report which
version of the file is currently checked out. version of the file is currently checked out.
@ -95,7 +95,7 @@ version of the file is currently checked out.
* Routines for PROTONAME dissection * Routines for PROTONAME dissection
* Copyright 2000, YOUR_NAME <YOUR_EMAIL_ADDRESS> * Copyright 2000, YOUR_NAME <YOUR_EMAIL_ADDRESS>
* *
* $Id: README.developer,v 1.33 2001/08/28 08:28:16 guy Exp $ * $Id: README.developer,v 1.34 2001/08/29 00:51:07 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com> * By Gerald Combs <gerald@ethereal.com>
@ -1119,15 +1119,23 @@ themselves - the items in the subtree are the ones with values.
For a subtree, the label on the subtree might reflect some of the items For a subtree, the label on the subtree might reflect some of the items
in the subtree. This means the label can't be set until at least some in the subtree. This means the label can't be set until at least some
of the items in the subtree have been dissected. To do this, use of the items in the subtree have been dissected. To do this, use
'proto_item_set_text()': 'proto_item_set_text()' or 'proto_item_append_text()':
void void
proto_tree_set_text(proto_item *ti, ...); proto_tree_set_text(proto_item *ti, ...);
which takes as an argument the value returned by void
proto_tree_append_text(proto_item *ti, ...);
'proto_item_set_text()' takes as an argument the value returned by
'proto_tree_add_text()', a 'printf'-style format string, and a set of 'proto_tree_add_text()', a 'printf'-style format string, and a set of
arguments corresponding to '%' format items in that string. For arguments corresponding to '%' format items in that string, and replaces
example, early in the dissection, one might do: the text for the item created by 'proto_tree_add_text()' with the result
of applying the arguments to the format string.
'proto_item_append_text()' is similar, but it appends to the text for
the item the result of applying the arguments to the format string.
For example, early in the dissection, one might do:
ti = proto_tree_add_text(tree, offset, length, <label>); ti = proto_tree_add_text(tree, offset, length, <label>);

3
epan/plugins.c
View File

@ -1,7 +1,7 @@
/* plugins.c /* plugins.c
* plugin routines * plugin routines
* *
* $Id: plugins.c,v 1.31 2001/08/28 08:28:17 guy Exp $ * $Id: plugins.c,v 1.32 2001/08/29 00:51:08 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com> * By Gerald Combs <gerald@ethereal.com>
@ -314,6 +314,7 @@ init_plugins(const char *plugin_dir)
patable.p_proto_item_get_len = proto_item_get_len; patable.p_proto_item_get_len = proto_item_get_len;
patable.p_proto_item_set_len = proto_item_set_len; patable.p_proto_item_set_len = proto_item_set_len;
patable.p_proto_item_set_text = proto_item_set_text; patable.p_proto_item_set_text = proto_item_set_text;
patable.p_proto_item_append_text = proto_item_append_text;
patable.p_proto_item_add_subtree = proto_item_add_subtree; patable.p_proto_item_add_subtree = proto_item_add_subtree;
patable.p_proto_tree_add_item = proto_tree_add_item; patable.p_proto_tree_add_item = proto_tree_add_item;
patable.p_proto_tree_add_item_hidden = proto_tree_add_item_hidden; patable.p_proto_tree_add_item_hidden = proto_tree_add_item_hidden;

27
epan/proto.c
View File

@ -1,7 +1,7 @@
/* proto.c /* proto.c
* Routines for protocol tree * Routines for protocol tree
* *
* $Id: proto.c,v 1.33 2001/08/28 08:28:17 guy Exp $ * $Id: proto.c,v 1.34 2001/08/29 00:51:08 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com> * By Gerald Combs <gerald@ethereal.com>
@ -1506,6 +1506,7 @@ proto_tree_set_representation(proto_item *pi, const char *format, va_list ap)
} }
} }
/* Set text of proto_item after having already been created. */
void void
proto_item_set_text(proto_item *pi, const char *format, ...) proto_item_set_text(proto_item *pi, const char *format, ...)
{ {
@ -1520,6 +1521,30 @@ proto_item_set_text(proto_item *pi, const char *format, ...)
va_end(ap); va_end(ap);
} }
/* Append to text of proto_item after having already been created. */
void
proto_item_append_text(proto_item *pi, const char *format, ...)
{
field_info *fi = (field_info*) (((GNode*)pi)->data);
size_t curlen;
va_list ap;
if (fi->visible) {
va_start(ap, format);
/*
* XXX - this will blow up if we haven't already set
* "fi->representation"; that seems OK to me - you
* can't append to something that doesn't exist - but
* there might be cases where that's not convenient.
*/
curlen = strlen(fi->representation);
if (ITEM_LABEL_LENGTH > curlen)
vsnprintf(fi->representation + curlen,
ITEM_LABEL_LENGTH - curlen, format, ap);
va_end(ap);
}
}
void void
proto_item_set_len(proto_item *pi, gint length) proto_item_set_len(proto_item *pi, gint length)
{ {

10
epan/proto.h
View File

@ -1,7 +1,7 @@
/* proto.h /* proto.h
* Definitions for protocol display * Definitions for protocol display
* *
* $Id: proto.h,v 1.15 2001/08/28 08:28:17 guy Exp $ * $Id: proto.h,v 1.16 2001/08/29 00:51:08 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com> * By Gerald Combs <gerald@ethereal.com>
@ -147,6 +147,14 @@ void proto_item_set_text(proto_item *ti, const char *format, ...)
void proto_item_set_text(proto_item *ti, const char *format, ...); void proto_item_set_text(proto_item *ti, const char *format, ...);
#endif #endif
/* Append to text of proto_item after having already been created. */
#if __GNUC__ >= 2
void proto_item_append_text(proto_item *ti, const char *format, ...)
__attribute__((format (printf, 2, 3)));
#else
void proto_item_append_text(proto_item *ti, const char *format, ...);
#endif
/* Set length of proto_item after having already been created. */ /* Set length of proto_item after having already been created. */
void proto_item_set_len(proto_item *ti, gint length); void proto_item_set_len(proto_item *ti, gint length);

89
packet-dns.c
View File

@ -1,7 +1,7 @@
/* packet-dns.c /* packet-dns.c
* Routines for DNS packet disassembly * Routines for DNS packet disassembly
* *
* $Id: packet-dns.c,v 1.71 2001/08/28 08:28:14 guy Exp $ * $Id: packet-dns.c,v 1.72 2001/08/29 00:51:06 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com> * By Gerald Combs <gerald@ethereal.com>
@ -817,9 +817,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
if (fd != NULL) if (fd != NULL)
col_append_fstr(fd, COL_INFO, " %s", ip_to_str(addr)); col_append_fstr(fd, COL_INFO, " %s", ip_to_str(addr));
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr, "%s: type %s, class %s, addr %s", proto_item_append_text(trr, ", addr %s", ip_to_str(addr));
name, type_name, class_name,
ip_to_str(addr));
proto_tree_add_text(rr_tree, tvb, cur_offset, 4, "Addr: %s", proto_tree_add_text(rr_tree, tvb, cur_offset, 4, "Addr: %s",
ip_to_str(addr)); ip_to_str(addr));
} }
@ -839,8 +837,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
if (fd != NULL) if (fd != NULL)
col_append_fstr(fd, COL_INFO, " %s", ns_name); col_append_fstr(fd, COL_INFO, " %s", ns_name);
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr, "%s: type %s, class %s, ns %s", proto_item_append_text(trr, ", ns %s", ns_name);
name, type_name, class_name, ns_name);
proto_tree_add_text(rr_tree, tvb, cur_offset, ns_name_len, "Name server: %s", proto_tree_add_text(rr_tree, tvb, cur_offset, ns_name_len, "Name server: %s",
ns_name); ns_name);
} }
@ -856,8 +853,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
if (fd != NULL) if (fd != NULL)
col_append_fstr(fd, COL_INFO, " %s", cname); col_append_fstr(fd, COL_INFO, " %s", cname);
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr, "%s: type %s, class %s, cname %s", proto_item_append_text(trr, ", cname %s", cname);
name, type_name, class_name, cname);
proto_tree_add_text(rr_tree, tvb, cur_offset, cname_len, "Primary name: %s", proto_tree_add_text(rr_tree, tvb, cur_offset, cname_len, "Primary name: %s",
cname); cname);
} }
@ -880,8 +876,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
if (fd != NULL) if (fd != NULL)
col_append_fstr(fd, COL_INFO, " %s", mname); col_append_fstr(fd, COL_INFO, " %s", mname);
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr, "%s: type %s, class %s, mname %s", proto_item_append_text(trr, ", mname %s", mname);
name, type_name, class_name, mname);
proto_tree_add_text(rr_tree, tvb, cur_offset, mname_len, "Primary name server: %s", proto_tree_add_text(rr_tree, tvb, cur_offset, mname_len, "Primary name server: %s",
mname); mname);
cur_offset += mname_len; cur_offset += mname_len;
@ -927,8 +922,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
if (fd != NULL) if (fd != NULL)
col_append_fstr(fd, COL_INFO, " %s", pname); col_append_fstr(fd, COL_INFO, " %s", pname);
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr, "%s: type %s, class %s, ptr %s", proto_item_append_text(trr, ", ptr %s", pname);
name, type_name, class_name, pname);
proto_tree_add_text(rr_tree, tvb, cur_offset, pname_len, "Domain name: %s", proto_tree_add_text(rr_tree, tvb, cur_offset, pname_len, "Domain name: %s",
pname); pname);
} }
@ -952,9 +946,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
if (fd != NULL) if (fd != NULL)
col_append_fstr(fd, COL_INFO, " %s", ip_to_str(wks_addr)); col_append_fstr(fd, COL_INFO, " %s", ip_to_str(wks_addr));
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr, "%s: type %s, class %s, addr %s", proto_item_append_text(trr, ", addr %s", ip_to_str(wks_addr));
name, type_name, class_name,
ip_to_str(wks_addr));
proto_tree_add_text(rr_tree, tvb, cur_offset, 4, "Addr: %s", proto_tree_add_text(rr_tree, tvb, cur_offset, 4, "Addr: %s",
ip_to_str(wks_addr)); ip_to_str(wks_addr));
cur_offset += 4; cur_offset += 4;
@ -1025,9 +1017,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
col_append_fstr(fd, COL_INFO, " %.*s %.*s", cpu_len, cpu, col_append_fstr(fd, COL_INFO, " %.*s %.*s", cpu_len, cpu,
os_len, os); os_len, os);
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr, proto_item_append_text(trr, ", CPU %.*s, OS %.*s",
"%s: type %s, class %s, CPU %.*s, OS %.*s",
name, type_name, class_name,
cpu_len, cpu, os_len, os); cpu_len, cpu, os_len, os);
proto_tree_add_text(rr_tree, tvb, cpu_offset, 1 + cpu_len, "CPU: %.*s", proto_tree_add_text(rr_tree, tvb, cpu_offset, 1 + cpu_len, "CPU: %.*s",
cpu_len, cpu); cpu_len, cpu);
@ -1049,9 +1039,8 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
if (fd != NULL) if (fd != NULL)
col_append_fstr(fd, COL_INFO, " %u %s", preference, mx_name); col_append_fstr(fd, COL_INFO, " %u %s", preference, mx_name);
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr, proto_item_append_text(trr, ", preference %u, mx %s",
"%s: type %s, class %s, preference %u, mx %s", preference, mx_name);
name, type_name, class_name, preference, mx_name);
proto_tree_add_text(rr_tree, tvb, cur_offset, 2, "Preference: %u", preference); proto_tree_add_text(rr_tree, tvb, cur_offset, 2, "Preference: %u", preference);
proto_tree_add_text(rr_tree, tvb, cur_offset + 2, mx_name_len, "Mail exchange: %s", proto_tree_add_text(rr_tree, tvb, cur_offset + 2, mx_name_len, "Mail exchange: %s",
mx_name); mx_name);
@ -1066,9 +1055,6 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
int txt_len; int txt_len;
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr,
"%s: type %s, class %s", name, type_name, class_name);
txt_offset = cur_offset; txt_offset = cur_offset;
while (rr_len != 0) { while (rr_len != 0) {
txt_len = tvb_get_guint8(tvb, txt_offset); txt_len = tvb_get_guint8(tvb, txt_offset);
@ -1090,9 +1076,6 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
int signer_name_len; int signer_name_len;
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr,
"%s: type %s, class %s", name, type_name, class_name);
type_covered = tvb_get_ntohs(tvb, cur_offset); type_covered = tvb_get_ntohs(tvb, cur_offset);
proto_tree_add_text(rr_tree, tvb, cur_offset, 2, "Type covered: %s (%s)", proto_tree_add_text(rr_tree, tvb, cur_offset, 2, "Type covered: %s (%s)",
dns_type_name(type_covered), dns_type_name(type_covered),
@ -1154,9 +1137,6 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
proto_tree *flags_tree; proto_tree *flags_tree;
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr,
"%s: type %s, class %s", name, type_name, class_name);
flags = tvb_get_ntohs(tvb, cur_offset); flags = tvb_get_ntohs(tvb, cur_offset);
tf = proto_tree_add_text(rr_tree, tvb, cur_offset, 2, "Flags: 0x%04X", flags); tf = proto_tree_add_text(rr_tree, tvb, cur_offset, 2, "Flags: 0x%04X", flags);
flags_tree = proto_item_add_subtree(tf, ett_t_key_flags); flags_tree = proto_item_add_subtree(tf, ett_t_key_flags);
@ -1227,8 +1207,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
ip6_to_str((struct e_in6_addr *)addr6)); ip6_to_str((struct e_in6_addr *)addr6));
} }
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr, "%s: type %s, class %s, addr %s", proto_item_append_text(trr, ", addr %s",
name, type_name, class_name,
ip6_to_str((struct e_in6_addr *)addr6)); ip6_to_str((struct e_in6_addr *)addr6));
proto_tree_add_text(rr_tree, tvb, cur_offset, 16, "Addr: %s", proto_tree_add_text(rr_tree, tvb, cur_offset, 16, "Addr: %s",
ip6_to_str((struct e_in6_addr *)addr6)); ip6_to_str((struct e_in6_addr *)addr6));
@ -1289,10 +1268,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
proto_tree_add_text(rr_tree, tvb, a6_offset, pname_len, proto_tree_add_text(rr_tree, tvb, a6_offset, pname_len,
"Prefix name: %s", pname); "Prefix name: %s", pname);
} }
proto_item_set_text(trr, "%s: type %s, class %s, addr %d %s %s", proto_item_append_text(trr, ", addr %d %s %s",
name,
type_name,
class_name,
pre_len, pre_len,
ip6_to_str((struct e_in6_addr *)&suffix), ip6_to_str((struct e_in6_addr *)&suffix),
pname); pname);
@ -1310,8 +1286,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
if (fd != NULL) if (fd != NULL)
col_append_fstr(fd, COL_INFO, " %s", dname); col_append_fstr(fd, COL_INFO, " %s", dname);
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr, "%s: type %s, class %s, dname %s", proto_item_append_text(trr, ", dname %s", dname);
name, type_name, class_name, dname);
proto_tree_add_text(rr_tree, tvb, cur_offset, proto_tree_add_text(rr_tree, tvb, cur_offset,
dname_len, "Target name: %s", dname); dname_len, "Target name: %s", dname);
} }
@ -1323,9 +1298,6 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
guint8 version; guint8 version;
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr,
"%s: type %s, class %s", name, type_name, class_name);
version = tvb_get_guint8(tvb, cur_offset); version = tvb_get_guint8(tvb, cur_offset);
proto_tree_add_text(rr_tree, tvb, cur_offset, 1, "Version: %u", version); proto_tree_add_text(rr_tree, tvb, cur_offset, 1, "Version: %u", version);
if (version == 0) { if (version == 0) {
@ -1376,8 +1348,8 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
if (fd != NULL) if (fd != NULL)
col_append_fstr(fd, COL_INFO, " %s", next_domain_name); col_append_fstr(fd, COL_INFO, " %s", next_domain_name);
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr, "%s: type %s, class %s, next domain name %s", proto_item_append_text(trr, ", next domain name %s",
name, type_name, class_name, next_domain_name); next_domain_name);
proto_tree_add_text(rr_tree, tvb, cur_offset, next_domain_name_len, proto_tree_add_text(rr_tree, tvb, cur_offset, next_domain_name_len,
"Next domain name: %s", next_domain_name); "Next domain name: %s", next_domain_name);
cur_offset += next_domain_name_len; cur_offset += next_domain_name_len;
@ -1414,9 +1386,8 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
if (fd != NULL) if (fd != NULL)
col_append_fstr(fd, COL_INFO, " %u %s", preference, kx_name); col_append_fstr(fd, COL_INFO, " %u %s", preference, kx_name);
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr, proto_item_append_text(trr, ", preference %u, kx %s",
"%s: type %s, class %s, preference %u, kx %s", preference, kx_name);
name, type_name, class_name, preference, kx_name);
proto_tree_add_text(rr_tree, tvb, cur_offset, 2, "Preference: %u", preference); proto_tree_add_text(rr_tree, tvb, cur_offset, 2, "Preference: %u", preference);
proto_tree_add_text(rr_tree, tvb, cur_offset + 2, kx_name_len, "Key exchange: %s", proto_tree_add_text(rr_tree, tvb, cur_offset + 2, kx_name_len, "Key exchange: %s",
kx_name); kx_name);
@ -1456,10 +1427,8 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
break; break;
case T_OPT: case T_OPT:
if (dns_tree != NULL) { if (dns_tree != NULL)
proto_item_set_text(trr, "%s: type %s", name, type_name);
proto_tree_add_text(rr_tree, tvb, cur_offset, data_len, "Data"); proto_tree_add_text(rr_tree, tvb, cur_offset, data_len, "Data");
}
break; break;
case T_TKEY: case T_TKEY:
@ -1472,14 +1441,12 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
static const value_string tkey_modes[] = { static const value_string tkey_modes[] = {
{ TKEYMODE_SERVERASSIGNED, "Server assigned" }, { TKEYMODE_SERVERASSIGNED, "Server assigned" },
{ TKEYMODE_DIFFIEHELLMAN, "Diffie Hellman" }, { TKEYMODE_DIFFIEHELLMAN, "Diffie Hellman" },
{ TKEYMODE_GSSAPI, "GSSAPI " }, { TKEYMODE_GSSAPI, "GSSAPI" },
{ TKEYMODE_RESOLVERASSIGNED, "Resolver assigned" }, { TKEYMODE_RESOLVERASSIGNED, "Resolver assigned" },
{ TKEYMODE_DELETE, "Delete" }, { TKEYMODE_DELETE, "Delete" },
{ 0, NULL } }; { 0, NULL } };
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr,
"%s: type %s, class %s", name, type_name, class_name);
tkey_algname_len = get_dns_name(tvb, cur_offset, dns_data_offset, tkey_algname, sizeof(tkey_algname)); tkey_algname_len = get_dns_name(tvb, cur_offset, dns_data_offset, tkey_algname, sizeof(tkey_algname));
proto_tree_add_text(rr_tree, tvb, cur_offset, tkey_algname_len, proto_tree_add_text(rr_tree, tvb, cur_offset, tkey_algname_len,
"Algorithm name: %s", tkey_algname); "Algorithm name: %s", tkey_algname);
@ -1545,8 +1512,6 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
int rr_len = data_len; int rr_len = data_len;
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr,
"%s: type %s, class %s", name, type_name, class_name);
tsig_algname_len = get_dns_name(tvb, cur_offset, dns_data_offset, tsig_algname, sizeof(tsig_algname)); tsig_algname_len = get_dns_name(tvb, cur_offset, dns_data_offset, tsig_algname, sizeof(tsig_algname));
proto_tree_add_text(rr_tree, tvb, cur_offset, tsig_algname_len, proto_tree_add_text(rr_tree, tvb, cur_offset, tsig_algname_len,
"Algorithm name: %s", tsig_algname); "Algorithm name: %s", tsig_algname);
@ -1609,8 +1574,6 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
guint32 nservers; guint32 nservers;
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr, "%s: type %s, class %s", name, type_name,
class_name);
local_flag = tvb_get_ntohl(tvb, cur_offset); local_flag = tvb_get_ntohl(tvb, cur_offset);
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_tree_add_text(rr_tree, tvb, cur_offset, 4, "Local flag: %s", proto_tree_add_text(rr_tree, tvb, cur_offset, 4, "Local flag: %s",
@ -1693,8 +1656,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
if (fd != NULL) if (fd != NULL)
col_append_fstr(fd, COL_INFO, " %s", dname); col_append_fstr(fd, COL_INFO, " %s", dname);
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr, "%s: type %s, class %s, name result domain %s", proto_item_append_text(trr, ", name result domain %s", dname);
name, type_name, class_name, dname);
proto_tree_add_text(rr_tree, tvb, cur_offset, dname_len, "Name result domain: %s", proto_tree_add_text(rr_tree, tvb, cur_offset, dname_len, "Name result domain: %s",
dname); dname);
} }
@ -1717,9 +1679,9 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
if (fd != NULL) if (fd != NULL)
col_append_fstr(fd, COL_INFO, " %u %u %u %s", priority, weight, port, target); col_append_fstr(fd, COL_INFO, " %u %u %u %s", priority, weight, port, target);
if (dns_tree != NULL) { if (dns_tree != NULL) {
proto_item_set_text(trr, proto_item_append_text(trr,
"%s: type %s, class %s, priority %u, weight %u, port %u, target %s", ", priority %u, weight %u, port %u, target %s",
name, type_name, class_name, priority, weight, port, target); priority, weight, port, target);
proto_tree_add_text(rr_tree, tvb, cur_offset, 2, "Priority: %u", priority); proto_tree_add_text(rr_tree, tvb, cur_offset, 2, "Priority: %u", priority);
proto_tree_add_text(rr_tree, tvb, cur_offset + 2, 2, "Weight: %u", weight); proto_tree_add_text(rr_tree, tvb, cur_offset + 2, 2, "Weight: %u", weight);
proto_tree_add_text(rr_tree, tvb, cur_offset + 4, 2, "Port: %u", port); proto_tree_add_text(rr_tree, tvb, cur_offset + 4, 2, "Port: %u", port);
@ -1732,11 +1694,8 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
/* TODO: parse more record types */ /* TODO: parse more record types */
default: default:
if (dns_tree != NULL) { if (dns_tree != NULL)
proto_item_set_text(trr,
"%s: type %s, class %s", name, type_name, class_name);
proto_tree_add_text(rr_tree, tvb, cur_offset, data_len, "Data"); proto_tree_add_text(rr_tree, tvb, cur_offset, data_len, "Data");
}
break; break;
} }

3
plugins/plugin_api.c
View File

@ -1,7 +1,7 @@
/* plugin_api.c /* plugin_api.c
* Routines for Ethereal plugins. * Routines for Ethereal plugins.
* *
* $Id: plugin_api.c,v 1.21 2001/08/28 08:28:19 guy Exp $ * $Id: plugin_api.c,v 1.22 2001/08/29 00:51:10 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* Copyright 2000 by Gilbert Ramirez <gram@xiexie.org> * Copyright 2000 by Gilbert Ramirez <gram@xiexie.org>
@ -58,6 +58,7 @@ plugin_address_table_init(plugin_address_table_t *pat)
p_proto_item_get_len = pat->p_proto_item_get_len; p_proto_item_get_len = pat->p_proto_item_get_len;
p_proto_item_set_len = pat->p_proto_item_set_len; p_proto_item_set_len = pat->p_proto_item_set_len;
p_proto_item_set_text = pat->p_proto_item_set_text; p_proto_item_set_text = pat->p_proto_item_set_text;
p_proto_item_append_text = pat->p_proto_item_append_text;
p_proto_item_add_subtree = pat->p_proto_item_add_subtree; p_proto_item_add_subtree = pat->p_proto_item_add_subtree;
p_proto_tree_add_item = pat->p_proto_tree_add_item; p_proto_tree_add_item = pat->p_proto_tree_add_item;
p_proto_tree_add_item_hidden = pat->p_proto_tree_add_item_hidden; p_proto_tree_add_item_hidden = pat->p_proto_tree_add_item_hidden;

3
plugins/plugin_api.h
View File

@ -1,7 +1,7 @@
/* plugin_api.h /* plugin_api.h
* Routines for Ethereal plugins. * Routines for Ethereal plugins.
* *
* $Id: plugin_api.h,v 1.21 2001/08/28 08:28:19 guy Exp $ * $Id: plugin_api.h,v 1.22 2001/08/29 00:51:10 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* Copyright 2000 by Gilbert Ramirez <gram@xiexie.org> * Copyright 2000 by Gilbert Ramirez <gram@xiexie.org>
@ -60,6 +60,7 @@
#define proto_item_get_len (*p_proto_item_get_len) #define proto_item_get_len (*p_proto_item_get_len)
#define proto_item_set_len (*p_proto_item_set_len) #define proto_item_set_len (*p_proto_item_set_len)
#define proto_item_set_text (*p_proto_item_set_text) #define proto_item_set_text (*p_proto_item_set_text)
#define proto_item_append_text (*p_proto_item_append_text)
#define proto_item_add_subtree (*p_proto_item_add_subtree) #define proto_item_add_subtree (*p_proto_item_add_subtree)
#define proto_tree_add_item (*p_proto_tree_add_item) #define proto_tree_add_item (*p_proto_tree_add_item)
#define proto_tree_add_item_hidden (*p_proto_tree_add_item_hidden) #define proto_tree_add_item_hidden (*p_proto_tree_add_item_hidden)

4
plugins/plugin_table.h
View File

@ -1,7 +1,7 @@
/* plugin_table.h /* plugin_table.h
* Table of exported addresses for Ethereal plugins. * Table of exported addresses for Ethereal plugins.
* *
* $Id: plugin_table.h,v 1.22 2001/08/28 08:28:19 guy Exp $ * $Id: plugin_table.h,v 1.23 2001/08/29 00:51:10 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* Copyright 2000 by Gilbert Ramirez <gram@xiexie.org> * Copyright 2000 by Gilbert Ramirez <gram@xiexie.org>
@ -57,6 +57,7 @@ typedef gboolean (*addr_proto_is_protocol_enabled)(int);
typedef int (*addr_proto_item_get_len)(proto_item*); typedef int (*addr_proto_item_get_len)(proto_item*);
typedef void (*addr_proto_item_set_len)(proto_item*, gint); typedef void (*addr_proto_item_set_len)(proto_item*, gint);
typedef void (*addr_proto_item_set_text)(proto_item*, const char*, ...); typedef void (*addr_proto_item_set_text)(proto_item*, const char*, ...);
typedef void (*addr_proto_item_append_text)(proto_item*, const char*, ...);
typedef proto_tree* (*addr_proto_item_add_subtree)(proto_item*, gint); typedef proto_tree* (*addr_proto_item_add_subtree)(proto_item*, gint);
typedef proto_item* (*addr_proto_tree_add_item)(proto_tree*, int, tvbuff_t*, gint, gint, gboolean); typedef proto_item* (*addr_proto_tree_add_item)(proto_tree*, int, tvbuff_t*, gint, gint, gboolean);
typedef proto_item* (*addr_proto_tree_add_item_hidden)(proto_tree*, int, tvbuff_t*, gint, gint, gboolean); typedef proto_item* (*addr_proto_tree_add_item_hidden)(proto_tree*, int, tvbuff_t*, gint, gint, gboolean);
@ -207,6 +208,7 @@ typedef struct {
addr_proto_item_get_len p_proto_item_get_len; addr_proto_item_get_len p_proto_item_get_len;
addr_proto_item_set_len p_proto_item_set_len; addr_proto_item_set_len p_proto_item_set_len;
addr_proto_item_set_text p_proto_item_set_text; addr_proto_item_set_text p_proto_item_set_text;
addr_proto_item_append_text p_proto_item_append_text;
addr_proto_item_add_subtree p_proto_item_add_subtree; addr_proto_item_add_subtree p_proto_item_add_subtree;
addr_proto_tree_add_item p_proto_tree_add_item; addr_proto_tree_add_item p_proto_tree_add_item;
addr_proto_tree_add_item_hidden p_proto_tree_add_item_hidden; addr_proto_tree_add_item_hidden p_proto_tree_add_item_hidden;