Proxy_Socket ps = (Proxy_Socket) s;
sk_close(ps->sub_socket);
+ sk_addr_free(ps->remote_addr);
sfree(ps);
}
*/
while (!ps->freeze && bufchain_size(&ps->pending_input_data) > 0) {
void *data;
+ char databuf[512];
int len;
bufchain_prefix(&ps->pending_input_data, &data, &len);
- plug_receive(ps->plug, 0, data, len);
+ if (len > lenof(databuf))
+ len = lenof(databuf);
+ memcpy(databuf, data, len);
bufchain_consume(&ps->pending_input_data, len);
+ plug_receive(ps->plug, 0, databuf, len);
}
/* if we're still frozen, we'll have to wait for another
* match (ie. a specific IP)
*/
- if (addr && stricmp(hostip, exclude_list + s) == 0)
+ if (addr && strnicmp(hostip, exclude_list + s, e - s) == 0)
return 0; /* IP/hostname excluded. do not use proxy. */
- if (stricmp(hostname, exclude_list + s) == 0)
+ if (strnicmp(hostname, exclude_list + s, e - s) == 0)
return 0; /* IP/hostname excluded. do not use proxy. */
}
return sk_namelookup(host, canonicalname);
}
-Socket platform_new_connection(SockAddr addr, char *hostname,
- int port, int privport,
- int oobinline, int nodelay, Plug plug,
- const Config *cfg);
-
Socket new_connection(SockAddr addr, char *hostname,
int port, int privport,
int oobinline, int nodelay, Plug plug,
char *proxy_canonical_name;
Socket sret;
- if ( (sret = platform_new_connection(addr, hostname, port, privport,
- oobinline, nodelay, plug, cfg)) )
+ if ((sret = platform_new_connection(addr, hostname, port, privport,
+ oobinline, nodelay, plug, cfg)) !=
+ NULL)
return sret;
ret = snew(struct Socket_proxy_tag);
ret->fn = &socket_fn_table;
ret->cfg = *cfg; /* STRUCTURE COPY */
ret->plug = plug;
- ret->remote_addr = addr;
+ ret->remote_addr = addr; /* will need to be freed on close */
ret->remote_port = port;
ret->error = NULL;
if (sk_socket_error(ret->sub_socket) != NULL)
return (Socket) ret;
- sk_addr_free(proxy_addr);
-
/* start the proxy negotiation process... */
sk_set_frozen(ret->sub_socket, 0);
ret->negotiate(ret, PROXY_CHANGE_NEW);