cvs commit: src/contrib/telnet/telnet commands.csrc/lib/libc/net Makefile.inc getaddrinfo.c inet6_opt_init.3 inet6_rth_space.3 ip6opt.c rthdr.c src/lib/libsdp search.c src/sbin/ping6

[Bruce Evans]

On Fri, 24 Oct 2003, Hajimu UMEMOTO wrote:

> ume         2003/10/24 11:26:30 PDT
>
>   FreeBSD src repository
>
>   Modified files:
>     contrib/telnet/telnet commands.c
>     lib/libc/net         Makefile.inc getaddrinfo.c ip6opt.c
>                          rthdr.c
>     lib/libsdp           search.c
>     sbin/ping6           Makefile ping6.8 ping6.c
>     sys/netinet          icmp6.h in.h in_pcb.h ip6.h
>     sys/netinet6         icmp6.c in6.h in6_pcb.c in6_var.h
>                          ip6_input.c ip6_output.c ip6_var.h mld6.c
>                          nd6.c nd6.h nd6_rtr.c raw_ip6.c route6.c
>                          udp6_output.c
>     usr.sbin/mld6query   Makefile mld6.c
>     usr.sbin/traceroute6 Makefile
>   Added files:
>     lib/libc/net         inet6_opt_init.3 inet6_rth_space.3
>   Log:
>   Switch Advanced Sockets API for IPv6 from RFC2292 to RFC3542
>   (aka RFC2292bis).  Though I believe this commit doesn't break
>   backward compatibility againt existing binaries, it breaks
>   backward compatibility of API.
>   Now, the applications which use Advanced Sockets API such as
>   telnet, ping6, mld6query and traceroute6 use RFC3542 API.
>
>   Obtained from:  KAME

This has some regressions at the source level, such as changing
__packed back to __attribute__((__packed__) and uintN_t back to u_intN_t,
and adding namespace pollution to <net/in.h>.  Lightly tested Fix for
the latter:

%%%
Index: netinet/in.h
===================================================================
RCS file: /home/ncvs/src/sys/netinet/in.h,v
retrieving revision 1.81
diff -u -2 -r1.81 in.h
--- netinet/in.h	24 Oct 2003 18:26:29 -0000	1.81
+++ netinet/in.h	25 Oct 2003 08:15:55 -0000
@@ -36,9 +36,8 @@

 #ifndef _NETINET_IN_H_
-#define _NETINET_IN_H_
+#define	_NETINET_IN_H_

 #include <sys/cdefs.h>
 #include <sys/_types.h>
-#include <sys/socket.h>
 #include <machine/endian.h>

Index: netinet6/in6.h
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/in6.h,v
retrieving revision 1.28
diff -u -2 -r1.28 in6.h
--- netinet6/in6.h	24 Oct 2003 18:26:29 -0000	1.28
+++ netinet6/in6.h	25 Oct 2003 08:16:17 -0000
@@ -640,4 +641,9 @@
 #endif

+#ifndef _SOCKLEN_T_DECLARED
+typedef	__socklen_t	socklen_t;
+#define	_SOCKLEN_T_DECLARED
+#endif
+
 #if __BSD_VISIBLE

%%%

Bruce