mirrors/youtubeUnblock
1
0
Fork 0
mirror of https://github.com/Waujito/youtubeUnblock.git synced 2024-12-22 06:15:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix GCC warnings

Browse Source
This commit is contained in:
Vadim Vetrov 2024-12-08 22:35:29 +03:00
parent 42e6d574a0
commit 8b602a9f44
No known key found for this signature in database
GPG Key ID: E8A308689D7A73A5
5 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
args.c
View File

@ -88,7 +88,6 @@ static long parse_numeric_option(const char* value) {
} }
static int parse_udp_dport_range(char *str, struct udp_dport_range **udpr, int *udpr_len) { static int parse_udp_dport_range(char *str, struct udp_dport_range **udpr, int *udpr_len) {
int ret = 0;
int seclen = 1; int seclen = 1;
const char *p = str; const char *p = str;
while (*p != '\0') { while (*p != '\0') {
@ -762,10 +761,12 @@ int yparse_args(int argc, char *argv[]) {
errno = 0; errno = 0;
return 0; return 0;
#ifndef KERNEL_SPACE
stop_exec: stop_exec:
free_config(rep_config); free_config(rep_config);
errno = 0; errno = 0;
return 1; return 1;
#endif
invalid_opt: invalid_opt:
printf("Invalid option %s\n", long_opt[optIdx].name); printf("Invalid option %s\n", long_opt[optIdx].name);
@ -995,10 +996,13 @@ size_t print_config(char *buffer, size_t buffer_size) {
} }
void print_welcome(void) { void print_welcome(void) {
char welcome_message[4000]; char *welcome_message = malloc(4000);
if (welcome_message == NULL)
return;
size_t sz = print_config(welcome_message, 4000); size_t sz = print_config(welcome_message, 4000);
printf("Running with flags: %.*s\n", (int)sz, welcome_message); printf("Running with flags: %.*s\n", (int)sz, welcome_message);
free(welcome_message);
return; return;
/** /**
if (config.syslog) { if (config.syslog) {

4
kargs.c
View File

@ -6,6 +6,7 @@
#include "logging.h" #include "logging.h"
#define MAX_ARGC 1024 #define MAX_ARGC 1024
static char *argv[MAX_ARGC];
static int params_set(const char *cval, const struct kernel_param *kp) { static int params_set(const char *cval, const struct kernel_param *kp) {
int ret = 0; int ret = 0;
@ -25,7 +26,6 @@ static int params_set(const char *cval, const struct kernel_param *kp) {
val[len] = '\0'; val[len] = '\0';
int argc = 0; int argc = 0;
char *argv[MAX_ARGC];
argv[argc++] = val; argv[argc++] = val;
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
@ -40,7 +40,7 @@ static int params_set(const char *cval, const struct kernel_param *kp) {
} }
for (int i = 0; i < argc; i++) { for (int i = 0; i < argc; i++) {
lginfo("%s %d\n", argv[i], strlen(argv[i])); lginfo("%s %lu\n", argv[i], strlen(argv[i]));
} }
ret = yparse_args(argc, argv); ret = yparse_args(argc, argv);

10
mangle.c
View File

@ -341,7 +341,6 @@ int process_udp_packet(const struct section_config_t *section, const uint8_t *pk
const struct udphdr *udph; const struct udphdr *udph;
const uint8_t *data; const uint8_t *data;
uint32_t dlen; uint32_t dlen;
int ipver = netproto_version(pkt, pktlen);
int ret = udp_payload_split((uint8_t *)pkt, pktlen, int ret = udp_payload_split((uint8_t *)pkt, pktlen,
(void **)&iph, &iph_len, (void **)&iph, &iph_len,
@ -414,7 +413,6 @@ erret_lc:
continue_flow: continue_flow:
return PKT_CONTINUE; return PKT_CONTINUE;
accept_quic:
accept: accept:
return PKT_ACCEPT; return PKT_ACCEPT;
drop: drop:
@ -452,6 +450,7 @@ int send_ip4_frags(const struct section_config_t *section, const uint8_t *packet
return -ENOMEM; return -ENOMEM;
} }
/*
NETBUF_ALLOC(fake_pad, MAX_PACKET_SIZE); NETBUF_ALLOC(fake_pad, MAX_PACKET_SIZE);
if (!NETBUF_CHECK(fake_pad)) { if (!NETBUF_CHECK(fake_pad)) {
lgerror(-ENOMEM, "Allocation error"); lgerror(-ENOMEM, "Allocation error");
@ -459,10 +458,11 @@ int send_ip4_frags(const struct section_config_t *section, const uint8_t *packet
NETBUF_FREE(frag2); NETBUF_FREE(frag2);
return -ENOMEM; return -ENOMEM;
} }
*/
uint32_t f1len = MAX_PACKET_SIZE; uint32_t f1len = MAX_PACKET_SIZE;
uint32_t f2len = MAX_PACKET_SIZE; uint32_t f2len = MAX_PACKET_SIZE;
uint32_t fake_pad_len = MAX_PACKET_SIZE; // uint32_t fake_pad_len = MAX_PACKET_SIZE;
int ret; int ret;
@ -538,12 +538,12 @@ send_frag2:
out_lc: out_lc:
NETBUF_FREE(frag1); NETBUF_FREE(frag1);
NETBUF_FREE(frag2); NETBUF_FREE(frag2);
NETBUF_FREE(fake_pad); // NETBUF_FREE(fake_pad);
goto out; goto out;
erret_lc: erret_lc:
NETBUF_FREE(frag1); NETBUF_FREE(frag1);
NETBUF_FREE(frag2); NETBUF_FREE(frag2);
NETBUF_FREE(fake_pad); // NETBUF_FREE(fake_pad);
return ret; return ret;
} }

7
quic.c
View File

@ -191,8 +191,6 @@ int gen_fake_udp(struct udp_fake_type type,
const struct udphdr *udph, const struct udphdr *udph,
uint8_t *buf, uint32_t *buflen) { uint8_t *buf, uint32_t *buflen) {
uint32_t data_len = type.fake_len; uint32_t data_len = type.fake_len;
int ret;
if (!ipxh || !udph || !buf || !buflen) if (!ipxh || !udph || !buf || !buflen)
return -EINVAL; return -EINVAL;
@ -256,9 +254,6 @@ int detect_udp_filtered(const struct section_config_t *section,
const uint8_t *data; const uint8_t *data;
uint32_t dlen; uint32_t dlen;
int ret; int ret;
int ipver;
ipver = netproto_version(payload, plen);
ret = udp_payload_split((uint8_t *)payload, plen, ret = udp_payload_split((uint8_t *)payload, plen,
(void **)&iph, &iph_len, (void **)&iph, &iph_len,
@ -291,10 +286,10 @@ int detect_udp_filtered(const struct section_config_t *section,
} }
lgtrace_addp("QUIC detected"); lgtrace_addp("QUIC detected");
uint8_t qtype = qch->type;
goto approve; goto approve;
// uint8_t qtype = qch->type;
// if (qch->version == QUIC_V1) // if (qch->version == QUIC_V1)
// qtype = quic_convtype_v1(qtype); // qtype = quic_convtype_v1(qtype);
// else if (qch->version == QUIC_V2) // else if (qch->version == QUIC_V2)

11
tls.c
View File

@ -134,13 +134,12 @@ struct tls_verdict analyze_tls_data(
uint32_t dlen) uint32_t dlen)
{ {
struct tls_verdict vrd = {0}; struct tls_verdict vrd = {0};
int ret;
size_t i = 0; size_t i = 0;
const uint8_t *data_end = data + dlen; const uint8_t *data_end = data + dlen;
if (section->sni_detection == SNI_DETECTION_BRUTE) { if (section->sni_detection == SNI_DETECTION_BRUTE) {
ret = bruteforce_analyze_sni_str(section, data, dlen, &vrd); bruteforce_analyze_sni_str(section, data, dlen, &vrd);
goto out; goto out;
} }
@ -237,7 +236,7 @@ struct tls_verdict analyze_tls_data(
vrd.sni_len = sni_len; vrd.sni_len = sni_len;
vrd.sni_target_len = vrd.sni_len; vrd.sni_target_len = vrd.sni_len;
ret = analyze_sni_str(section, sni_name, sni_len, data, &vrd); analyze_sni_str(section, sni_name, sni_len, data, &vrd);
goto out; goto out;
nextExtension: nextExtension:
@ -256,7 +255,6 @@ int gen_fake_sni(struct fake_type type,
const struct tcphdr *tcph, uint32_t tcph_len, const struct tcphdr *tcph, uint32_t tcph_len,
uint8_t *buf, uint32_t *buflen) { uint8_t *buf, uint32_t *buflen) {
uint32_t data_len = type.fake_len; uint32_t data_len = type.fake_len;
int ret;
if (type.type == FAKE_PAYLOAD_RANDOM && data_len == 0) { if (type.type == FAKE_PAYLOAD_RANDOM && data_len == 0) {
data_len = (uint32_t)randint() % 1200; data_len = (uint32_t)randint() % 1200;
@ -303,7 +301,8 @@ int gen_fake_sni(struct fake_type type,
get_random_bytes(bfdptr, data_len); get_random_bytes(bfdptr, data_len);
#else /* KERNEL_SPACE */ #else /* KERNEL_SPACE */
#if _NO_GETRANDOM #if _NO_GETRANDOM
ret = open("/dev/urandom", O_RDONLY); {
int ret = open("/dev/urandom", O_RDONLY);
if (ret < 0) { if (ret < 0) {
lgerror(ret, "Unable to open /dev/urandom"); lgerror(ret, "Unable to open /dev/urandom");
return ret; return ret;
@ -311,7 +310,7 @@ int gen_fake_sni(struct fake_type type,
read(ret, bfdptr, data_len); read(ret, bfdptr, data_len);
close(ret); close(ret);
}
#else /* _NO_GETRANDOM */ #else /* _NO_GETRANDOM */
getrandom(bfdptr, data_len, 0); getrandom(bfdptr, data_len, 0);
#endif /* _NO_GETRANDOM */ #endif /* _NO_GETRANDOM */