Module Name: src
Committed By: pooka
Date: Tue Aug 10 21:50:10 UTC 2010
Modified Files:
src/sys/rump/net/lib/libnet/opt: carp.h
src/sys/rump/net/lib/libnetinet: Makefile.inc component.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/libnet/opt/carp.h
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/net/lib/libnetinet/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libnetinet/component.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/net/lib/libnet/opt/carp.h
diff -u src/sys/rump/net/lib/libnet/opt/carp.h:1.1 src/sys/rump/net/lib/libnet/opt/carp.h:1.2
--- src/sys/rump/net/lib/libnet/opt/carp.h:1.1 Mon Oct 6 00:27:06 2008
+++ src/sys/rump/net/lib/libnet/opt/carp.h Tue Aug 10 21:50:10 2010
@@ -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
Index: src/sys/rump/net/lib/libnetinet/Makefile.inc
diff -u src/sys/rump/net/lib/libnetinet/Makefile.inc:1.6 src/sys/rump/net/lib/libnetinet/Makefile.inc:1.7
--- src/sys/rump/net/lib/libnetinet/Makefile.inc:1.6 Tue Jul 13 22:16:10 2010
+++ src/sys/rump/net/lib/libnetinet/Makefile.inc Tue Aug 10 21:50:10 2010
@@ -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
Index: src/sys/rump/net/lib/libnetinet/component.c
diff -u src/sys/rump/net/lib/libnetinet/component.c:1.2 src/sys/rump/net/lib/libnetinet/component.c:1.3
--- src/sys/rump/net/lib/libnetinet/component.c:1.2 Mon Mar 1 13:12:21 2010
+++ src/sys/rump/net/lib/libnetinet/component.c Tue Aug 10 21:50:10 2010
@@ -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);
}
