* code and the higher level backend.
*/
-#include <windows.h>
-
#include <assert.h>
#include <ctype.h>
#include <string.h>
* so we have to check each time.
*/
while (!ps->freeze && bufchain_size(&ps->pending_input_data) > 0) {
- char * data;
+ void *data;
int len;
bufchain_prefix(&ps->pending_input_data, &data, &len);
plug_receive(ps->plug, 0, data, len);
int hostip_len, hostname_len;
char * exclude_list;
+ /*
+ * Check the host name and IP against the hard-coded
+ * representations of `localhost'.
+ */
+ if (!cfg.even_proxy_localhost &&
+ (sk_hostname_is_local(hostname) || sk_address_is_local(addr)))
+ return 0; /* do not proxy */
+
/* we want a string representation of the IP address for comparisons */
sk_getaddr(addr, hostip, 64);
int port, int privport,
int oobinline, int nodelay, Plug plug)
{
- static struct socket_function_table socket_fn_table = {
+ static const struct socket_function_table socket_fn_table = {
sk_proxy_plug,
sk_proxy_close,
sk_proxy_write,
sk_proxy_socket_error
};
- static struct plug_function_table plug_fn_table = {
+ static const struct plug_function_table plug_fn_table = {
plug_proxy_closing,
plug_proxy_receive,
plug_proxy_sent,
return sk_new(addr, port, privport, oobinline, nodelay, plug);
}
-Socket new_listener(int port, Plug plug, int local_host_only)
+Socket new_listener(char *srcaddr, int port, Plug plug, int local_host_only)
{
/* TODO: SOCKS (and potentially others) support inbound
* TODO: connections via the proxy. support them.
*/
- return sk_newlistener(port, plug, local_host_only);
+ return sk_newlistener(srcaddr, port, plug, local_host_only);
}
/* ----------------------------------------------------------------------
* for this proxy method, it's just a simple HTTP
* request
*/
- char buf[256], dest[64];
+ char *buf, dest[64];
sk_getaddr(p->remote_addr, dest, 64);
- sprintf(buf, "CONNECT %s:%i HTTP/1.1\r\nHost: %s:%i\r\n",
- dest, p->remote_port, dest, p->remote_port);
+ buf = dupprintf("CONNECT %s:%i HTTP/1.1\r\nHost: %s:%i\r\n",
+ dest, p->remote_port, dest, p->remote_port);
sk_write(p->sub_socket, buf, strlen(buf));
+ sfree(buf);
if (cfg.proxy_username[0] || cfg.proxy_password[0]) {
char buf[sizeof(cfg.proxy_username)+sizeof(cfg.proxy_password)];
sk_write(p->sub_socket, buf2, strlen(buf2));
}
- sprintf(buf, "\r\n");
- sk_write(p->sub_socket, buf, strlen(buf));
+ sk_write(p->sub_socket, "\r\n", 2);
p->state = 1;
return 0;
bufchain_consume(&p->pending_input_data, eol);
if (data[status] != '2') {
/* error */
- char buf[1024];
+ char *buf;
data[eol] = '\0';
while (eol > status &&
(data[eol-1] == '\r' || data[eol-1] == '\n'))
data[--eol] = '\0';
- sprintf(buf, "Proxy error: %.900s",
- data+status);
+ buf = dupprintf("Proxy error: %s", data+status);
plug_closing(p->plug, buf, PROXY_ERROR_GENERAL, 0);
+ sfree(buf);
sfree(data);
return 1;
}
{
bufchain_consume(&p->pending_input_data, eol);
datap += eol;
+ len -= eol;
eol = get_line_end(datap, len);
}
int length;
char * command;
- if (sk_addrtype(p->remote_addr) != AF_INET) {
+ if (sk_addrtype(p->remote_addr) != ADDRTYPE_IPV4) {
plug_closing(p->plug, "Proxy error: SOCKS version 4 does"
" not support IPv6", PROXY_ERROR_GENERAL, 0);
return 1;
char command[22];
int len;
- if (sk_addrtype(p->remote_addr) == AF_INET) {
+ if (sk_addrtype(p->remote_addr) == ADDRTYPE_IPV4) {
len = 10;
command[3] = 1; /* IPv4 */
} else {