[src/trunk]: src/sbin/ifconfig Update RUMP_ACTION to use the newstyle rump cl...

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

details:   https://anonhg.NetBSD.org/src/rev/57549a5e7ff4
branches:  trunk
changeset: 758443:57549a5e7ff4
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Nov 04 23:31:12 2010 +0000

description:
Update RUMP_ACTION to use the newstyle rump client.

diffstat:

 sbin/ifconfig/Makefile   |  8 +++-----
 sbin/ifconfig/env.h      |  1 +
 sbin/ifconfig/ifconfig.c |  9 ++++++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diffs (67 lines):

diff -r e47238a39f15 -r 57549a5e7ff4 sbin/ifconfig/Makefile
--- a/sbin/ifconfig/Makefile    Thu Nov 04 22:05:43 2010 +0000
+++ b/sbin/ifconfig/Makefile    Thu Nov 04 23:31:12 2010 +0000
@@ -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
 
diff -r e47238a39f15 -r 57549a5e7ff4 sbin/ifconfig/env.h
--- a/sbin/ifconfig/env.h       Thu Nov 04 22:05:43 2010 +0000
+++ b/sbin/ifconfig/env.h       Thu Nov 04 23:31:12 2010 +0000
@@ -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 */
diff -r e47238a39f15 -r 57549a5e7ff4 sbin/ifconfig/ifconfig.c
--- a/sbin/ifconfig/ifconfig.c  Thu Nov 04 22:05:43 2010 +0000
+++ b/sbin/ifconfig/ifconfig.c  Thu Nov 04 23:31:12 2010 +0000
@@ -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));