Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix SOCKS5 username\password set. fix SOCKS5 request #927

Closed
wants to merge 5 commits into from
Closed

fix SOCKS5 username\password set. fix SOCKS5 request #927

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98a578b
fix SOCKS5 username\password set. fix SOCKS5 request
yzhivik Aug 23, 2018
15e84c3
fix SOCKS5 username and password set
yzhivik Aug 31, 2018
4654995
fix SOCKS5 request wrt IP4/IP6/FQDN
yzhivik Aug 31, 2018
dfa3361
Merge branch 'master' of https://github.com/yzhivik/mosquitto
yzhivik Aug 31, 2018
3ce7a3b
fix coding style
yzhivik Aug 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 40 additions & 13 deletions lib/socks_mosq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ and the Eclipse Distribution License is available at

#include <errno.h>
#include <string.h>
#include <limits.h>
#include <arpa/inet.h>

#include "mosquitto_internal.h"
#include "memory_mosq.h"
Expand Down Expand Up @@ -75,8 +77,10 @@ int mosquitto_socks5_set(struct mosquitto *mosq, const char *host, int port, con

if(password){
mosq->socks5_password = mosquitto__strdup(password);
mosquitto__free(mosq->socks5_username);
return MOSQ_ERR_NOMEM;
if(!mosq->socks5_password){
mosquitto__free(mosq->socks5_username);
return MOSQ_ERR_NOMEM;
}
}
}

Expand Down Expand Up @@ -133,20 +137,43 @@ int socks5__send(struct mosquitto *mosq)
packet = mosquitto__calloc(1, sizeof(struct mosquitto__packet));
if(!packet) return MOSQ_ERR_NOMEM;

packet->packet_length = 7+strlen(mosq->host);
packet->payload = mosquitto__malloc(sizeof(uint8_t)*packet->packet_length);
struct in_addr addr_ipv4;
struct in6_addr addr_ipv6;

slen = strlen(mosq->host);
int ipv4_pton_result = inet_pton(AF_INET, mosq->host, &addr_ipv4);
int ipv6_pton_result = inet_pton(AF_INET6, mosq->host, &addr_ipv6);

packet->payload[0] = 0x05;
packet->payload[1] = 1;
packet->payload[2] = 0;
packet->payload[3] = SOCKS_ATYPE_DOMAINNAME;
packet->payload[4] = slen;
memcpy(&(packet->payload[5]), mosq->host, slen);
packet->payload[5+slen] = MOSQ_MSB(mosq->port);
packet->payload[6+slen] = MOSQ_LSB(mosq->port);

packet->payload[1] = 0x01;
packet->payload[2] = 0x00;

if(ipv4_pton_result == 1){
packet->packet_length = 10;
packet->payload = mosquitto__malloc(sizeof(uint8_t)*packet->packet_length);
packet->payload[3] = SOCKS_ATYPE_IP_V4;
memcpy(&(packet->payload[4]), (const void*)&addr_ipv4, 4);
packet->payload[4+4] = MOSQ_MSB(mosq->port);
packet->payload[4+4+1] = MOSQ_LSB(mosq->port);
}else if(ipv6_pton_result == 1){
packet->packet_length = 22;
packet->payload = mosquitto__malloc(sizeof(uint8_t)*packet->packet_length);
packet->payload[3] = SOCKS_ATYPE_IP_V6;
memcpy(&(packet->payload[4]), (const void*)&addr_ipv6, 16);
packet->payload[4+16] = MOSQ_MSB(mosq->port);
packet->payload[4+16+1] = MOSQ_LSB(mosq->port);
}else{
slen = strlen(mosq->host);
if(slen > UCHAR_MAX){
return MOSQ_ERR_NOMEM;
}
packet->packet_length = 7 + slen;
packet->payload = mosquitto__malloc(sizeof(uint8_t)*packet->packet_length);
packet->payload[3] = SOCKS_ATYPE_DOMAINNAME;
packet->payload[4] = (uint8_t)slen;
memcpy(&(packet->payload[5]), mosq->host, slen);
packet->payload[5+slen] = MOSQ_MSB(mosq->port);
packet->payload[6+slen] = MOSQ_LSB(mosq->port);
}
pthread_mutex_lock(&mosq->state_mutex);
mosq->state = mosq_cs_socks5_request;
pthread_mutex_unlock(&mosq->state_mutex);
Expand Down