miegl/glorytun
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Keep it simple and use the right tools

Browse Source
This commit is contained in:
angt
2015-11-27 07:56:40 +01:00
parent 2e7355bb92
commit e20be0ad97
1 changed files with 0 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/main.c
View File

@@ -35,7 +35,6 @@ struct fdbuf {
}; };
struct blk { struct blk {
uint8_t prio;
size_t size; size_t size;
uint8_t data[GT_MTU_MAX]; uint8_t data[GT_MTU_MAX];
}; };
@@ -638,8 +637,6 @@ int main (int argc, char **argv)
long ka_count = -1; long ka_count = -1;
long ka_idle = -1; long ka_idle = -1;
long ka_interval = -1; long ka_interval = -1;
long prio_dscp = 46;
long prio_size = (GT_TUNR_SIZE*3)/4;
#ifdef TCP_INFO #ifdef TCP_INFO
struct { struct {
@@ -655,12 +652,6 @@ int main (int argc, char **argv)
{ NULL }, { NULL },
}; };
struct option prio_opts[] = {
{ "dscp", &prio_dscp, option_long },
{ "size", &prio_size, option_long },
{ NULL },
};
struct option opts[] = { struct option opts[] = {
{ "listener", NULL, option_option }, { "listener", NULL, option_option },
{ "host", &host, option_str }, { "host", &host, option_str },
@@ -672,7 +663,6 @@ int main (int argc, char **argv)
{ "multiqueue", NULL, option_option }, { "multiqueue", NULL, option_option },
{ "keepalive", ka_opts, option_option }, { "keepalive", ka_opts, option_option },
{ "buffer-size", &buffer_size, option_long }, { "buffer-size", &buffer_size, option_long },
{ "priority", prio_opts, option_option },
{ "daemon", NULL, option_option }, { "daemon", NULL, option_option },
{ "debug", NULL, option_option }, { "debug", NULL, option_option },
{ "version", NULL, option_option }, { "version", NULL, option_option },
@@ -697,16 +687,6 @@ int main (int argc, char **argv)
gt_log("buffer size must be greater than 2048!\n"); gt_log("buffer size must be greater than 2048!\n");
} }
if (prio_size < 0) {
prio_size = 0;
gt_log("priority size must be positive!\n");
}
if (prio_size > GT_TUNR_SIZE) {
prio_size = GT_TUNR_SIZE;
gt_log("priority size must be less than or equal to %zu\n", GT_TUNR_SIZE);
}
if (sodium_init()==-1) { if (sodium_init()==-1) {
gt_log("libsodium initialization has failed!\n"); gt_log("libsodium initialization has failed!\n");
return 1; return 1;
@@ -737,7 +717,6 @@ int main (int argc, char **argv)
struct blk *blks = calloc(256, sizeof(struct blk)); struct blk *blks = calloc(256, sizeof(struct blk));
size_t blk_count = 0; size_t blk_count = 0;
size_t blk_prio = 0;
uint8_t blk_read = 0; uint8_t blk_read = 0;
uint8_t blk_write = 0; uint8_t blk_write = 0;
@@ -893,13 +872,6 @@ int main (int argc, char **argv)
} }
} }
if (ip_get_dscp(data, GT_MTU_MAX)==prio_dscp) {
blks[blk_write].prio = 1;
blk_prio++;
} else {
blks[blk_write].prio = 0;
}
blks[blk_write++].size = r; blks[blk_write++].size = r;
blk_count++; blk_count++;
} }
@@ -907,32 +879,6 @@ int main (int argc, char **argv)
buffer_shift(&tun.read); buffer_shift(&tun.read);
// XXX prio code needs a full rewrite :)
if (blk_prio) {
uint8_t k = blk_read;
while (blk_prio && buffer_read_size(&tun.read)<(size_t)prio_size) {
while (!blks[k].prio || !blks[k].size)
k++;
if (buffer_write_size(&tun.read)<blks[k].size)
break;
byte_cpy(tun.read.write, blks[k].data, blks[k].size);
tun.read.write += blks[k].size;
blks[k].size = 0;
blk_count--;
blk_prio--;
if (blk_read==k)
blk_read++;
k++;
}
}
while (blk_count) { while (blk_count) {
if (!blks[blk_read].size) { if (!blks[blk_read].size) {
blk_read++; blk_read++;
@@ -945,9 +891,6 @@ int main (int argc, char **argv)
byte_cpy(tun.read.write, blks[blk_read].data, blks[blk_read].size); byte_cpy(tun.read.write, blks[blk_read].data, blks[blk_read].size);
tun.read.write += blks[blk_read].size; tun.read.write += blks[blk_read].size;
if (blks[blk_read].prio)
blk_prio--;
blks[blk_read++].size = 0; blks[blk_read++].size = 0;
blk_count--; blk_count--;
} }