mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Native refactoring

This commit is contained in:
M66B 2016-01-21 13:21:13 +01:00
parent c3f0aac602
commit dea49b16ab
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/jni/netguard/netguard.c
View File

@ -1007,7 +1007,7 @@ jboolean handle_tcp(const struct arguments *args, const uint8_t *buffer, uint16_
dest, ntohs(tcphdr->dest), datalen);
// Open socket
syn->socket = open_tcp(syn, args);
syn->socket = open_socket(syn, args);
if (syn->socket < 0) {
syn->state = TCP_TIME_WAIT;
// Remote might retry
@ -1082,7 +1082,9 @@ jboolean handle_tcp(const struct arguments *args, const uint8_t *buffer, uint16_
int ok = 1;
if (ntohl(tcphdr->seq) == cur->remote_seq && datalen) {
log_android(ANDROID_LOG_DEBUG, "send socket data %u", datalen);
if (send_socket(cur->socket, buffer + dataoff, datalen) < 0) {
if (send(cur->socket, buffer + dataoff, datalen, 0) < 0) {
log_android(ANDROID_LOG_ERROR, "send error %d: %s", errno, strerror(errno));
ok = 0;
write_rst(args, cur, args->tun);
}
@ -1249,7 +1251,7 @@ jboolean handle_tcp(const struct arguments *args, const uint8_t *buffer, uint16_
return 1;
}
int open_tcp(const struct tcp_session *cur, const struct arguments *args) {
int open_socket(const struct tcp_session *cur, const struct arguments *args) {
int sock = -1;
// Build target address
@ -1305,13 +1307,6 @@ uint16_t get_local_port(const int sock) {
return ntohs(sin.sin_port);
}
ssize_t send_socket(int sock, uint8_t *buffer, uint16_t len) {
ssize_t res = send(sock, buffer, len, 0);
if (res < 0)
log_android(ANDROID_LOG_ERROR, "send error %d: %s", errno, strerror(errno));
return res;
}
int write_syn_ack(const struct arguments *args, struct tcp_session *cur, int tun) {
if (write_tcp(args, cur, NULL, 0, 1, 1, 1, 0, 0, tun) < 0) {
log_android(ANDROID_LOG_ERROR, "write SYN+ACK error %d: %s",

4
app/src/main/jni/netguard/netguard.h
View File

@ -108,12 +108,10 @@ jboolean handle_udp(const struct arguments *args, const uint8_t *buffer, uint16_
jboolean handle_tcp(const struct arguments *args, const uint8_t *buffer, uint16_t length, int uid);
int open_tcp(const struct tcp_session *cur, const struct arguments *args);
int open_socket(const struct tcp_session *cur, const struct arguments *args);
uint16_t get_local_port(const int sock);
ssize_t send_socket(int sock, uint8_t *buffer, uint16_t len);
int write_syn_ack(const struct arguments *args, struct tcp_session *cur, int tun);
int write_ack(const struct arguments *args, struct tcp_session *cur, int bytes, int tun);