[src/trunk]: src/sys/rump/net/lib Support carp. It would be nice to support ...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f651ef058b8a
branches:  trunk
changeset: 757017:f651ef058b8a
user:      pooka <pooka%NetBSD.org@localhost>
date:      Tue Aug 10 21:50:10 2010 +0000

description:
Support carp.  It would be nice to support this as its own component,
but there's about 1000 lines of #ifdef which disagree with my wish.

diffstat:

 sys/rump/net/lib/libnet/opt/carp.h       |  4 ++--
 sys/rump/net/lib/libnetinet/Makefile.inc |  4 ++--
 sys/rump/net/lib/libnetinet/component.c  |  8 ++++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diffs (59 lines):

diff -r 41bb12efb834 -r f651ef058b8a sys/rump/net/lib/libnet/opt/carp.h
--- a/sys/rump/net/lib/libnet/opt/carp.h        Tue Aug 10 21:48:23 2010 +0000
+++ b/sys/rump/net/lib/libnet/opt/carp.h        Tue Aug 10 21:50:10 2010 +0000
@@ -1,3 +1,3 @@
-/*     $NetBSD: carp.h,v 1.1 2008/10/06 00:27:06 pooka Exp $   */
+/*     $NetBSD: carp.h,v 1.2 2010/08/10 21:50:10 pooka Exp $   */
 
-/* dummy */
+#define NCARP 1
diff -r 41bb12efb834 -r f651ef058b8a sys/rump/net/lib/libnetinet/Makefile.inc
--- a/sys/rump/net/lib/libnetinet/Makefile.inc  Tue Aug 10 21:48:23 2010 +0000
+++ b/sys/rump/net/lib/libnetinet/Makefile.inc  Tue Aug 10 21:50:10 2010 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile.inc,v 1.6 2010/07/13 22:16:10 rmind Exp $
+#      $NetBSD: Makefile.inc,v 1.7 2010/08/10 21:50:10 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../netinet ${.CURDIR}/../../../../netinet6
 
 # INET
-SRCS+= in_proto.c igmp.c in.c in_offload.c in_pcb.c ip_icmp.c          \
+SRCS+= in_proto.c igmp.c in.c in_offload.c in_pcb.c ip_carp.c ip_icmp.c\
        ip_flow.c ip_id.c ip_input.c ip_reass.c ip_output.c raw_ip.c    \
        in_cksum.c cpu_in_cksum.c in4_cksum.c ip_encap.c
 
diff -r 41bb12efb834 -r f651ef058b8a sys/rump/net/lib/libnetinet/component.c
--- a/sys/rump/net/lib/libnetinet/component.c   Tue Aug 10 21:48:23 2010 +0000
+++ b/sys/rump/net/lib/libnetinet/component.c   Tue Aug 10 21:50:10 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: component.c,v 1.2 2010/03/01 13:12:21 pooka Exp $      */
+/*     $NetBSD: component.c,v 1.3 2010/08/10 21:50:10 pooka Exp $      */
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.2 2010/03/01 13:12:21 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.3 2010/08/10 21:50:10 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/domain.h>
@@ -37,6 +37,8 @@
 #include "rump_private.h"
 #include "rump_net_private.h"
 
+int carpattach(int);
+
 RUMP_COMPONENT(RUMP_COMPONENT_NET)
 {
        extern struct domain arpdomain, inetdomain, inet6domain;
@@ -44,4 +46,6 @@
        DOMAINADD(arpdomain);
        DOMAINADD(inetdomain);
        DOMAINADD(inet6domain);
+
+       carpattach(1);
 }