Skip to content

Commit

Permalink
Remove pos sorting, support offset flag
Browse files Browse the repository at this point in the history
  • Loading branch information
ruti committed Mar 5, 2024
1 parent ff472f6 commit eb3f28b
Show file tree
Hide file tree
Showing 4 changed files with 100 additions and 108 deletions.
56 changes: 33 additions & 23 deletions desync.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#define memfd_create(name, flags) fileno(tmpfile())
#endif
#else
#include <windows.h>
#include <winsock2.h>
#include <ws2tcpip.h>
#endif
Expand Down Expand Up @@ -67,15 +68,15 @@ int setttl(int fd, int ttl, int family) {
}

#ifndef _WIN32
static inline void delay(long mk)
static inline void delay(long ms)
{
struct timespec time = {
.tv_nsec = mk * 1000
.tv_nsec = ms * 1000000
};
nanosleep(&time, 0);
}
#else
#define delay(mk) {}
#define delay(ms) Sleep(ms)
#endif

#ifndef _WIN32
Expand Down Expand Up @@ -204,27 +205,30 @@ int desync(int sfd, char *buffer, size_t bfsize,
return -1;
}
}
else if (type == IS_HTTPS && params.tlsrec) {
struct part *part = params.tlsrec;
int i = 0;
else if (type == IS_HTTPS && params.tlsrec_n) {
long lp = 0;
while (part) {
long pos = part->pos + i * 5;
if (params.tlsrec_sni) {
for (int i = 0; i < params.tlsrec_n; i++) {
struct part part = params.tlsrec[i];

long pos = part.pos + i * 5;
if (part.flag == OFFSET_SNI) {
pos += (host - buffer - 5);
}
else if (pos < 0) {
pos += n;
}
LOG(LOG_S, "tlsrec: pos=%ld, n=%ld\n", pos, n);
if (pos < lp) {
LOG(LOG_E, "tlsrec cancel: %ld < %ld\n", pos, lp);
break;
}
if (!part_tls(buffer + lp,
bfsize - lp, n - lp, pos - lp)) {
LOG(LOG_E, "tlsrec error: pos=%ld, n=%ld\n", pos, n);
break;
}
LOG(LOG_S, "tlsrec: pos=%ld, n=%ld\n", pos, n);
n += 5;
lp = pos + 5;
i++;
part = part->next;
}
}

Expand All @@ -233,30 +237,37 @@ int desync(int sfd, char *buffer, size_t bfsize,
return -1;
}
}
struct part *part = params.parts;
long lp = 0;

if ((!type && params.de_known)) {
part = 0;
}
while (part) {
long pos = part->pos;
if (params.split_host) {
if (host)
else for (int i = 0; i < params.parts_n; i++) {
struct part part = params.parts[i];

long pos = part.pos;
if (part.flag == OFFSET_SNI) {
if (type != IS_HTTPS)
break;
else
pos += (host - buffer);
}
else if (part.flag == OFFSET_HOST) {
if (type != IS_HTTP)
break;
else
pos += (host - buffer);
else
pos = 0;
}
else if (pos < 0) {
pos += n;
}
if (pos <= 0 || pos >= n || pos <= lp) {
LOG(LOG_E, "split cancel: pos=%ld-%ld, n=%ld\n", lp, pos, n);
break;
}
LOG(LOG_S, "split: pos=%ld-%ld, m=%d\n", lp, pos, part->m);
LOG(LOG_S, "split: pos=%ld-%ld, m=%d\n", lp, pos, part.m);

int s = 0;
switch (part->m) {
switch (part.m) {
#ifndef _WIN32
case DESYNC_FAKE:
s = send_fake(sfd,
Expand Down Expand Up @@ -284,7 +295,6 @@ int desync(int sfd, char *buffer, size_t bfsize,
return -1;
}
lp = pos;
part = part->next;
}
if (lp < n) {
LOG(LOG_S, "send: pos=%ld-%ld\n", lp, n);
Expand Down
116 changes: 50 additions & 66 deletions main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ oob_data = {

struct params params = {
.ttl = 8,
.parts_n = 0,
.parts = 0,
.sfdelay = 3000,
.split_host = 0,
.sfdelay = 3,
.def_ttl = 0,
.custom_ttl = 0,
.mod_http = 0,
.tlsrec = 0,
.tlsrec_sni = 0,
.tlsrec_n = 0,
.de_known = 0,

.ipv6 = 1,
Expand All @@ -72,21 +72,19 @@ const char help_text[] = {
" -g, --def-ttl <num> TTL for all outgoing connections\n"
// desync options
" -K, --desync-known Desync only HTTP and TLS with SNI\n"
" -H, --split-at-host Add Host/SNI offset to split position\n"
" -s, --split <offset> Split packet at spec position\n"
" -s, --disorder <offset> Split and send reverse order\n"
" -o, --oob <offset> Split and send as OOB data\n"
" -s, --split <n[+s]> Split packet at n, +s to add SNI offset\n"
" -s, --disorder <n[+s]> Split and send reverse order\n"
" -o, --oob <n[+s]> Split and send as OOB data\n"
#ifdef FAKE_SUPPORT
" -f, --fake <offset> Split and send fake packet\n"
" -f, --fake <n[+s]> Split and send fake packet\n"
" -t, --ttl <num> TTL of fake packets, default 8\n"
" -l, --fake-tls <file>\n"
" -j, --fake-http <file> Set custom fake packet\n"
" -n, --tls-sni <str> Change SNI in fake CH\n"
#endif
" -e, --oob-data <file> Set custom OOB data\n"
" -M, --mod-http <h,d,r> Modify http: hcsmix,dcsmix,rmspace\n"
" -r, --tlsrec <offset> Make TLS record at offset\n"
" -L, --tlsrec-at-sni Add SNI offset to tlsrec position\n"
" -r, --tlsrec <n[+s]> Make TLS record at offset\n"
};


Expand All @@ -103,21 +101,19 @@ const struct option options[] = {
{"debug", 1, 0, 'x'},

{"desync-known ", 0, 0, 'K'},
{"split-at-host", 0, 0, 'H'},
{"split", 1, 0, 's'},
{"disorder", 1, 0, 'd'},
{"oob", 1, 0, 'o'},
#ifdef FAKE_SUPPORT
{"fake", 1, 0, 'f'},
{"ttl", 1, 0, 't'},
#ifdef FAKE_SUPPORT
{"fake-tls", 1, 0, 'l'},
{"fake-http", 1, 0, 'j'},
{"tls-sni", 1, 0, 'n'},
#endif
{"oob-data", 1, 0, 'e'},
{"mod-http", 1, 0, 'M'},
{"tlsrec", 1, 0, 'r'},
{"tlsrec-at-sni", 0, 0, 'L'},
{"def-ttl", 1, 0, 'g'},
{"delay", 1, 0, 'w'}, //

Expand Down Expand Up @@ -195,41 +191,39 @@ int get_default_ttl()
}


struct part *add_part(struct part **root, long val)
struct part *add_part(struct part **root, int *n)
{
struct part *part = malloc(sizeof(struct part));
if (!part) {
uniperror("malloc");
return 0;
}
part->pos = val;

struct part *p = *root, *v = 0;
struct part *p = realloc(
*root, sizeof(struct part) * (*n + 1));
if (!p) {
*root = part;
return part;
uniperror("realloc");
return 0;
}
while (p) {
if (val < p->pos) {
if (v) {
part->next = p;
v->next = part;
}
else {
part->next = *root;
*root = part;
}
*root = p;
*n = *n + 1;
return &((*root)[(*n) - 1]);
}


int parse_offset(struct part *part, const char *str)
{
char *end = 0;
long val = strtol(str, &end, 0);
if (*end == '+') switch (*(end + 1)) {
case 's':
part->flag = OFFSET_SNI;
break;
}
if (!p->next) {
p->next = part;
part->next = 0;
case 'h':
part->flag = OFFSET_HOST;
break;
}
v = p;
p = p->next;
default:
return -1;
}
return part;
else if (*end) {
return -1;
}
part->pos = val;
return 0;
}


Expand Down Expand Up @@ -265,9 +259,6 @@ int main(int argc, char **argv)
}
}

char daemon = 0;
char *pidfile = 0;

int rez;
int invalid = 0;

Expand Down Expand Up @@ -340,23 +331,20 @@ int main(int argc, char **argv)
params.de_known = 1;
break;

case 'H':
params.split_host = 1;
break;

case 's':
case 'd':
case 'o':
case 'f':
val = strtol(optarg, &end, 0);
if (*end) {
invalid = 1;
break;
}
struct part *part = add_part(&params.parts, val);
;
struct part *part = add_part(
&params.parts, &params.parts_n);
if (!part) {
return -1;
}
if (parse_offset(part, optarg)) {
invalid = 1;
break;
}
switch (rez) {
case 's': part->m = DESYNC_SPLIT;
break;
Expand Down Expand Up @@ -431,19 +419,15 @@ int main(int argc, char **argv)
break;

case 'r':
val = strtol(optarg, &end, 0);
if (val > 0xffff || *end) {
invalid = 1;
break;
}
part = add_part(&params.tlsrec, val);
part = add_part(&params.tlsrec, &params.tlsrec_n);
if (!part) {
return -1;
}
break;

case 'L':
params.tlsrec_sni = 1;
if (parse_offset(part, optarg)
|| part->pos > 0xffff) {
invalid = 1;
break;
}
break;

case 'g':
Expand All @@ -459,7 +443,7 @@ int main(int argc, char **argv)
case 'w': //
params.sfdelay = strtol(optarg, &end, 0);
if (params.sfdelay < 0 || optarg == end
|| params.sfdelay >= 1000000 || *end)
|| params.sfdelay >= 1000 || *end)
invalid = 1;
break;

Expand Down
9 changes: 6 additions & 3 deletions params.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
#include <arpa/inet.h>
#endif

#define OFFSET_SNI 1
#define OFFSET_HOST 2

enum demode {
DESYNC_NONE,
DESYNC_SPLIT,
Expand All @@ -16,21 +19,21 @@ enum demode {

struct part {
int m;
int flag;
long pos;
struct part *next;
};

struct params {
char de_known;
int ttl;
int parts_n;
struct part *parts;
char split_host;
long sfdelay;
int def_ttl;
char custom_ttl;
int mod_http;
int tlsrec_n;
struct part *tlsrec;
char tlsrec_sni;

char ipv6;
char resolve;
Expand Down
Loading

0 comments on commit eb3f28b

Please sign in to comment.