stv0g/netplika
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

whitespace, coding style and copyright updates

Browse source
This commit is contained in:
Steffen Vogel 2017-12-20 10:24:55 +01:00
parent ffbc1aee0c
commit 55702ae05b
21 changed files with 56 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config.h
View file

@ -1,7 +1,7 @@
/** Global configuration.
*
* @author Steffen Vogel <post@steffenvogel.de>
* @copyright 2014-2015, Steffen Vogel
* @copyright 2014-2017, Steffen Vogel
* @license GPLv3
*********************************************************************************/
@ -23,4 +23,4 @@ struct config {
/* Declared in main.c */
extern struct config cfg;
#endif
#endif

30
dist-maketable.c
View file

@ -40,7 +40,7 @@ double * readdoubles(FILE *fp, int *number)
x = calloc(limit, sizeof(double));
if (!x)
error(-1, 0, "Alloc");
size_t linelen = 0;
char *line;
@ -48,9 +48,9 @@ double * readdoubles(FILE *fp, int *number)
if (getline(&line, &linelen, fp) > 0) {
if (line[0] == '#' || line[0] == '\r' || line[0] == '\n')
continue;
fscanf(fp, "%lf", &x[i]);
++n;
}
else if (feof(fp))
@ -64,21 +64,21 @@ double * readdoubles(FILE *fp, int *number)
void arraystats(double *x, int limit, double *mu, double *sigma, double *rho)
{
int n=0, i;
double sumsquare=0.0, sum=0.0, top=0.0;
double sigma2=0.0;
int n = 0, i;
double sumsquare = 0.0, sum = 0.0, top = 0.0;
double sigma2 = 0.0;
for (i=0; i<limit; ++i){
sumsquare += x[i]*x[i];
for (i = 0; i < limit; ++i){
sumsquare += x[i] * x[i];
sum += x[i];
++n;
}
*mu = sum/(double)n;
*sigma = sqrt((sumsquare - (double)n*(*mu)*(*mu))/(double)(n-1));
*mu = sum / (double) n;
*sigma = sqrt((sumsquare - (double) n * (*mu) * (*mu)) / (double) (n-1));
for (i=1; i < n; ++i){
top += ((double)x[i]- *mu)*((double)x[i-1]- *mu);
for (i = 1; i < n; ++i){
top += ((double) x[i]- *mu) * ((double) x[i-1] - *mu);
sigma2 += ((double)x[i-1] - *mu)*((double)x[i-1] - *mu);
}
@ -202,7 +202,7 @@ main(int argc, char **argv)
}
} else {
fp = stdin;
}
}
x = readdoubles(fp, &limit);
if (limit <= 0) {
fprintf(stderr, "Nothing much read!\n");
@ -213,7 +213,7 @@ main(int argc, char **argv)
fprintf(stderr, "%d values, mu %10.4f, sigma %10.4f, rho %10.4f\n",
limit, mu, sigma, rho);
#endif
table = makedist(x, limit, mu, sigma);
free((void *) x);
cumulativedist(table, DISTTABLESIZE, &total);
@ -221,4 +221,4 @@ main(int argc, char **argv)
interpolatetable(inverse, TABLESIZE);
printtable(inverse, TABLESIZE);
return 0;
}*/
}*/

1
dist-maketable.h
View file

@ -22,6 +22,7 @@
#define TABLESIZE 16384/4
#define TABLEFACTOR 8192
#ifndef MINSHORT
#define MINSHORT -32768
#define MAXSHORT 32767

2
dist.c
View file

@ -5,7 +5,7 @@
* - https://github.com/thom311/libnl/blob/master/lib/route/qdisc/netem.c
*
* @author Steffen Vogel <post@steffenvogel.de>
* @copyright 2014-2015, Steffen Vogel
* @copyright 2014-2017, Steffen Vogel
* @license GPLv3
*********************************************************************************/

2
emulate.c
View file

@ -1,7 +1,7 @@
/** Setup and update netem qdisc.
*
* @author Steffen Vogel <post@steffenvogel.de>
* @copyright 2014-2015, Steffen Vogel
* @copyright 2014-2017, Steffen Vogel
* @license GPLv3
*********************************************************************************/

2
hist.c
View file

@ -1,7 +1,7 @@
/** Histogram functions.
*
* @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
* @copyright 2014-2015, Institute for Automation of Complex Power Systems, EONERC
* @copyright 2014-2017, Institute for Automation of Complex Power Systems, EONERC
* This file is part of S2SS. All Rights Reserved. Proprietary and confidential.
* Unauthorized copying of this file, via any medium is strictly prohibited.
*********************************************************************************/

