1
0
mirror of https://github.com/yarrick/iodine.git synced 2024-11-29 08:26:08 +03:00

#7 finally done\! Added autoprobing of max downstream fragsize.

This commit is contained in:
Erik Ekman 2009-01-10 19:30:55 +00:00 committed by Erik Ekman
parent df93da00c6
commit bd1a8443d1
2 changed files with 62 additions and 2 deletions

View File

@ -22,6 +22,8 @@ CHANGES:
- Netmask size is now adjustable. Setting a small net will reduce the - Netmask size is now adjustable. Setting a small net will reduce the
number of users. Use x.x.x.x/n notation on iodined tunnel ip. number of users. Use x.x.x.x/n notation on iodined tunnel ip.
This fixes #27. This fixes #27.
- Downstream data is now fragmented, and the fragment size is auto-
probed after login. Fixes #7. It only took a few years :)
2008-08-06: 0.4.2 "Opened Zone" 2008-08-06: 0.4.2 "Opened Zone"
- Applied a few small patches from Maxim Bourmistrov and Gregor Herrmann - Applied a few small patches from Maxim Bourmistrov and Gregor Herrmann

View File

@ -409,6 +409,28 @@ send_ping(int fd)
send_packet(fd, 'P', data, sizeof(data)); send_packet(fd, 'P', data, sizeof(data));
} }
static void
send_fragsize_probe(int fd, int fragsize)
{
char probedata[256];
char buf[4096];
/* build a large query domain which is random and maximum size */
memset(probedata, MIN(1, rand_seed & 0xff), sizeof(probedata));
probedata[1] = MIN(1, (rand_seed >> 8) & 0xff);
rand_seed++;
build_hostname(buf + 4, sizeof(buf) - 4, probedata, sizeof(probedata), topdomain, dataenc);
fragsize &= 2047;
buf[0] = 'r'; /* Probe downstream fragsize packet */
buf[1] = b32_5to8((userid << 1) | (fragsize & 1024));
buf[2] = b32_5to8((fragsize >> 5) & 31);
buf[3] = b32_5to8(fragsize & 31);
send_query(fd, buf);
}
static void static void
send_set_downstream_fragsize(int fd, int fragsize) send_set_downstream_fragsize(int fd, int fragsize)
{ {
@ -677,8 +699,44 @@ codec_revert:
dataenc = get_base32_encoder(); dataenc = get_base32_encoder();
autodetect_max_fragsize: autodetect_max_fragsize:
if (autodetect_frag_size) { if (autodetect_frag_size) {
printf("Autoprobing max downstream fragment size...\n"); int proposed_fragsize = 768;
/* TODO */ int range = 768;
max_downstream_frag_size = 0;
printf("Autoprobing max downstream fragment size... (skip with -m fragsize)\n");
while (range >= 8 || !max_downstream_frag_size) {
for (i=0; running && i<3 ;i++) {
tv.tv_sec = 1;
tv.tv_usec = 0;
send_fragsize_probe(dns_fd, proposed_fragsize);
FD_ZERO(&fds);
FD_SET(dns_fd, &fds);
r = select(dns_fd + 1, &fds, NULL, NULL, &tv);
if(r > 0) {
read = read_dns(dns_fd, in, sizeof(in));
if (read > 0) {
/* We got a reply */
int acked_fragsize = ((in[0] & 0xff) << 8) | (in[1] & 0xff);
if (acked_fragsize == proposed_fragsize) {
printf("%d ok.. ", acked_fragsize);
fflush(stdout);
max_downstream_frag_size = acked_fragsize;
range >>= 1;
proposed_fragsize += range;
continue;
}
}
}
}
printf("%d not ok.. ", proposed_fragsize);
fflush(stdout);
range >>= 1;
proposed_fragsize -= range;
}
printf("will use %d\n", max_downstream_frag_size);
} }
printf("Setting downstream fragment size to max %d...\n", max_downstream_frag_size); printf("Setting downstream fragment size to max %d...\n", max_downstream_frag_size);
for (i=0; running && i<5 ;i++) { for (i=0; running && i<5 ;i++) {