diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-12-02 23:43:30 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-12-02 23:43:30 +0000 |
| commit | 59932f27227c4769be94fb46936d123d1770c1a2 (patch) | |
| tree | dd1b62868737457d51efa73389ae4975567f4fe3 /packet-lmp.c | |
| parent | 8414298f8921489c6174c24d4363c391822e83c5 (diff) | |
Don't cast away constness, and fix variable and structure member
qualifiers as necessary to ensure that we don't have to.
"strcmp()", "strcasecmp()", and "memcmp()" don't return booleans; don't
test their results as if they did.
Use "guint8", not "guchar", for a pointer to (one or more) 8-bit bytes.
Update Michael Tuexen's e-mail address.
svn path=/trunk/; revision=6726
Diffstat (limited to 'packet-lmp.c')
| -rw-r--r-- | packet-lmp.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/packet-lmp.c b/packet-lmp.c index ae4c5e05c9..54dbeab46b 100644 --- a/packet-lmp.c +++ b/packet-lmp.c @@ -3,7 +3,7 @@ * * (c) Copyright Ashok Narayanan <ashokn@cisco.com> * - * $Id: packet-lmp.c,v 1.13 2002/10/17 01:29:30 guy Exp $ + * $Id: packet-lmp.c,v 1.14 2002/12/02 23:43:26 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -953,9 +953,9 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 2: proto_item_append_text(ti, ": IPv6 %s", - ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); + ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); proto_tree_add_text(lmp_object_tree, tvb, offset2, 16, "IPv6: %s", - ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); + ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); break; case 3: l = (class == LMP_CLASS_LOCAL_LINK_ID) ? @@ -984,9 +984,9 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 2: proto_item_append_text(ti, ": IPv6 %s", - ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); + ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); proto_tree_add_text(lmp_object_tree, tvb, offset2, 16, "IPv6: %s", - ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); + ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); break; case 3: l = (class == LMP_CLASS_LOCAL_INTERFACE_ID) ? @@ -1143,12 +1143,12 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 2: proto_item_append_text(ti, ": IPv6: Local %s, Remote %s", - ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16)), - ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2+8, 16))); + ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16)), + ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+8, 16))); proto_tree_add_text(lmp_object_tree, tvb, offset2+4, 16, "TE-Link Local ID - IPv6: %s", - ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); + ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); proto_tree_add_text(lmp_object_tree, tvb, offset2+20,16, "TE-Link Remote ID - IPv6: %s", - ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16))); + ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16))); break; case 3: proto_item_append_text(ti, ": Unnumbered: Local %d, Remote %d", @@ -1192,14 +1192,14 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 2: proto_item_append_text(ti, ": IPv6: Local %s, Remote %s", - ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16)), - ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2+8, 16))); + ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16)), + ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+8, 16))); proto_tree_add_text(lmp_object_tree, tvb, offset2+4, 16, "Data-Link Local ID - IPv6: %s", - ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); + ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); proto_tree_add_text(lmp_object_tree, tvb, offset2+20,16, "Data-Link Remote ID - IPv6: %s", - ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16))); + ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16))); l = 36; break; case 3: @@ -1299,11 +1299,11 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 2: if (j < 4) proto_item_append_text(ti, ": [IPv6-%s", - ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l, 16))); + ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l, 16))); proto_item_append_text(ti2, ": IPv6 %s", - ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l, 16))); + ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l, 16))); proto_tree_add_text(lmp_subobj_tree, tvb, offset2, 16, "Interface ID: IPv6: %s", - ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l, 16))); + ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l, 16))); l += 16; break; case 3: @@ -1358,7 +1358,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 2: proto_tree_add_text(lmp_object_tree, tvb, offset2+l, 16, "Interface ID: IPv6: %s", - ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l,16))); + ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l,16))); l += 16; break; case 3: |