diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-09-29 17:18:56 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-09-29 17:18:56 +0000 |
| commit | 33ae47f7adaf7a4d4a5de835efd31d41d9a3628d (patch) | |
| tree | b58a5792cff6543487b5b0895965493b70259eef /epan/dissectors/packet-radius.c | |
| parent | e5846873f4ff25f0e0add3227329a5901e1f4f89 (diff) | |
Cleanup some proto_tree_add_ipv4_format calls that shouldn't be.
svn path=/trunk/; revision=52270
Diffstat (limited to 'epan/dissectors/packet-radius.c')
| -rw-r--r-- | epan/dissectors/packet-radius.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index da24b7d877..c24d3fd012 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -345,17 +345,15 @@ static const gchar *dissect_framed_ip_address(proto_tree* tree, tvbuff_t* tvb, p ip_h=g_ntohl(ip); if (ip_h == 0xFFFFFFFF) { - str = "Negotiated"; - proto_tree_add_ipv4_format(tree, hf_radius_framed_ip_address, - tvb, 0, len, ip, "Framed-IP-Address: %s", str); + proto_tree_add_ipv4_format_value(tree, hf_radius_framed_ip_address, + tvb, 0, len, ip, "Negotiated"); } else if (ip_h == 0xFFFFFFFE) { - str = "Assigned"; - proto_tree_add_ipv4_format(tree, hf_radius_framed_ip_address, - tvb, 0, len, ip, "Framed-IP-Address: %s", str); + proto_tree_add_ipv4_format_value(tree, hf_radius_framed_ip_address, + tvb, 0, len, ip, "Assigned"); } else { str = ip_to_str((guint8 *)&ip); - proto_tree_add_ipv4_format(tree, hf_radius_framed_ip_address, - tvb, 0, len, ip, "Framed-IP-Address: %s (%s)", + proto_tree_add_ipv4_format_value(tree, hf_radius_framed_ip_address, + tvb, 0, len, ip, "%s (%s)", get_hostname(ip), str); } @@ -376,17 +374,15 @@ static const gchar *dissect_login_ip_host(proto_tree* tree, tvbuff_t* tvb, packe ip_h=g_ntohl(ip); if (ip_h == 0xFFFFFFFF) { - str = "User-selected"; - proto_tree_add_ipv4_format(tree, hf_radius_login_ip_host, - tvb, 0, len, ip, "Login-IP-Host: %s", str); + proto_tree_add_ipv4_format_value(tree, hf_radius_login_ip_host, + tvb, 0, len, ip, "User-selected"); } else if (ip_h == 0) { - str = "NAS-selected"; - proto_tree_add_ipv4_format(tree, hf_radius_login_ip_host, - tvb, 0, len, ip, "Login-IP-Host: %s", str); + proto_tree_add_ipv4_format_value(tree, hf_radius_login_ip_host, + tvb, 0, len, ip, "NAS-selected"); } else { str = ip_to_str((guint8 *)&ip); - proto_tree_add_ipv4_format(tree, hf_radius_framed_ip_address, - tvb, 0, len, ip, "Login-IP-Host: %s (%s)", + proto_tree_add_ipv4_format_value(tree, hf_radius_login_ip_host, + tvb, 0, len, ip, "%s (%s)", get_hostname(ip), str); } |