mirrors/GoodbyeDPI
1
0
Fork 0
mirror of https://github.com/ValdikSS/GoodbyeDPI.git synced 2025-01-03 04:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix warning: 'tcp_handle_outgoing' accessing 16 bytes in a region of size 4

Browse Source
This commit is contained in:
user 2024-10-06 12:27:55 +04:00
parent 810aef6aed
commit 6d9d6457d8
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dnsredir.c
View File

@ -197,8 +197,8 @@ int dns_is_dns_packet(const char *packet_data, const UINT packet_dataLen, const
return FALSE; return FALSE;
} }
int dns_handle_outgoing(const uint32_t srcip[4], const uint16_t srcport, int dns_handle_outgoing(const uint32_t* srcip, const uint16_t srcport,
const uint32_t dstip[4], const uint16_t dstport, const uint32_t* dstip, const uint16_t dstport,
const char *packet_data, const UINT packet_dataLen, const char *packet_data, const UINT packet_dataLen,
const uint8_t is_ipv6) const uint8_t is_ipv6)
{ {
@ -216,7 +216,7 @@ int dns_handle_outgoing(const uint32_t srcip[4], const uint16_t srcport,
return FALSE; return FALSE;
} }
int dns_handle_incoming(const uint32_t srcip[4], const uint16_t srcport, int dns_handle_incoming(const uint32_t* srcip, const uint16_t srcport,
const char *packet_data, const UINT packet_dataLen, const char *packet_data, const UINT packet_dataLen,
conntrack_info_t *conn_info, const uint8_t is_ipv6) conntrack_info_t *conn_info, const uint8_t is_ipv6)
{ {

6
src/dnsredir.h
View File

@ -24,12 +24,12 @@ inline static void ipv6_copy_addr(uint32_t dst[4], const uint32_t src[4]) {
dst[3] = src[3]; dst[3] = src[3];
} }
int dns_handle_incoming(const uint32_t srcip[4], const uint16_t srcport, int dns_handle_incoming(const uint32_t* srcip, const uint16_t srcport,
const char *packet_data, const UINT packet_dataLen, const char *packet_data, const UINT packet_dataLen,
conntrack_info_t *conn_info, const uint8_t is_ipv6); conntrack_info_t *conn_info, const uint8_t is_ipv6);
int dns_handle_outgoing(const uint32_t srcip[4], const uint16_t srcport, int dns_handle_outgoing(const uint32_t* srcip, const uint16_t srcport,
const uint32_t dstip[4], const uint16_t dstport, const uint32_t* dstip, const uint16_t dstport,
const char *packet_data, const UINT packet_dataLen, const char *packet_data, const UINT packet_dataLen,
const uint8_t is_ipv6 const uint8_t is_ipv6
); );

4
src/goodbyedpi.c
View File

@ -1455,8 +1455,8 @@ int main(int argc, char *argv[]) {
ppTcpHdr->SrcPort, ppTcpHdr->DstPort, ppTcpHdr->SrcPort, ppTcpHdr->DstPort,
0, ppIpHdr->TTL)) 0, ppIpHdr->TTL))
|| ||
(packet_v6 && tcp_handle_incoming((uint32_t*)&ppIpV6Hdr->SrcAddr, (packet_v6 && tcp_handle_incoming(ppIpV6Hdr->SrcAddr,
(uint32_t*)&ppIpV6Hdr->DstAddr, ppIpV6Hdr->DstAddr,
ppTcpHdr->SrcPort, ppTcpHdr->DstPort, ppTcpHdr->SrcPort, ppTcpHdr->DstPort,
1, ppIpV6Hdr->HopLimit)))) 1, ppIpV6Hdr->HopLimit))))
{ {

12
src/ttltrack.c
View File

@ -39,8 +39,8 @@ typedef struct tcp_connrecord {
static time_t last_cleanup = 0; static time_t last_cleanup = 0;
static tcp_connrecord_t *conntrack = NULL; static tcp_connrecord_t *conntrack = NULL;
inline static void fill_key_data(char *key, const uint8_t is_ipv6, const uint32_t srcip[4], inline static void fill_key_data(char *key, const uint8_t is_ipv6, const uint32_t* srcip,
const uint32_t dstip[4], const uint16_t srcport, const uint16_t dstport) const uint32_t* dstip, const uint16_t srcport, const uint16_t dstport)
{ {
unsigned int offset = 0; unsigned int offset = 0;
@ -94,7 +94,7 @@ inline static void fill_data_from_key(uint8_t *is_ipv6, uint32_t srcip[4], uint3
offset += sizeof(*dstport); offset += sizeof(*dstport);
} }
inline static void construct_key(const uint32_t srcip[4], const uint32_t dstip[4], inline static void construct_key(const uint32_t* srcip, const uint32_t* dstip,
const uint16_t srcport, const uint16_t dstport, const uint16_t srcport, const uint16_t dstport,
char *key, const uint8_t is_ipv6) char *key, const uint8_t is_ipv6)
{ {
@ -137,7 +137,7 @@ static int check_get_tcp_conntrack_key(const char *key, tcp_connrecord_t **connr
return FALSE; return FALSE;
} }
static int add_tcp_conntrack(const uint32_t srcip[4], const uint32_t dstip[4], static int add_tcp_conntrack(const uint32_t* srcip, const uint32_t* dstip,
const uint16_t srcport, const uint16_t dstport, const uint16_t srcport, const uint16_t dstport,
const uint8_t is_ipv6, const uint8_t ttl const uint8_t is_ipv6, const uint8_t ttl
) )
@ -180,7 +180,7 @@ static void tcp_cleanup() {
} }
} }
int tcp_handle_incoming(uint32_t srcip[4], uint32_t dstip[4], int tcp_handle_incoming(const uint32_t* srcip, const uint32_t* dstip,
uint16_t srcport, uint16_t dstport, uint16_t srcport, uint16_t dstport,
uint8_t is_ipv6, uint8_t ttl) uint8_t is_ipv6, uint8_t ttl)
{ {
@ -193,7 +193,7 @@ int tcp_handle_incoming(uint32_t srcip[4], uint32_t dstip[4],
return FALSE; return FALSE;
} }
int tcp_handle_outgoing(uint32_t srcip[4], uint32_t dstip[4], int tcp_handle_outgoing(const uint32_t* srcip, const uint32_t* dstip,
uint16_t srcport, uint16_t dstport, uint16_t srcport, uint16_t dstport,
tcp_conntrack_info_t *conn_info, tcp_conntrack_info_t *conn_info,
uint8_t is_ipv6) uint8_t is_ipv6)

4
src/ttltrack.h
View File

@ -12,11 +12,11 @@ typedef struct tcp_conntrack_info {
uint16_t dstport; uint16_t dstport;
} tcp_conntrack_info_t; } tcp_conntrack_info_t;
int tcp_handle_incoming(uint32_t srcip[4], uint32_t dstip[4], int tcp_handle_incoming(const uint32_t* srcip, const uint32_t* dstip,
uint16_t srcport, uint16_t dstport, uint16_t srcport, uint16_t dstport,
uint8_t is_ipv6, uint8_t ttl); uint8_t is_ipv6, uint8_t ttl);
int tcp_handle_outgoing(uint32_t srcip[4], uint32_t dstip[4], int tcp_handle_outgoing(const uint32_t* srcip, const uint32_t* dstip,
uint16_t srcport, uint16_t dstport, uint16_t srcport, uint16_t dstport,
tcp_conntrack_info_t *conn_info, tcp_conntrack_info_t *conn_info,
uint8_t is_ipv6); uint8_t is_ipv6);