msg.broadcast = bcast;
for (i=0; i<nb; ++i) {
- msg.ip_mask_pair[i].ip = ips[i].ip;
- msg.ip_mask_pair[i].mask = ips[i].mask;
+ msg.nx_mask_pair[i].ip = ips[i].ip;
+ msg.nx_mask_pair[i].mask = ips[i].mask;
}
return vserver(VCMD_set_ipv4root, nb, &msg);
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-DIETPROGS += lib/testsuite/flags \
+DIETPROGS += lib/testsuite/cflags \
lib/testsuite/fmt
-check_PROGRAMS += lib/testsuite/flags \
+check_PROGRAMS += lib/testsuite/cflags \
lib/testsuite/fmt \
lib/testsuite/parselimit
-TESTS += lib/testsuite/flags \
+TESTS += lib/testsuite/cflags \
lib/testsuite/fmt \
lib/testsuite/parselimit
-lib_testsuite_flags_SOURCES = lib/testsuite/flags.c
-lib_testsuite_flags_LDADD = lib/libvserver.la
-lib_testsuite_flags_LDFLAGS = $(VSERVER_LDFLAGS)
+lib_testsuite_cflags_SOURCES = lib/testsuite/cflags.c
+lib_testsuite_cflags_LDADD = lib/libvserver.la
+lib_testsuite_cflags_LDFLAGS = $(VSERVER_LDFLAGS)
lib_testsuite_fmt_SOURCES = lib/testsuite/fmt.c
lib_testsuite_fmt_LDADD = lib/libvserver.la
#include <assert.h>
#include <string.h>
-#define TEST_T2F_C(X,Y,Z) assert(vc_text2flag_compat(X,Y)==Z)
+#define TEST_T2F_C(X,Y,Z) assert(vc_text2cflag_compat(X,Y)==Z)
#define TEST_F2T_C(Y,X) { \
- char const *x=vc_hiflag2text_compat(X); \
+ char const *x=vc_hicflag2text_compat(X); \
assert((x==0 && Y==0) || (x!=0 && Y!=0)); \
if (x!=0) assert(strcmp(x, Y)==0); \
}
struct vc_err_listparser err; \
char buf[] = STR; \
uint32_t res; \
- res = vc_list2flag_compat(buf, LEN, &err); \
+ res = vc_list2cflag_compat(buf, LEN, &err); \
assert(res==(EXP)); \
assert(err.len==ERR_LEN); \
if (ERR_POS==-1) assert(err.ptr==0); \
//----
-#define TEST_T2F(X,Y,Z) assert(vc_text2flag(X,Y)==Z)
+#define TEST_T2F(X,Y,Z) assert(vc_text2cflag(X,Y)==Z)
#define TEST_F2T(Y,X) { \
uint_least64_t x = (X); \
- char const *rc=vc_loflag2text(&x); \
+ char const *rc=vc_locflag2text(&x); \
assert((rc==0 && Y==0) || (rc!=0 && Y!=0)); \
if (rc!=0) assert(strcmp(rc, Y)==0); \
}
char buf[] = STR; \
volatile int res; \
struct vc_ctx_flags flags = {0,0}; \
- res = vc_list2flag(buf, LEN, &err, &flags); \
+ res = vc_list2cflag(buf, LEN, &err, &flags); \
assert(res==(EXP_RES)); \
assert(flags.flagword==(EXP_FLAG)); \
assert(flags.mask ==(EXP_MASK)); \
*
* \returns the xid of the created context, or VC_NOCTX on errors. errno
* will be set appropriately. */
- xid_t vc_create_context(xid_t xid);
+ xid_t vc_ctx_create(xid_t xid);
/** \brief Moves the current process into the specified context.
* \ingroup syscalls
*
* \param xid The new context
* \returns 0 on success, -1 on errors */
- int vc_migrate_context(xid_t xid);
+ int vc_ctx_migrate(xid_t xid);
/* rlimit related functions */
size_t len;
};
- int vc_get_flags(xid_t xid, struct vc_ctx_flags *) VC_ATTR_NONNULL((2));
- int vc_set_flags(xid_t xid, struct vc_ctx_flags const *) VC_ATTR_NONNULL((2));
+ int vc_get_cflags(xid_t xid, struct vc_ctx_flags *) VC_ATTR_NONNULL((2));
+ int vc_set_cflags(xid_t xid, struct vc_ctx_flags const *) VC_ATTR_NONNULL((2));
int vc_get_ccaps(xid_t xid, struct vc_ctx_caps *);
int vc_set_ccaps(xid_t xid, struct vc_ctx_caps const *);
struct vc_err_listparser *err,
struct vc_ctx_caps *);
- int vc_list2flag(char const *, size_t len,
+ int vc_list2cflag(char const *, size_t len,
struct vc_err_listparser *err,
struct vc_ctx_flags *flags);
- uint_least64_t vc_text2flag(char const *, size_t len);
- char const * vc_loflag2text(uint_least64_t *);
+ uint_least64_t vc_text2cflag(char const *, size_t len);
+ char const * vc_locflag2text(uint_least64_t *);
- uint_least32_t vc_list2flag_compat(char const *, size_t len,
+ uint_least32_t vc_list2cflag_compat(char const *, size_t len,
struct vc_err_listparser *err);
- uint_least32_t vc_text2flag_compat(char const *, size_t len);
- char const * vc_hiflag2text_compat(uint_least32_t);
+ uint_least32_t vc_text2cflag_compat(char const *, size_t len);
+ char const * vc_hicflag2text_compat(uint_least32_t);
uint_least32_t vc_get_insecurecaps() VC_ATTR_CONST;
int vc_text2cap(char const *);