diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-03-16 19:41:33 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-03-16 19:41:33 +0000 |
| commit | 38de3a617a9388474e71df045417bb3b813417c1 (patch) | |
| tree | 05faff216a2fbbdbe619d7fb8d43536dbab16652 /epan/dissectors/packet-isakmp.c | |
| parent | 4bb41cd1c7aca99e44aaa2b9b0a612b4fab503c7 (diff) | |
Get rid of some redundant tests that cause compiler warnings.
svn path=/trunk/; revision=13774
Diffstat (limited to 'epan/dissectors/packet-isakmp.c')
| -rw-r--r-- | epan/dissectors/packet-isakmp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 24fcec8fcf..7503f8e972 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -1203,7 +1203,7 @@ v2_ipcomptype2str(guint8 type) if (type >= 5 && type <= 240) return "RESERVED TO IANA"; - if (type >= 241 && type <= 255) + if (type >= 241) return "PRIVATE USE"; return val_to_str(type, vs_v2_ipcomptype, "UNKNOWN-IPCOMP-TYPE"); } @@ -1907,7 +1907,7 @@ msgtype2str(guint16 type) return "RESERVED TO IANA - STATUS TYPES"; if (type >= 8192 && type <= 16383) return "Private Use - Errors"; - if (type >= 40960 && type <= 65535) + if (type >= 40960) return "Private Use - STATUS TYPES"; return val_to_str(type, vs_v2_notifmsg, "UNKNOWN-NOTIFY-MESSAGE-TYPE"); } @@ -2192,13 +2192,13 @@ cfgtype2str(guint8 type) if (isakmp_version == 1) { if (type >= 5 && type <= 127) return "Future use"; - if (type >= 128 && type <= 255) + if (type >= 128) return "Private Use"; return val_to_str(type, vs_v1_cfgtype, "UNKNOWN-CFG-TYPE"); } else if (isakmp_version == 2) { if (type >= 5 && type <= 127) return "RESERVED TO IANA"; - if (type >= 128 && type <= 255) + if (type >= 128) return "PRIVATE USE"; return val_to_str(type, vs_v1_cfgtype, "UNKNOWN-CFG-TYPE"); } @@ -2241,7 +2241,7 @@ id2str(guint8 type) else if (isakmp_version == 2) { if ((type >= 6 && type <=8) || (type >= 12 && type <= 200)) return "Reserved to IANA"; - if (type >= 201 && type <= 255) + if (type >= 201) return "Reserved for private use"; return val_to_str(type, vs_v2_ident, "UNKNOWN-ID-TYPE"); } @@ -2261,7 +2261,7 @@ v2_tstype2str(guint8 type) return "RESERVED"; if (type >= 9 && type <= 240) return "RESERVED TO IANA"; - if (type >= 241 && type <= 255) + if (type >= 241) return "PRIVATE USE"; return val_to_str(type, vs_v2_tstype, "UNKNOWN-TS-TYPE"); } @@ -2279,7 +2279,7 @@ v2_auth2str(guint8 type) if (type >= 4 && type <= 200) return "RESERVED TO IANA"; - if (type >= 201 && type <= 255) + if (type >= 201) return "PRIVATE USE"; return val_to_str(type, vs_v2_authmeth, "UNKNOWN-AUTHMETHOD-TYPE"); } @@ -2395,7 +2395,7 @@ certtype2str(guint8 type) else if (isakmp_version == 2) { if (type >= 14 && type <= 200) return "RESERVED to IANA"; - if (type >= 201 && type <= 255) + if (type >= 201) return "PRIVATE USE"; return val_to_str(type, vs_v2_certtype, "RESERVED"); } |