since nearly 20 years the correct spelling is
ICMP6_DST_UNREACH_BEYONDSCOPE.

OK?

(I'll do a current.html eintry for pf.conf, but seriously, this has
been obsoleted years before pf even existed.)

diff --git sbin/pfctl/pfctl_parser.c sbin/pfctl/pfctl_parser.c
index ff88383aed7..6373a3c095d 100644
--- sbin/pfctl/pfctl_parser.c
+++ sbin/pfctl/pfctl_parser.c
@@ -173,7 +173,6 @@ static const struct icmpcodeent icmp_code[] = {
 static const struct icmpcodeent icmp6_code[] = {
        { "admin-unr", ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADMIN },
        { "noroute-unr", ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOROUTE },
-       { "notnbr-unr", ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOTNEIGHBOR },
        { "beyond-unr", ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_BEYONDSCOPE },
        { "addr-unr", ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADDR },
        { "port-unr", ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOPORT },
diff --git share/man/man4/icmp6.4 share/man/man4/icmp6.4
index 0eab1f40620..596ed1dc1c6 100644
--- share/man/man4/icmp6.4
+++ share/man/man4/icmp6.4
@@ -118,7 +118,6 @@ The following codes are defined:
 .It 0 Ta noroute-unr Ta unreach Ta "No route to destination"
 .It 1 Ta admin-unr Ta unreach Ta "Administratively prohibited"
 .It 2 Ta beyond-unr Ta unreach Ta "Beyond scope of source address"
-.It 2 Ta notnbr-unr Ta unreach Ta "Not a neighbor (obsolete)"
 .It 3 Ta addr-unr Ta unreach Ta "Address unreachable"
 .It 4 Ta port-unr Ta unreach Ta "Port unreachable"
 .It 0 Ta transit Ta timex Ta "Time exceeded in transit"
diff --git sys/netinet/icmp6.h sys/netinet/icmp6.h
index ae7859c1ecc..effc7f2eb0d 100644
--- sys/netinet/icmp6.h
+++ sys/netinet/icmp6.h
@@ -127,7 +127,6 @@ struct icmp6_hdr {
 
 #define ICMP6_DST_UNREACH_NOROUTE      0       /* no route to destination */
 #define ICMP6_DST_UNREACH_ADMIN                1       /* administratively 
prohibited */
-#define ICMP6_DST_UNREACH_NOTNEIGHBOR  2       /* not a neighbor(obsolete) */
 #define ICMP6_DST_UNREACH_BEYONDSCOPE  2       /* beyond scope of source 
address */
 #define ICMP6_DST_UNREACH_ADDR         3       /* address unreachable */
 #define ICMP6_DST_UNREACH_NOPORT       4       /* port unreachable */
diff --git usr.sbin/traceroute/worker.c usr.sbin/traceroute/worker.c
index d212d38b935..80234d2b28b 100644
--- usr.sbin/traceroute/worker.c
+++ usr.sbin/traceroute/worker.c
@@ -779,7 +779,7 @@ icmp6_code(int code, int *got_there, int *unreachable)
                ++(*unreachable);
                printf(" !P");
                break;
-       case ICMP6_DST_UNREACH_NOTNEIGHBOR:
+       case ICMP6_DST_UNREACH_BEYONDSCOPE:
                ++(*unreachable);
                printf(" !S");
                break;


-- 
I'm not entirely sure you are real.

Reply via email to