X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Fnetwork.h;fp=kernel%2Fnetwork.h;h=2b84f07ddf1c582fac5da502bb73817799c1ea67;hb=52ab297203286190e6eff8a0675967a42c5b20f2;hp=4841f9fa1d0d0e677b2db4177b3cf247853fec53;hpb=69c048e18d1630eea2d5c55f7c5acbdcacba846e;p=util-vserver.git diff --git a/kernel/network.h b/kernel/network.h index 4841f9f..2b84f07 100644 --- a/kernel/network.h +++ b/kernel/network.h @@ -36,107 +36,6 @@ #define NXA_TYPE_ANY ((uint16_t)-1) -#ifdef __KERNEL__ - -#include -#include -#include -#include - - -struct nx_info { - struct hlist_node nx_hlist; /* linked list of nxinfos */ - nid_t nx_id; /* vnet id */ - atomic_t nx_usecnt; /* usage 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 */ - - int nbipv4; - __u32 ipv4[NB_IPV4ROOT]; /* Process can only bind to these IPs */ - /* The first one is used to connect */ - /* and for bind any service */ - /* The other must be used explicity */ - __u32 mask[NB_IPV4ROOT]; /* Netmask for each ipv4 */ - /* Used to select the proper source */ - /* address for sockets */ - __u32 v4_bcast; /* Broadcast address to receive UDP */ - - char nx_name[65]; /* network context name */ -}; - - -/* status flags */ - -#define NXS_HASHED 0x0001 -#define NXS_SHUTDOWN 0x0100 -#define NXS_RELEASED 0x8000 - -/* check conditions */ - -#define NX_ADMIN 0x0001 -#define NX_WATCH 0x0002 -#define NX_BLEND 0x0004 -#define NX_HOSTID 0x0008 - -#define NX_IDENT 0x0010 -#define NX_EQUIV 0x0020 -#define NX_PARENT 0x0040 -#define NX_CHILD 0x0080 - -#define NX_ARG_MASK 0x00F0 - -#define NX_DYNAMIC 0x0100 -#define NX_STATIC 0x0200 - -#define NX_ATR_MASK 0x0F00 - - -extern struct nx_info *lookup_nx_info(int); - -extern int get_nid_list(int, unsigned int *, int); -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; - -#ifdef CONFIG_INET -int ifa_in_nx_info(struct in_ifaddr *, struct nx_info *); -int dev_in_nx_info(struct net_device *, struct nx_info *); - -#else /* CONFIG_INET */ -static inline -int ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n) -{ - return 1; -} - -static inline -int dev_in_nx_info(struct net_device *d, struct nx_info *n) -{ - return 1; -} -#endif /* CONFIG_INET */ - -struct sock; - -#ifdef CONFIG_INET -int nx_addr_conflict(struct nx_info *, uint32_t, struct sock *); -#else /* CONFIG_INET */ -static inline -int nx_addr_conflict(struct nx_info *n, uint32_t a, struct sock *s) -{ - return 1; -} -#endif /* CONFIG_INET */ - -#endif /* __KERNEL__ */ #else /* _VX_NETWORK_H */ #warning duplicate inclusion #endif /* _VX_NETWORK_H */