git://git.onelab.eu
/
ipfw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Grab the lock before reading uid/gid related structure, this will
[ipfw.git]
/
ipfw
/
dummynet.c
diff --git
a/ipfw/dummynet.c
b/ipfw/dummynet.c
index
e2c5ff1
..
12625fe
100644
(file)
--- a/
ipfw/dummynet.c
+++ b/
ipfw/dummynet.c
@@
-70,11
+70,12
@@
static struct _s_x dummynet_params[] = {
{ "src-ipv6", TOK_SRCIP6},
{ "src-ip6", TOK_SRCIP6},
{ "profile", TOK_PIPE_PROFILE},
{ "src-ipv6", TOK_SRCIP6},
{ "src-ip6", TOK_SRCIP6},
{ "profile", TOK_PIPE_PROFILE},
+ { "burst", TOK_BURST},
{ "dummynet-params", TOK_NULL },
{ NULL, 0 } /* terminator */
};
{ "dummynet-params", TOK_NULL },
{ NULL, 0 } /* terminator */
};
-/*
+/*
* XXX to be updated to the new version,
* without the global struct command_opts variable
*/
* XXX to be updated to the new version,
* without the global struct command_opts variable
*/
@@
-254,7
+255,7
@@
print_flowset_parms(struct dn_flow_set *fs, char *prefix)
}
static void
}
static void
-print_extra_delay_parms(struct dn_pipe *p
, char *prefix
)
+print_extra_delay_parms(struct dn_pipe *p)
{
double loss;
if (p->samples_no <= 0)
{
double loss;
if (p->samples_no <= 0)
@@
-262,8
+263,8
@@
print_extra_delay_parms(struct dn_pipe *p, char *prefix)
loss = p->loss_level;
loss /= p->samples_no;
loss = p->loss_level;
loss /= p->samples_no;
- printf("
%s
profile: name \"%s\" loss %f samples %d\n",
- p
refix, p
->name, loss, p->samples_no);
+ printf("
\t
profile: name \"%s\" loss %f samples %d\n",
+ p->name, loss, p->samples_no);
}
void
}
void
@@
-284,6
+285,7
@@
ipfw_list_pipes(void *data, uint nbytes, int ac, char *av[])
double b = p->bandwidth;
char buf[30];
char prefix[80];
double b = p->bandwidth;
char buf[30];
char prefix[80];
+ char burst[5 + 7];
if (SLIST_NEXT(p, next) != (struct dn_pipe *)DN_IS_PIPE)
break; /* done with pipes, now queues */
if (SLIST_NEXT(p, next) != (struct dn_pipe *)DN_IS_PIPE)
break; /* done with pipes, now queues */
@@
-315,10
+317,16
@@
ipfw_list_pipes(void *data, uint nbytes, int ac, char *av[])
sprintf(prefix, "%05d: %s %4d ms ",
p->pipe_nr, buf, p->delay);
sprintf(prefix, "%05d: %s %4d ms ",
p->pipe_nr, buf, p->delay);
- print_extra_delay_parms(p, prefix);
-
print_flowset_parms(&(p->fs), prefix);
print_flowset_parms(&(p->fs), prefix);
+ if (humanize_number(burst, sizeof(burst), p->burst,
+ "Byte", HN_AUTOSCALE, 0) < 0 || co.verbose)
+ printf("\t burst: %ju Byte\n", p->burst);
+ else
+ printf("\t burst: %s\n", burst);
+
+ print_extra_delay_parms(p);
+
q = (struct dn_flow_queue *)(p+1);
list_queues(&(p->fs), q);
}
q = (struct dn_flow_queue *)(p+1);
list_queues(&(p->fs), q);
}
@@
-645,6
+653,8
@@
load_extra_delays(const char *filename, struct dn_pipe *p)
}
}
}
}
+ fclose (f);
+
if (samples == -1) {
warnx("'%s' not found, assuming 100", ED_TOK_SAMPLES);
samples = 100;
if (samples == -1) {
warnx("'%s' not found, assuming 100", ED_TOK_SAMPLES);
samples = 100;
@@
-938,6
+948,21
@@
end_mask:
--ac; ++av;
break;
--ac; ++av;
break;
+ case TOK_BURST:
+ if (co.do_pipe != 1)
+ errx(EX_DATAERR, "burst only valid for pipes");
+ NEED1("burst needs argument\n");
+ errno = 0;
+ if (expand_number(av[0], (int64_t *)&p.burst) < 0)
+ if (errno != ERANGE)
+ errx(EX_DATAERR,
+ "burst: invalid argument");
+ if (errno || p.burst > (1ULL << 48) - 1)
+ errx(EX_DATAERR,
+ "burst: out of range (0..2^48-1)");
+ ac--; av++;
+ break;
+
default:
errx(EX_DATAERR, "unrecognised option ``%s''", av[-1]);
}
default:
errx(EX_DATAERR, "unrecognised option ``%s''", av[-1]);
}