git://git.onelab.eu
/
util-vserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.30.214.
[util-vserver.git]
/
lib
/
syscall_netadd.c
diff --git
a/lib/syscall_netadd.c
b/lib/syscall_netadd.c
index
0d13c32
..
fdc0167
100644
(file)
--- a/
lib/syscall_netadd.c
+++ b/
lib/syscall_netadd.c
@@
-1,4
+1,4
@@
-// $Id: syscall_netadd.c
,v 1.1 2004/04/22 20:46:43 ensc Exp
$ --*- c -*--
+// $Id: syscall_netadd.c
2578 2007-08-08 20:05:26Z dhozac
$ --*- c -*--
// Copyright (C) 2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
//
// Copyright (C) 2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
//
@@
-20,23
+20,34
@@
# include <config.h>
#endif
# include <config.h>
#endif
+#include <string.h>
+
#include "vserver.h"
#include "vserver.h"
+#include "virtual.h"
+
+#if defined(VC_ENABLE_API_NET) && defined(VC_ENABLE_API_NETV2)
+# define VC_MULTIVERSION_SYSCALL 1
+#endif
#include "vserver-internal.h"
#include "vserver-internal.h"
-#include "linuxvirtual.h"
#if defined(VC_ENABLE_API_NET)
# include "syscall_netadd-net.hc"
#endif
#if defined(VC_ENABLE_API_NET)
# include "syscall_netadd-net.hc"
#endif
-#if defined(VC_ENABLE_API_NET) && 0
+#if defined(VC_ENABLE_API_NETV2)
+# include "syscall_netadd-netv2.hc"
+#endif
+
+#if defined(VC_ENABLE_API_NET) || defined(VC_ENABLE_API_NETV2)
int
int
-vc_net_add(nid_t nid, struct vc_net_
nx
const *info)
+vc_net_add(nid_t nid, struct vc_net_
addr
const *info)
{
if (info==0) {
errno = EFAULT;
return -1;
}
{
if (info==0) {
errno = EFAULT;
return -1;
}
- CALL_VC(CALL_VC_NET(vc_net_add, nid, info));
+ CALL_VC(CALL_VC_NETV2(vc_net_add, nid, info),
+ CALL_VC_NET (vc_net_add, nid, info));
}
#endif
}
#endif