mirrors/byedpi
1
0
Fork 0
mirror of https://github.com/hufrea/byedpi.git synced 2024-12-22 14:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix usage of some misaligned pointers

Browse Source
This commit is contained in:
dartvader316 2024-08-05 19:49:51 +03:00
parent fe7f949209
commit f884b549d2
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packets.c
View File

@ -137,10 +137,14 @@ int change_tls_sni(const char *host, char *buffer, size_t bsize)
|| free_sz < diff) { || free_sz < diff) {
return -1; return -1;
} }
*(uint16_t *)(sni + 2) = htons(old_sz + diff + 5); uint16_t htons_sni2 = htons(old_sz + diff + 5);
*(uint16_t *)(sni + 4) = htons(old_sz + diff + 3); uint16_t htons_sni4 = htons(old_sz + diff + 3);
*(uint16_t *)(sni + 7) = htons(old_sz + diff); uint16_t htons_sni7 = htons(old_sz + diff);
*(uint16_t *)(pad + 2) = htons(free_sz - diff); uint16_t htons_pad2 = htons(old_sz - diff);
memcpy(sni + 2, &htons_sni2, sizeof(htons_sni2));
memcpy(sni + 4, &htons_sni4, sizeof(htons_sni4));
memcpy(sni + 7, &htons_sni7, sizeof(htons_sni7));
memcpy(pad + 2, &htons_pad2, sizeof(htons_pad2));
char *host_end = sni + 9 + old_sz; char *host_end = sni + 9 + old_sz;
int oth_sz = bsize - (sni_offs + 9 + old_sz); int oth_sz = bsize - (sni_offs + 9 + old_sz);
@ -410,7 +414,11 @@ int part_tls(char *buffer, size_t bsize, ssize_t n, long pos)
memmove(buffer + 5 + pos + 5, buffer + 5 + pos, n - (5 + pos)); memmove(buffer + 5 + pos + 5, buffer + 5 + pos, n - (5 + pos));
memcpy(buffer + 5 + pos, buffer, 3); memcpy(buffer + 5 + pos, buffer, 3);
*(uint16_t *)(buffer + 3) = htons(pos); uint16_t htons_pos = htons(pos);
*(uint16_t *)(buffer + 5 + pos + 3) = htons(r_sz - pos); memcpy(buffer + 3, &htons_pos, sizeof(htons_pos));
uint16_t htons_rsz_pos = htons(r_sz - pos);
memcpy(buffer + 5 + pos + 3, &htons_rsz_pos, sizeof(htons_rsz_pos));
return 5; return 5;
} }

2
proxy.c
View File

@ -274,7 +274,7 @@ int s5_get_addr(char *buffer, size_t n,
addr->in6.sin6_addr = r->i6; addr->in6.sin6_addr = r->i6;
} }
} }
addr->in.sin_port = *(uint16_t *)&buffer[o - 2]; memcpy(&addr->in.sin_port, &buffer[o - 2], sizeof(uint16_t));
return o; return o;
} }