Skip to content

Commit

Permalink
add history command rename, update byedpi
Browse files Browse the repository at this point in the history
  • Loading branch information
@romanvht
romanvht committed Jan 16, 2025
1 parent 4a3c532 commit e71e0c6
Show file tree
Hide file tree
Showing 25 changed files with 256 additions and 150 deletions.
2 changes: 1 addition & 1 deletion .github/images/logo.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions .idea/appInsightsSettings.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/deploymentTargetSelector.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ android {
//noinspection OldTargetApi
targetSdk = 34
versionCode = 10
versionName = "1.4.1"
versionName = "1.4.2"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

Expand Down Expand Up @@ -78,6 +78,7 @@ dependencies {
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.6")
implementation("androidx.lifecycle:lifecycle-service:2.8.6")
implementation("com.github.kittinunf.fuel:fuel:3.0.0-alpha04")
implementation("com.google.code.gson:gson:2.8.9")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.2.1")
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/cpp/byedpi
Submodule byedpi updated 19 files
+3 −1 Makefile
+29 −7 README.md
+1 −1 conev.c
+8 −4 conev.h
+146 −111 desync.c
+6 −2 desync.h
+26 −0 dist/bsd/README.md
+28 −0 dist/bsd/byedpi
+21 −4 error.h
+87 −57 extend.c
+5 −5 extend.h
+208 −42 main.c
+84 −36 mpool.c
+17 −6 mpool.h
+46 −71 packets.c
+10 −11 packets.h
+13 −5 params.h
+111 −76 proxy.c
+33 −58 proxy.h
9 changes: 5 additions & 4 deletions app/src/main/cpp/main.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
extern char *oob_char;
extern int NOT_EXIT;

struct sockaddr_ina;
union sockaddr_u;

int get_default_ttl();

int get_addr(const char *str, struct sockaddr_ina *addr);
int get_addr(const char *str, union sockaddr_u *addr);

void *add(void **root, int *n, size_t ss);

Expand All @@ -15,9 +15,10 @@ char *ftob(const char *str, ssize_t *sl);

char *data_from_str(const char *str, ssize_t *size);

size_t parse_cform(char *buffer, size_t blen,
const char *str, size_t slen);
size_t parse_cform(char *buffer, size_t blen, const char *str, size_t slen);

struct mphdr *parse_hosts(char *buffer, size_t size);

struct mphdr *parse_ipset(char *buffer, size_t size);

int parse_offset(struct part *part, const char *str);
6 changes: 3 additions & 3 deletions app/src/main/cpp/native-lib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Java_io_github_dovecoteescapee_byedpi_core_ByeDpiProxy_jniCreateSocketWithComman
return -1;
}

int fd = listen_socket((struct sockaddr_ina *)&params.laddr);
int fd = listen_socket((union sockaddr_u *)&params.laddr);
if (fd < 0) {
uniperror("listen_socket");
return -1;
Expand Down Expand Up @@ -95,7 +95,7 @@ Java_io_github_dovecoteescapee_byedpi_core_ByeDpiProxy_jniCreateSocket(
jint udp_fake_count,
jboolean drop_sack,
jint fake_offset) {
struct sockaddr_ina s;
union sockaddr_u s;

const char *address = (*env)->GetStringUTFChars(env, ip, 0);
int res = get_addr(address, &s);
Expand Down Expand Up @@ -247,7 +247,7 @@ Java_io_github_dovecoteescapee_byedpi_core_ByeDpiProxy_jniCreateSocket(
}
}

params.mempool = mem_pool(0);
params.mempool = mem_pool(0, CMP_BYTES);
if (!params.mempool) {
uniperror("mem_pool");
clear_params();
Expand Down
83 changes: 45 additions & 38 deletions app/src/main/cpp/utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ void reset_params(void) {
params = default_params;
}

extern const struct option options[41];
extern const struct option options[42];

int parse_args(int argc, char **argv)
{
Expand All @@ -34,9 +34,9 @@ int parse_args(int argc, char **argv)
}
}

params.laddr.sin6_port = htons(1080);
params.laddr.in.sin_port = htons(1080);
if (!ipv6_support()) {
params.baddr.sin6_family = AF_INET;
params.baddr.sa.sa_family = AF_INET;
}

int rez;
Expand All @@ -46,8 +46,7 @@ int parse_args(int argc, char **argv)
char *end = 0;
bool all_limited = 1;

struct desync_params *dp = add((void *)&params.dp,
&params.dp_count, sizeof(struct desync_params));
struct desync_params *dp = add((void *)&params.dp, &params.dp_count, sizeof(struct desync_params));
if (!dp) {
reset_params();
return -1;
Expand All @@ -69,24 +68,17 @@ int parse_args(int argc, char **argv)
case 'U':
params.udp = 0;
break;
case 'G':
params.http_connect = 1;
break;
#ifdef __linux__
case 'E':
params.transparent = 1;
break;
case 'E':
params.transparent = 1;
break;
#endif

// case 'h':
// printf(help_text);
// reset_params();
// return 0;
// case 'v':
// printf("%s\n", VERSION);
// reset_params();
// return 0;

case 'i':
if (get_addr(optarg,
(struct sockaddr_ina *)&params.laddr) < 0)
if (get_addr(optarg, &params.laddr) < 0)
invalid = 1;
break;

Expand All @@ -95,12 +87,11 @@ int parse_args(int argc, char **argv)
if (val <= 0 || val > 0xffff || *end)
invalid = 1;
else
params.laddr.sin6_port = htons(val);
params.laddr.in.sin_port = htons(val);
break;

case 'I':
if (get_addr(optarg,
(struct sockaddr_ina *)&params.baddr) < 0)
if (get_addr(optarg, &params.baddr) < 0)
invalid = 1;
break;

Expand Down Expand Up @@ -141,7 +132,7 @@ int parse_args(int argc, char **argv)
break;

case 'A':
if (!(dp->hosts || dp->proto || dp->pf[0] || dp->detect)) {
if (!(dp->hosts || dp->proto || dp->pf[0] || dp->detect || dp->ipset)) {
all_limited = 0;
}
dp = add((void *)&params.dp, &params.dp_count,
Expand Down Expand Up @@ -188,11 +179,11 @@ int parse_args(int argc, char **argv)
case 'T':;
#ifdef __linux__
float f = strtof(optarg, &end);
val = (long)(f * 1000);
val = (long)(f * 1000);
#else
val = strtol(optarg, &end, 0);
#endif
if (val <= 0 || val > UINT_MAX || *end)
if (val <= 0 || val > (long)UINT_MAX || *end)
invalid = 1;
else
params.timeout = val;
Expand All @@ -211,6 +202,9 @@ int parse_args(int argc, char **argv)
case 'u':
dp->proto |= IS_UDP;
break;
case 'i':
dp->proto |= IS_IPV4;
break;
default:
invalid = 1;
continue;
Expand All @@ -232,12 +226,31 @@ int parse_args(int argc, char **argv)
}
dp->hosts = parse_hosts(dp->file_ptr, dp->file_size);
if (!dp->hosts) {
perror("parse_hosts");
uniperror("parse_hosts");
reset_params();
return -1;
}
break;

case 'j':;
if (dp->ipset) {
continue;
}
ssize_t size;
char *data = ftob(optarg, &size);
if (!data) {
uniperror("read/parse");
invalid = 1;
continue;
}
dp->ipset = parse_ipset(data, size);
if (!dp->ipset) {
uniperror("parse_ipset");
invalid = 1;
}
free(data);
break;

case 's':
case 'd':
case 'o':
Expand Down Expand Up @@ -425,20 +438,13 @@ int parse_args(int argc, char **argv)
dp->drop_sack = 1;
break;

case 'w': //
params.sfdelay = strtol(optarg, &end, 0);
if (params.sfdelay < 0 || optarg == end
|| params.sfdelay >= 1000 || *end)
invalid = 1;
break;

case 'W':
params.wait_send = 0;
break;
#ifdef __linux__
case 'P':
params.protect_path = optarg;
break;
case 'P':
params.protect_path = optarg;
break;
#endif
case 0:
break;
Expand Down Expand Up @@ -467,7 +473,7 @@ int parse_args(int argc, char **argv)
}
}

if (params.baddr.sin6_family != AF_INET6) {
if (params.baddr.sa.sa_family != AF_INET6) {
params.ipv6 = 0;
}
if (!params.def_ttl) {
Expand All @@ -476,12 +482,13 @@ int parse_args(int argc, char **argv)
return -1;
}
}
params.mempool = mem_pool(0);
params.mempool = mem_pool(0, CMP_BYTES);
if (!params.mempool) {
uniperror("mem_pool");
reset_params();
return -1;
}
srand((unsigned int)time(0));

return 0;
}
Loading

0 comments on commit e71e0c6

Please sign in to comment.