Skip to content

Commit 434d67a

Browse files
committed
ICMPv6: Delete some duplicate macros
Keep macros with names similar to IANA names.
1 parent 5c010db commit 434d67a

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

print-icmp6.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,8 @@ struct icmp6_hdr {
103103

104104
#define ICMP6_ECHO_REQUEST 128 /* echo service */
105105
#define ICMP6_ECHO_REPLY 129 /* echo reply */
106-
#define ICMP6_MEMBERSHIP_QUERY 130 /* group membership query */
107106
#define MLD6_LISTENER_QUERY 130 /* multicast listener query */
108-
#define ICMP6_MEMBERSHIP_REPORT 131 /* group membership report */
109107
#define MLD6_LISTENER_REPORT 131 /* multicast listener report */
110-
#define ICMP6_MEMBERSHIP_REDUCTION 132 /* group membership termination */
111108
#define MLD6_LISTENER_DONE 132 /* multicast listener done */
112109

113110
#define ND_ROUTER_SOLICIT 133 /* router solicitation */
@@ -1141,7 +1138,7 @@ icmp6_print(netdissect_options *ndo,
11411138
ND_PRINT(", id %u, seq %u", GET_BE_U_2(dp->icmp6_id),
11421139
GET_BE_U_2(dp->icmp6_seq));
11431140
break;
1144-
case ICMP6_MEMBERSHIP_QUERY:
1141+
case MLD6_LISTENER_QUERY:
11451142
if (length == MLD_MINLEN) {
11461143
mld6_print(ndo, (const u_char *)dp);
11471144
} else if (length >= MLDV2_MINLEN) {
@@ -1151,10 +1148,10 @@ icmp6_print(netdissect_options *ndo,
11511148
ND_PRINT(" unknown-version (len %u) ", length);
11521149
}
11531150
break;
1154-
case ICMP6_MEMBERSHIP_REPORT:
1151+
case MLD6_LISTENER_REPORT:
11551152
mld6_print(ndo, (const u_char *)dp);
11561153
break;
1157-
case ICMP6_MEMBERSHIP_REDUCTION:
1154+
case MLD6_LISTENER_DONE:
11581155
mld6_print(ndo, (const u_char *)dp);
11591156
break;
11601157
case ND_ROUTER_SOLICIT:

0 commit comments

Comments
 (0)