2
hist.h
View file

@ -2,7 +2,7 @@
*
* @file
* @author Steffen Vogel <post@steffenvogel.de>
* @copyright 2014-2015, Steffen Vogel
* @copyright 2014-2017, Steffen Vogel
* @license GPLv3
*********************************************************************************/

24
main.c
View file

@ -1,7 +1,7 @@
/** Main routine.
*
* @author Steffen Vogel <post@steffenvogel.de>
* @copyright 2014-2015, Steffen Vogel
* @copyright 2014-2017, Steffen Vogel
* @license GPLv3
*********************************************************************************/
@ -44,7 +44,7 @@ void quit(int sig, siginfo_t *si, void *ptr)
}
int main(int argc, char *argv[])
{
{
if (argc < 2) {
printf( "usage: %s CMD [OPTIONS]\n"
" CMD can be one of:\n\n"
@ -68,10 +68,10 @@ int main(int argc, char *argv[])
" -d IF network interface\n"
"\n"
"netem util %s (built on %s %s)\n"
" Copyright 2015, Steffen Vogel <post@steffenvogel.de>\n", argv[0], VERSION, __DATE__, __TIME__);
" Copyright 2017, Steffen Vogel <post@steffenvogel.de>\n", argv[0], VERSION, __DATE__, __TIME__);
exit(EXIT_FAILURE);
}
}
/* Setup signals */
struct sigaction sa_quit = {
@ -82,10 +82,10 @@ int main(int argc, char *argv[])
sigemptyset(&sa_quit.sa_mask);
sigaction(SIGTERM, &sa_quit, NULL);
sigaction(SIGINT, &sa_quit, NULL);
/* Initialize PRNG for TCP sequence nos */
srand(time(NULL));
/* Parse Arguments */
char c, *endptr;
while ((c = getopt (argc-1, argv+1, "h:m:M:i:l:d:r:w:")) != -1) {
@ -108,11 +108,11 @@ int main(int argc, char *argv[])
case 'l':
cfg.limit = strtoul(optarg, &endptr, 10);
goto check;
case 'd':
cfg.dev = strdup(optarg);
break;
case '?':
if (optopt == 'c')
error(-1, 0, "Option -%c requires an argument.", optopt);
@ -124,13 +124,13 @@ int main(int argc, char *argv[])
default:
abort();
}
continue;
check:
if (optarg == endptr)
error(-1, 0, "Failed to parse parse option argument '-%c %s'", c, optarg);
}
char *cmd = argv[1];
if (!strcmp(cmd, "probe"))
@ -141,6 +141,6 @@ check:
return dist(argc-optind-1, argv+optind+1);
else
error(-1, 0, "Unknown command: %s", cmd);
return 0;
}
}

2
mark.c
View file

@ -9,7 +9,7 @@
*
* @author Steffen Vogel <post@steffenvogel.de>
* @authir D.J. Capelis
* @copyright 2014-2015, Steffen Vogel
* @copyright 2014-2017, Steffen Vogel
* @copyright 2007, Regents of the University of California
* @license GPLv3
*********************************************************************************/

2
netlink-private.h
View file

@ -5,7 +5,7 @@
* Based on libnl3 3.2.26
*
* @author Steffen Vogel <post@steffenvogel.de>
* @copyright 2014-2015, Steffen Vogel
* @copyright 2014-2017, Steffen Vogel
* @license GPLv3
*********************************************************************************/

2
probe.c
View file

@ -1,7 +1,7 @@
/** Probing for RTT, Loss, Duplication, Corruption.
*
* @author Steffen Vogel <post@steffenvogel.de>
* @copyright 2014-2015, Steffen Vogel
* @copyright 2014-2017, Steffen Vogel
* @license GPLv3
*********************************************************************************/

2
tc.c
View file

@ -1,7 +1,7 @@
/** Trafic Controller (TC) related functions
*
* @author Steffen Vogel <post@steffenvogel.de>
* @copyright 2014-2015, Steffen Vogel
* @copyright 2014-2017, Steffen Vogel
* @license GPLv3
*********************************************************************************/

2
tc.h
View file

@ -1,7 +1,7 @@
/** Trafic Controller (TC) related functions
*
* @author Steffen Vogel <post@steffenvogel.de>
* @copyright 2014-2015, Steffen Vogel
* @copyright 2014-2017, Steffen Vogel
* @license GPLv3
*********************************************************************************/

2
tcp.c
View file

