mirror of
https://github.com/3proxy/3proxy.git
synced 2026-05-31 13:30:11 +08:00
Merge branch 'master' of https://github.com/3proxy/3proxy
This commit is contained in:
commit
bed3977575
@ -9,6 +9,7 @@ struct hashentry {
|
|||||||
|
|
||||||
|
|
||||||
void destroyhashtable(struct hashtable *ht){
|
void destroyhashtable(struct hashtable *ht){
|
||||||
|
if(!ht->ihashtable) return;
|
||||||
_3proxy_mutex_lock(&ht->hash_mutex);
|
_3proxy_mutex_lock(&ht->hash_mutex);
|
||||||
if(ht->ihashtable){
|
if(ht->ihashtable){
|
||||||
free(ht->ihashtable);
|
free(ht->ihashtable);
|
||||||
|
|||||||
@ -134,12 +134,13 @@ int clientnegotiate(struct chain * redir, struct clientparam * param, struct soc
|
|||||||
int atyp;
|
int atyp;
|
||||||
int skip_port = 0;
|
int skip_port = 0;
|
||||||
buf[0] = 5;
|
buf[0] = 5;
|
||||||
buf[1] = user? 1 : 0;
|
buf[1] = user? 2 : 1;
|
||||||
buf[2] = 2;
|
buf[2] = 0;
|
||||||
if(socksend(param, param->remsock, buf, user?3:2, conf.timeouts[CHAIN_TO]) < 2){
|
buf[3] = 2;
|
||||||
|
if(socksend(param, param->remsock, buf, user?4:3, conf.timeouts[CHAIN_TO]) < 2){
|
||||||
return 51;
|
return 51;
|
||||||
}
|
}
|
||||||
param->statssrv64+=3;
|
param->statssrv64+=user?4:3;
|
||||||
param->nwrites++;
|
param->nwrites++;
|
||||||
if(sockgetlinebuf(param, SERVER, buf, 2, EOF, conf.timeouts[CHAIN_TO]) != 2){
|
if(sockgetlinebuf(param, SERVER, buf, 2, EOF, conf.timeouts[CHAIN_TO]) != 2){
|
||||||
return 52;
|
return 52;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user