mirrors/redsocks
0
0
Fork 0
mirror of https://github.com/darkk/redsocks.git synced 2025-08-26 19:55:30 +00:00
Code

Further cleanup.

Browse Source
This commit is contained in:
Leonid Evdokimov 2010-11-28 23:15:56 +02:00
parent 6e574a2021
commit 9c8f21a986
2 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
socks5.c
View File

@ -21,6 +21,7 @@
#include "utils.h" #include "utils.h"
#include "log.h" #include "log.h"
#include "redsocks.h" #include "redsocks.h"
#include "socks5.h"
typedef enum socks5_state_t { typedef enum socks5_state_t {
socks5_new, socks5_new,
@ -125,36 +126,49 @@ const char *socks5_strstatus[] = {
"address type not supported", "address type not supported",
}; };
int socks5_is_valid_cred(const char *login, const char *password)
{
if (!login || !password)
return 0;
if (strlen(login) > 255) {
log_error(LOG_WARNING, "Socks5 login can't be more than 255 chars, <%s> is too long", login);
return 0;
}
if (strlen(password) > 255) {
log_error(LOG_WARNING, "Socks5 password can't be more than 255 chars, <%s> is too long", password);
return 0;
}
return 1;
}
void socks5_client_init(redsocks_client *client) void socks5_client_init(redsocks_client *client)
{ {
socks5_client *socks5 = (void*)(client + 1); socks5_client *socks5 = (void*)(client + 1);
const redsocks_config *config = &client->instance->config; const redsocks_config *config = &client->instance->config;
client->state = socks5_new; client->state = socks5_new;
socks5->do_password = 0; socks5->do_password = socks5_is_valid_cred(config->login, config->password);
if (config->login && config->password) {
if (strlen(config->login) > 255)
redsocks_log_error(client, LOG_WARNING, "Socks5 login can't be more than 255 chars");
else if (strlen(config->password) > 255)
redsocks_log_error(client, LOG_WARNING, "Socks5 password can't be more than 255 chars");
else
socks5->do_password = 1;
}
} }
static struct evbuffer *socks5_mkmethods(redsocks_client *client) static struct evbuffer *socks5_mkmethods(redsocks_client *client)
{ {
socks5_client *socks5 = (void*)(client + 1); socks5_client *socks5 = (void*)(client + 1);
int len = sizeof(socks5_method_req) + socks5->do_password; return socks5_mkmethods_plain(socks5->do_password);
}
struct evbuffer *socks5_mkmethods_plain(int do_password)
{
assert(do_password == 0 || do_password == 1);
int len = sizeof(socks5_method_req) + do_password;
union { union {
socks5_method_req req; socks5_method_req req;
uint8_t raw[len]; uint8_t raw[len];
} u; } u;
u.req.ver = socks5_ver; u.req.ver = socks5_ver;
u.req.num_methods = 1 + socks5->do_password; u.req.num_methods = 1 + do_password;
u.req.methods[0] = socks5_auth_none; u.req.methods[0] = socks5_auth_none;
if (socks5->do_password) if (do_password)
u.req.methods[1] = socks5_auth_password; u.req.methods[1] = socks5_auth_password;
return mkevbuffer(&u.req, len); return mkevbuffer(&u.req, len);
@ -162,8 +176,11 @@ static struct evbuffer *socks5_mkmethods(redsocks_client *client)
static struct evbuffer *socks5_mkpassword(redsocks_client *client) static struct evbuffer *socks5_mkpassword(redsocks_client *client)
{ {
const char *login = client->instance->config.login; return socks5_mkpassword_plain(client->instance->config.login, client->instance->config.password);
const char *password = client->instance->config.password; }
struct evbuffer *socks5_mkpassword_plain(const char *login, const char *password)
{
size_t ulen = strlen(login); size_t ulen = strlen(login);
size_t plen = strlen(password); size_t plen = strlen(password);
size_t length = 1 /* version */ + 1 + ulen + 1 + plen; size_t length = 1 /* version */ + 1 + ulen + 1 + plen;

10
socks5.h Normal file
View File

@ -0,0 +1,10 @@
#ifndef SOCKS5_H
#define SOCKS5_H
struct evbuffer *socks5_mkmethods_plain(int do_password);
struct evbuffer *socks5_mkpassword_plain(const char *login, const char *password);
/* vim:set tabstop=4 softtabstop=4 shiftwidth=4: */
/* vim:set foldmethod=marker foldlevel=32 foldmarker={,}: */
#endif /* SOCKS5_H */