X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fkernel%2Fnetwork.h;h=2771f136b29847463b926ae05f88281a4d565cf5;hb=842a918cb9bcdd3b1c79dd980d2f9638b0cd6742;hp=e77866b5f1c2d6fd482f64461148d5c621918c51;hpb=9ceb769f44b3325c76fc7e51912422f4b74f733d;p=util-vserver.git diff --git a/util-vserver/kernel/network.h b/util-vserver/kernel/network.h index e77866b..2771f13 100644 --- a/util-vserver/kernel/network.h +++ b/util-vserver/kernel/network.h @@ -1,28 +1,51 @@ #ifndef _VX_NETWORK_H #define _VX_NETWORK_H +#include + + #define MAX_N_CONTEXT 65535 /* Arbitrary limit */ #define NX_DYNAMIC_ID ((uint32_t)-1) /* id for dynamic context */ #define NB_IPV4ROOT 16 + +/* network flags */ + +#define NXF_STATE_SETUP (1ULL<<32) + +#define NXF_SC_HELPER (1ULL<<36) + +#define NXF_ONE_TIME (0x0001ULL<<32) + +#define NXF_INIT_SET (0) + + +/* address types */ + +#define NXA_TYPE_IPV4 1 +#define NXA_TYPE_IPV6 2 + +#define NXA_MOD_BCAST (1<<8) + +#define NXA_TYPE_ANY (~0) + + #ifdef __KERNEL__ #include #include -#include #include -#include #include struct nx_info { struct hlist_node nx_hlist; /* linked list of nxinfos */ - struct rcu_head nx_rcu; /* the rcu head */ nid_t nx_id; /* vnet id */ atomic_t nx_usecnt; /* usage count */ - atomic_t nx_refcnt; /* reference count */ + atomic_t nx_tasks; /* tasks count */ + int nx_state; /* context state */ uint64_t nx_flags; /* network flag word */ uint64_t nx_ncaps; /* network capabilities */ @@ -41,19 +64,21 @@ struct nx_info { }; -struct rcu_head; +/* status flags */ -extern void rcu_free_nx_info(struct rcu_head *); -extern void unhash_nx_info(struct nx_info *); +#define NXS_HASHED 0x0001 +#define NXS_SHUTDOWN 0x0100 +#define NXS_RELEASED 0x8000 -extern struct nx_info *locate_nx_info(int); -extern struct nx_info *locate_or_create_nx_info(int); +extern struct nx_info *lookup_nx_info(int); extern int get_nid_list(int, unsigned int *, int); -extern int nx_info_is_hashed(nid_t); +extern int nid_is_hashed(nid_t); extern int nx_migrate_task(struct task_struct *, struct nx_info *); +extern long vs_net_change(struct nx_info *, unsigned int); + struct in_ifaddr; struct net_device; @@ -64,89 +89,7 @@ struct sock; int nx_addr_conflict(struct nx_info *, uint32_t, struct sock *); - -#endif /* __KERNEL__ */ - -#include "switch.h" - -/* vinfo commands */ - -#define VCMD_task_nid VC_CMD(VINFO, 2, 0) - -#ifdef __KERNEL__ -extern int vc_task_nid(uint32_t, void __user *); - -#endif /* __KERNEL__ */ - -#define VCMD_nx_info VC_CMD(VINFO, 6, 0) - -struct vcmd_nx_info_v0 { - uint32_t nid; - /* more to come */ -}; - -#ifdef __KERNEL__ -extern int vc_nx_info(uint32_t, void __user *); - #endif /* __KERNEL__ */ - -#define VCMD_net_create VC_CMD(VNET, 1, 0) -#define VCMD_net_migrate VC_CMD(NETMIG, 1, 0) - -#define VCMD_net_add VC_CMD(NETALT, 1, 0) -#define VCMD_net_remove VC_CMD(NETALT, 2, 0) - -struct vcmd_net_nx_v0 { - uint16_t type; - uint16_t count; - uint32_t ip[4]; - uint32_t mask[4]; - /* more to come */ -}; - -// IPN_TYPE_IPV4 - - -#ifdef __KERNEL__ -extern int vc_net_create(uint32_t, void __user *); -extern int vc_net_migrate(uint32_t, void __user *); - -#endif /* __KERNEL__ */ - -#define VCMD_get_nflags VC_CMD(FLAGS, 5, 0) -#define VCMD_set_nflags VC_CMD(FLAGS, 6, 0) - -struct vcmd_net_flags_v0 { - uint64_t flagword; - uint64_t mask; -}; - -#ifdef __KERNEL__ -extern int vc_get_nflags(uint32_t, void __user *); -extern int vc_set_nflags(uint32_t, void __user *); - -#endif /* __KERNEL__ */ - -#define IPF_STATE_SETUP (1ULL<<32) - - -#define IPF_ONE_TIME (0x0001ULL<<32) - -#define VCMD_get_ncaps VC_CMD(FLAGS, 7, 0) -#define VCMD_set_ncaps VC_CMD(FLAGS, 8, 0) - -struct vcmd_net_caps_v0 { - uint64_t ncaps; - uint64_t cmask; -}; - -#ifdef __KERNEL__ -extern int vc_get_ncaps(uint32_t, void __user *); -extern int vc_set_ncaps(uint32_t, void __user *); - -#endif /* __KERNEL__ */ - -#define IPC_WOSSNAME 0x00000001 - - +#else /* _VX_NETWORK_H */ +#warning duplicate inclusion #endif /* _VX_NETWORK_H */