Merge pull request #16 from jahrome/master

Hi ! Nice job with localnet, just what I was needing, here is just a small fix. Hope this helps.
This commit is contained in:
Adam Hamsik 2012-05-22 06:07:35 -07:00
commit c9b8ce35b2

View File

@ -224,7 +224,7 @@ static inline void get_chain_data(proxy_data * pd, unsigned int *proxy_count, ch
memset(local_in_port, 0, sizeof(local_in_port) / sizeof(local_in_port[0]));
if(sscanf(local_in_addr_port, "%15[^:]:%5s", local_in_addr, local_in_port) < 2) {
PDEBUG("added localnet: netaddr=%s, port=%s\n",
PDEBUG("added localnet: netaddr=%s, netmask=%s\n",
local_in_addr, local_netmask);
} else {
PDEBUG("added localnet: netaddr=%s, port=%s, netmask=%s\n",
@ -310,7 +310,7 @@ int connect(int sock, const struct sockaddr *addr, unsigned int len) {
for(i = 0; i < num_localnet_addr && !remote_dns_connect; i++) {
if((localnet_addr[i].in_addr.s_addr & localnet_addr[i].netmask.s_addr)
== (p_addr_in->s_addr & localnet_addr[i].netmask.s_addr)) {
if(localnet_addr[i].port || localnet_addr[i].port == port) {
if(!localnet_addr[i].port || localnet_addr[i].port == port) {
PDEBUG("accessing localnet using true_connect\n");
return true_connect(sock, addr, len);
}