mirrors/byedpi
1
0
Fork 0
mirror of https://github.com/hufrea/byedpi.git synced 2024-12-22 22:35:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

mode_add_get -> cache_get/cache_add

Browse Source
This commit is contained in:
ruti 2024-10-16 05:00:18 +03:00
parent 315a0a2826
commit 721e5808fb
1 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
extend.c
View File

@ -72,42 +72,41 @@ static ssize_t serialize_addr(const struct sockaddr_ina *dst,
} }
static int mode_add_get(struct sockaddr_ina *dst, int m) static int cache_get(struct sockaddr_ina *dst)
{ {
// m < 0: get, m > 0: set, m == 0: delete
assert(m >= -1 && m < params.dp_count);
time_t t = 0;
struct elem *val = 0;
uint8_t key[KEY_SIZE] = { 0 }; uint8_t key[KEY_SIZE] = { 0 };
int len = serialize_addr(dst, key, sizeof(key)); int len = serialize_addr(dst, key, sizeof(key));
assert(len > 0);
if (m < 0) { struct elem *val = mem_get(params.mempool, (char *)key, len);
val = mem_get(params.mempool, (char *)key, len);
if (!val) { if (!val) {
return -1; return -1;
} }
time(&t); time_t t = time(0);
if (t > val->time + params.cache_ttl) { if (t > val->time + params.cache_ttl) {
LOG(LOG_S, "time=%jd, now=%jd, ignore\n", (intmax_t)val->time, (intmax_t)t); LOG(LOG_S, "time=%jd, now=%jd, ignore\n", (intmax_t)val->time, (intmax_t)t);
return 0; return 0;
} }
return val->m; return val->m;
} }
INIT_ADDR_STR((*dst));
static int cache_add(struct sockaddr_ina *dst, int m)
{
assert(m >= 0 && m < params.dp_count);
uint8_t key[KEY_SIZE] = { 0 };
int len = serialize_addr(dst, key, sizeof(key));
INIT_ADDR_STR((*dst));
if (m == 0) { if (m == 0) {
LOG(LOG_S, "delete ip: %s\n", ADDR_STR); LOG(LOG_S, "delete ip: %s\n", ADDR_STR);
mem_delete(params.mempool, (char *)key, len); mem_delete(params.mempool, (char *)key, len);
return 0; return 0;
} }
else {
LOG(LOG_S, "save ip: %s, m=%d\n", ADDR_STR, m); LOG(LOG_S, "save ip: %s, m=%d\n", ADDR_STR, m);
time(&t); time_t t = time(0);
val = mem_add(params.mempool, (char *)key, len); struct elem *val = mem_add(params.mempool, (char *)key, len);
if (!val) { if (!val) {
uniperror("mem_add"); uniperror("mem_add");
return -1; return -1;
@ -116,7 +115,6 @@ static int mode_add_get(struct sockaddr_ina *dst, int m)
val->time = t; val->time = t;
return 0; return 0;
} }
}
static inline bool check_port(uint16_t *p, struct sockaddr_in6 *dst) static inline bool check_port(uint16_t *p, struct sockaddr_in6 *dst)
@ -129,7 +127,7 @@ static inline bool check_port(uint16_t *p, struct sockaddr_in6 *dst)
int connect_hook(struct poolhd *pool, struct eval *val, int connect_hook(struct poolhd *pool, struct eval *val,
struct sockaddr_ina *dst, int next) struct sockaddr_ina *dst, int next)
{ {
int m = mode_add_get(dst, -1); int m = cache_get(dst);
val->cache = (m == 0); val->cache = (m == 0);
val->attempt = m < 0 ? 0 : m; val->attempt = m < 0 ? 0 : m;
@ -234,12 +232,12 @@ static int on_trigger(int type, struct poolhd *pool, struct eval *val)
if (can_reconn) { if (can_reconn) {
return reconnect(pool, val, m); return reconnect(pool, val, m);
} }
mode_add_get( cache_add(
(struct sockaddr_ina *)&val->in6, m); (struct sockaddr_ina *)&val->in6, m);
break; break;
} }
if (m >= params.dp_count && m > 1) { if (m >= params.dp_count && m > 1) {
mode_add_get( cache_add(
(struct sockaddr_ina *)&val->in6, 0); (struct sockaddr_ina *)&val->in6, 0);
} }
return -1; return -1;
@ -439,7 +437,7 @@ ssize_t tcp_recv_hook(struct poolhd *pool, struct eval *val,
return -1; return -1;
} }
if (val->pair->cache && if (val->pair->cache &&
mode_add_get((struct sockaddr_ina *)&val->in6, m) < 0) { cache_add((struct sockaddr_ina *)&val->in6, m) < 0) {
return -1; return -1;
} }
} }