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

Add few logs, minor improvements

Browse Source
This commit is contained in:
Vadim Vetrov 2024-08-16 22:23:55 +03:00
parent 51c21a89fd
commit 1c5d4e68d9
No known key found for this signature in database
GPG Key ID: E8A308689D7A73A5
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
youtubeUnblock.c
View File

@ -32,6 +32,7 @@
#include "mangle.h" #include "mangle.h"
#include "args.h" #include "args.h"
#include "utils.h" #include "utils.h"
#include "logging.h"
pthread_mutex_t rawsocket_lock; pthread_mutex_t rawsocket_lock;
int rawsocket = -2; int rawsocket = -2;
@ -193,13 +194,15 @@ static int send_raw_socket(const uint8_t *pkt, uint32_t pktlen) {
} }
}; };
pthread_mutex_lock(&rawsocket_lock); if (config.threads != 1)
pthread_mutex_lock(&rawsocket_lock);
int sent = sendto(rawsocket, int sent = sendto(rawsocket,
pkt, pktlen, 0, pkt, pktlen, 0,
(struct sockaddr *)&daddr, sizeof(daddr)); (struct sockaddr *)&daddr, sizeof(daddr));
pthread_mutex_unlock(&rawsocket_lock); if (config.threads != 1)
pthread_mutex_unlock(&rawsocket_lock);
/* The function will return -errno on error as well as errno value set itself */ /* The function will return -errno on error as well as errno value set itself */
if (sent < 0) sent = -errno; if (sent < 0) sent = -errno;
@ -278,9 +281,6 @@ void delay_packet_send(const unsigned char *data, unsigned int data_len, unsigne
pthread_detach(thr); pthread_detach(thr);
} }
static int queue_cb(const struct nlmsghdr *nlh, void *data) { static int queue_cb(const struct nlmsghdr *nlh, void *data) {
char buf[MNL_SOCKET_BUFFER_SIZE]; char buf[MNL_SOCKET_BUFFER_SIZE];
@ -400,12 +400,18 @@ int init_queue(int queue_num) {
ret = mnl_socket_recvfrom(nl, buf, BUF_SIZE); ret = mnl_socket_recvfrom(nl, buf, BUF_SIZE);
if (ret == -1) { if (ret == -1) {
perror("mnl_socket_recvfrom"); perror("mnl_socket_recvfrom");
continue; goto die;
} }
ret = mnl_cb_run(buf, ret, 0, portid, queue_cb, &qdata); ret = mnl_cb_run(buf, ret, 0, portid, queue_cb, &qdata);
if (ret < 0) { if (ret < 0) {
perror("mnl_cb_run"); lgerror("mnl_cb_run", -EPERM);
if (errno == EPERM) {
printf("Probably another instance of youtubeUnblock with the same queue number is running\n");
} else {
printf("Make sure the nfnetlink_queue kernel module is loaded\n");
}
goto die;
} }
} }
@ -502,6 +508,6 @@ int main(int argc, char *argv[]) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
return qres->status; return -qres->status;
} }