@ -1,7 +1,7 @@
/** Userspace TCP functions.
*
* @author Steffen Vogel <post@steffenvogel.de>
* @copyright 2014-2015, Steffen Vogel
* @copyright 2014-2017, Steffen Vogel
* @license GPLv3
*********************************************************************************/

2
tcp.h
View file

@ -1,7 +1,7 @@
/** Userspace TCP functions.
*
* @author Steffen Vogel <post@steffenvogel.de>
* @copyright 2014-2015, Steffen Vogel
* @copyright 2014-2017, Steffen Vogel
* @license GPLv3
*********************************************************************************/

2
timing.c
View file

@ -1,7 +1,7 @@
/** Time related functions.
*
* @author Steffen Vogel <post@steffenvogel.de>
* @copyright 2014-2015, Steffen Vogel
* @copyright 2014-2017, Steffen Vogel
* @license GPLv3
*********************************************************************************/

2
timing.h
View file

@ -1,7 +1,7 @@
/** Time related functions.
*
* @author Steffen Vogel <post@steffenvogel.de>
* @copyright 2014-2015, Steffen Vogel
* @copyright 2014-2017, Steffen Vogel
* @license GPLv3
*********************************************************************************/

2
ts.c
View file

@ -1,7 +1,7 @@
/** Hardware / Kernelspace Timestamping of network packets.
*
* @author Steffen Vogel <post@steffenvogel.de>
* @copyright 2014-2015, Steffen Vogel
* @copyright 2014-2017, Steffen Vogel
* @license GPLv3
*********************************************************************************/
#define _POSIX_C_SOURCE 199309L

2
ts.h
View file

@ -1,7 +1,7 @@
/** Hardware / Kernelspace Timestamping of network packets.
*
* @author Steffen Vogel <post@steffenvogel.de>
* @copyright 2014-2015, Steffen Vogel
* @copyright 2014-2017, Steffen Vogel
* @license GPLv3
*********************************************************************************/

18
utils.c
View file

@ -1,7 +1,7 @@
/** Utilities.
*
* @author Steffen Vogel <post@steffenvogel.de>
* @copyright 2014-2015, Steffen Vogel
* @copyright 2014-2017, Steffen Vogel
* @license GPLv3
*********************************************************************************/
@ -20,7 +20,7 @@
void hexdump(void *mem, unsigned int len)
{
unsigned int i, j;
for (i = 0; i < len + ((len % HEXDUMP_COLS) ? (HEXDUMP_COLS - len % HEXDUMP_COLS) : 0); i++) {
if (i % HEXDUMP_COLS == 0)
printf("0x%06x: ", i); /* print offset */
@ -29,18 +29,18 @@ void hexdump(void *mem, unsigned int len)
printf("%02x ", 0xFF & ((char*)mem)[i]); /* print hex data */
else
printf(" "); /* end of block, just aligning for ASCII dump */
/* print ASCII dump */
if (i % HEXDUMP_COLS == (HEXDUMP_COLS - 1)) {
for (j = i - (HEXDUMP_COLS - 1); j <= i; j++) {
if (j >= len) /* end of block, not really printing */
putchar(' ');
else if (isprint(((char*)mem)[j])) /* printable char */
putchar(0xFF & ((char*)mem)[j]);
putchar(0xFF & ((char*)mem)[j]);
else /* other char */
putchar('.');
}
putchar('\n');
}
}
@ -53,19 +53,19 @@ void * alloc(size_t bytes)
error(-1, 0, "Failed to allocate memory");
memset(p, 0, bytes);
return p;
}
int strap(char *dest, size_t size, const char *fmt, ...)
{
int ret;
va_list ap;
va_start(ap, fmt);
ret = vstrap(dest, size, fmt, ap);
va_end(ap);
return ret;
}
@ -74,4 +74,4 @@ int vstrap(char *dest, size_t size, const char *fmt, va_list ap)
int len = strlen(dest);
return vsnprintf(dest + len, size - len, fmt, ap);
}
}

4
utils.h
View file

@ -1,7 +1,7 @@
/** Utilities.
*
* @author Steffen Vogel <post@steffenvogel.de>
* @copyright 2014-2015, Steffen Vogel
* @copyright 2014-2017, Steffen Vogel
* @license GPLv3
* @file
*********************************************************************************/
@ -27,4 +27,4 @@ int strap(char *dest, size_t size, const char *fmt, ...);
/** Variadic version of strap() */
int vstrap(char *dest, size_t size, const char *fmt, va_list va);
#endif
#endif