Merge 0.30.214.

[util-vserver.git] / kernel / network.h

diff --git a/kernel/network.h b/kernel/network.h
index 073bc68..e6d7784 100644 (file)
--- a/kernel/network.h
+++ b/kernel/network.h
@@ -6,35 +6,43 @@
 
 #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_INFO_LOCK          0x00000001
+#define NXF_INFO_PRIVATE       0x00000008
+
+#define NXF_SINGLE_IP          0x00000100
 
-#define NXF_STATE_SETUP                (1ULL<<32)
-#define NXF_STATE_ADMIN                (1ULL<<34)
+#define NXF_HIDE_NETIF         0x02000000
 
-#define NXF_SC_HELPER          (1ULL<<36)
-#define NXF_PERSISTENT         (1ULL<<38)
+#define NXF_STATE_SETUP                (1ULL << 32)
+#define NXF_STATE_ADMIN                (1ULL << 34)
 
-#define NXF_ONE_TIME           (0x0005ULL<<32)
+#define NXF_SC_HELPER          (1ULL << 36)
+#define NXF_PERSISTENT         (1ULL << 38)
+
+#define NXF_ONE_TIME           (0x0005ULL << 32)
 
 #define NXF_INIT_SET           (NXF_STATE_ADMIN)
 
 
 /* address types */
 
-#define NXA_TYPE_IPV4          1
-#define NXA_TYPE_IPV6          2
+#define NXA_TYPE_IPV4          0x0001
+#define NXA_TYPE_IPV6          0x0002
 
-#define NXA_MOD_BCAST          (1<<8)
+#define NXA_TYPE_NONE          0x0000
+#define NXA_TYPE_ANY           0x00FF
 #define NXA_MOD_ALL            (1<<9)
 
-#define NXA_TYPE_ANY           ((uint16_t)-1)
+#define NXA_TYPE_ADDR          0x0003
+#define NXA_TYPE_MASK          0x0013
+#define NXA_TYPE_RANGE         0x0023
+
+#define NXA_MOD_BCAST          0x0100
+#define NXA_MOD_LBACK          0x0200
 
 
 #else  /* _VX_NETWORK_H */