X-Git-Url: http://git.onelab.eu/?p=ipfw.git;a=blobdiff_plain;f=dummynet2%2Finclude%2Fnetinet%2Fip_dummynet.h;fp=dummynet2%2Finclude%2Fnetinet%2Fip_dummynet.h;h=961f850ed7a49bc7c2da53154a6641a5669a9232;hp=6795d7c254a55210096836088526c638de0e1e0e;hb=28a7fe9d930667786b902af6697c01eb87694173;hpb=2a8b6c544cf5ea3c84f763144c7ecfa79daea969

diff --git a/dummynet2/include/netinet/ip_dummynet.h b/dummynet2/include/netinet/ip_dummynet.h
index 6795d7c..961f850 100644
--- a/dummynet2/include/netinet/ip_dummynet.h
+++ b/dummynet2/include/netinet/ip_dummynet.h
@@ -88,7 +88,7 @@ enum {
 
 	DN_LAST,
 };
- 
+
 enum { /* subtype for schedulers, flowset and the like */
 	DN_SCHED_UNKNOWN = 0,
 	DN_SCHED_FIFO = 1,
@@ -132,10 +132,10 @@ struct dn_link {
  */
 struct dn_fs {
 	struct dn_id oid;
-	uint32_t fs_nr;	/* the flowset number */
-	uint32_t flags;	/* userland flags */
-	int qsize;	/* queue size in slots or bytes */
-	int32_t plr;	/* PLR, pkt loss rate (2^31-1 means 100%) */
+	uint32_t fs_nr;		/* the flowset number */
+	uint32_t flags;		/* userland flags */
+	int qsize;		/* queue size in slots or bytes */
+	int32_t plr;		/* PLR, pkt loss rate (2^31-1 means 100%) */
 	uint32_t buckets;	/* buckets used for the queue hash table */
 
 	struct ipfw_flow_id flow_mask;
@@ -149,10 +149,10 @@ struct dn_fs {
 	 * weight and probabilities are in the range 0..1 represented
 	 * in fixed point arithmetic with SCALE_RED decimal bits.
 	 */
-#define SCALE_RED		16
-#define SCALE(x)		( (x) << SCALE_RED )
-#define SCALE_VAL(x)		( (x) >> SCALE_RED )
-#define SCALE_MUL(x,y)		( ( (x) * (y) ) >> SCALE_RED )
+#define SCALE_RED	16
+#define SCALE(x)	( (x) << SCALE_RED )
+#define SCALE_VAL(x)	( (x) >> SCALE_RED )
+#define SCALE_MUL(x,y)	( ( (x) * (y) ) >> SCALE_RED )
 	int w_q ;		/* queue weight (scaled) */
 	int max_th ;		/* maximum threshold for queue (scaled) */
 	int min_th ;		/* minimum threshold for queue (scaled) */
@@ -200,17 +200,15 @@ struct dn_sch {
 struct dn_profile {
 	struct dn_id	oid;
 	/* fields to simulate a delay profile */
-#define ED_MAX_NAME_LEN         32
-	char		name[ED_MAX_NAME_LEN];
-	int		link_nr;
-	int		loss_level;
-	int		bandwidth;	// XXX use link bandwidth?
-	int		samples_no;	/* actual length of samples[] */
-	int samples[ED_MAX_SAMPLES_NO]; /* may be shorter */
+#define ED_MAX_NAME_LEN		32
+	char	name[ED_MAX_NAME_LEN];
+	int	link_nr;
+	int	loss_level;
+	int	bandwidth;			// XXX use link bandwidth?
+	int	samples_no;			/* actual len of samples[] */
+	int	samples[0];			/* may be shorter */
 };
 
-
-
 /*
  * Overall structure of dummynet