Module Name: src
Committed By: pooka
Date: Thu Nov 4 23:31:13 UTC 2010
Modified Files:
src/sbin/ifconfig: Makefile env.h ifconfig.c
Log Message:
Update RUMP_ACTION to use the newstyle rump client.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sbin/ifconfig/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sbin/ifconfig/env.h
cvs rdiff -u -r1.220 -r1.221 src/sbin/ifconfig/ifconfig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/Makefile
diff -u src/sbin/ifconfig/Makefile:1.47 src/sbin/ifconfig/Makefile:1.48
--- src/sbin/ifconfig/Makefile:1.47 Thu Jul 1 16:28:21 2010
+++ src/sbin/ifconfig/Makefile Thu Nov 4 23:31:12 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2010/07/01 16:28:21 dyoung Exp $
+# $NetBSD: Makefile,v 1.48 2010/11/04 23:31:12 pooka Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# when making a change to this file, please check if the change is
@@ -28,14 +28,12 @@
#
# Compile-time debug flag. If compiled with "make RUMP_ACTION=1",
-# make rump system calls. This allows to single-step ioctl commands
-# to figure out where ioctl's go in the kernel.
+# make rump system calls to a server in another process.
#
.ifdef RUMP_ACTION
CPPFLAGS+= -DRUMP_SYS_NETWORKING -DRUMP_SYS_IOCTL -DRUMP_SYS_CLOSE
CPPFLAGS+= -DRUMP_ACTION
-LDADD+= -lrumpnet_virtif -lrumpnet_netinet -lrumpnet_net -lrumpnet
-LDADD+= -lrump -lrumpuser -lpthread
+LDADD+= -lrumpclient
DBG= -g
.endif
Index: src/sbin/ifconfig/env.h
diff -u src/sbin/ifconfig/env.h:1.2 src/sbin/ifconfig/env.h:1.3
--- src/sbin/ifconfig/env.h:1.2 Tue May 26 16:03:24 2009
+++ src/sbin/ifconfig/env.h Thu Nov 4 23:31:12 2010
@@ -19,6 +19,7 @@
#ifdef RUMP_ACTION
#include <rump/rump.h>
#include <rump/rump_syscalls.h>
+#include <rump/rumpclient.h>
#endif /* RUMP_ACTION */
#endif /* _IFCONFIG_ENV_H */
Index: src/sbin/ifconfig/ifconfig.c
diff -u src/sbin/ifconfig/ifconfig.c:1.220 src/sbin/ifconfig/ifconfig.c:1.221
--- src/sbin/ifconfig/ifconfig.c:1.220 Fri Aug 7 18:53:37 2009
+++ src/sbin/ifconfig/ifconfig.c Thu Nov 4 23:31:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ifconfig.c,v 1.220 2009/08/07 18:53:37 dyoung Exp $ */
+/* $NetBSD: ifconfig.c,v 1.221 2010/11/04 23:31:12 pooka Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1983, 1993\
The Regents of the University of California. All rights reserved.");
-__RCSID("$NetBSD: ifconfig.c,v 1.220 2009/08/07 18:53:37 dyoung Exp $");
+__RCSID("$NetBSD: ifconfig.c,v 1.221 2010/11/04 23:31:12 pooka Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -541,7 +541,10 @@
const char *ifname;
#ifdef RUMP_ACTION
- rump_init();
+ int error;
+
+ if ((error = rumpclient_init()) != 0)
+ errx(1, "rump client init: %s", strerror(error));
#endif
memset(match, 0, sizeof(match));
