proxy.c 21 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657
  1. /*
  2. * Network proxy abstraction in PuTTY
  3. *
  4. * A proxy layer, if necessary, wedges itself between the network
  5. * code and the higher level backend.
  6. */
  7. #include <assert.h>
  8. #include <ctype.h>
  9. #include <string.h>
  10. #include "putty.h"
  11. #include "network.h"
  12. #include "proxy.h"
  13. #define do_proxy_dns(conf) \
  14. (conf_get_int(conf, CONF_proxy_dns) == FORCE_ON || \
  15. (conf_get_int(conf, CONF_proxy_dns) == AUTO && \
  16. conf_get_int(conf, CONF_proxy_type) != PROXY_SOCKS4))
  17. static void proxy_negotiator_cleanup(ProxySocket *ps)
  18. {
  19. if (ps->pn) {
  20. proxy_negotiator_free(ps->pn);
  21. ps->pn = NULL;
  22. }
  23. if (ps->clientseat) {
  24. interactor_return_seat(ps->clientitr);
  25. ps->clientitr = NULL;
  26. ps->clientseat = NULL;
  27. }
  28. }
  29. /*
  30. * Call this when proxy negotiation is complete, so that this
  31. * socket can begin working normally.
  32. */
  33. static void proxy_activate(ProxySocket *ps)
  34. {
  35. size_t output_before, output_after;
  36. proxy_negotiator_cleanup(ps);
  37. plug_log(ps->plug, PLUGLOG_CONNECT_SUCCESS, NULL, 0, NULL, 0);
  38. /* we want to ignore new receive events until we have sent
  39. * all of our buffered receive data.
  40. */
  41. sk_set_frozen(ps->sub_socket, true);
  42. /* how many bytes of output have we buffered? */
  43. output_before = bufchain_size(&ps->pending_oob_output_data) +
  44. bufchain_size(&ps->pending_output_data);
  45. /* and keep track of how many bytes do not get sent. */
  46. output_after = 0;
  47. /* send buffered OOB writes */
  48. while (bufchain_size(&ps->pending_oob_output_data) > 0) {
  49. ptrlen data = bufchain_prefix(&ps->pending_oob_output_data);
  50. output_after += sk_write_oob(ps->sub_socket, data.ptr, data.len);
  51. bufchain_consume(&ps->pending_oob_output_data, data.len);
  52. }
  53. /* send buffered normal writes */
  54. while (bufchain_size(&ps->pending_output_data) > 0) {
  55. ptrlen data = bufchain_prefix(&ps->pending_output_data);
  56. output_after += sk_write(ps->sub_socket, data.ptr, data.len);
  57. bufchain_consume(&ps->pending_output_data, data.len);
  58. }
  59. /* if we managed to send any data, let the higher levels know. */
  60. if (output_after < output_before)
  61. plug_sent(ps->plug, output_after);
  62. /* if we have a pending EOF to send, send it */
  63. if (ps->pending_eof) sk_write_eof(ps->sub_socket);
  64. /* if the backend wanted the socket unfrozen, try to unfreeze.
  65. * our set_frozen handler will flush buffered receive data before
  66. * unfreezing the actual underlying socket.
  67. */
  68. if (!ps->freeze)
  69. sk_set_frozen(&ps->sock, false);
  70. }
  71. /* basic proxy socket functions */
  72. static Plug *sk_proxy_plug (Socket *s, Plug *p)
  73. {
  74. ProxySocket *ps = container_of(s, ProxySocket, sock);
  75. Plug *ret = ps->plug;
  76. if (p)
  77. ps->plug = p;
  78. return ret;
  79. }
  80. static void sk_proxy_close (Socket *s)
  81. {
  82. ProxySocket *ps = container_of(s, ProxySocket, sock);
  83. sk_close(ps->sub_socket);
  84. sk_addr_free(ps->proxy_addr);
  85. sk_addr_free(ps->remote_addr);
  86. proxy_negotiator_cleanup(ps);
  87. bufchain_clear(&ps->output_from_negotiator);
  88. sfree(ps);
  89. }
  90. static size_t sk_proxy_write (Socket *s, const void *data, size_t len)
  91. {
  92. ProxySocket *ps = container_of(s, ProxySocket, sock);
  93. if (ps->pn) {
  94. bufchain_add(&ps->pending_output_data, data, len);
  95. return bufchain_size(&ps->pending_output_data);
  96. }
  97. return sk_write(ps->sub_socket, data, len);
  98. }
  99. static size_t sk_proxy_write_oob (Socket *s, const void *data, size_t len)
  100. {
  101. ProxySocket *ps = container_of(s, ProxySocket, sock);
  102. if (ps->pn) {
  103. bufchain_clear(&ps->pending_output_data);
  104. bufchain_clear(&ps->pending_oob_output_data);
  105. bufchain_add(&ps->pending_oob_output_data, data, len);
  106. return len;
  107. }
  108. return sk_write_oob(ps->sub_socket, data, len);
  109. }
  110. static void sk_proxy_write_eof (Socket *s)
  111. {
  112. ProxySocket *ps = container_of(s, ProxySocket, sock);
  113. if (ps->pn) {
  114. ps->pending_eof = true;
  115. return;
  116. }
  117. sk_write_eof(ps->sub_socket);
  118. }
  119. static void sk_proxy_set_frozen (Socket *s, bool is_frozen)
  120. {
  121. ProxySocket *ps = container_of(s, ProxySocket, sock);
  122. if (ps->pn) {
  123. ps->freeze = is_frozen;
  124. return;
  125. }
  126. /* handle any remaining buffered recv data first */
  127. if (bufchain_size(&ps->pending_input_data) > 0) {
  128. ps->freeze = is_frozen;
  129. /* loop while we still have buffered data, and while we are
  130. * unfrozen. the plug_receive call in the loop could result
  131. * in a call back into this function refreezing the socket,
  132. * so we have to check each time.
  133. */
  134. while (!ps->freeze && bufchain_size(&ps->pending_input_data) > 0) {
  135. char databuf[512];
  136. ptrlen data = bufchain_prefix(&ps->pending_input_data);
  137. if (data.len > lenof(databuf))
  138. data.len = lenof(databuf);
  139. memcpy(databuf, data.ptr, data.len);
  140. bufchain_consume(&ps->pending_input_data, data.len);
  141. plug_receive(ps->plug, 0, databuf, data.len);
  142. }
  143. /* if we're still frozen, we'll have to wait for another
  144. * call from the backend to finish unbuffering the data.
  145. */
  146. if (ps->freeze) return;
  147. }
  148. sk_set_frozen(ps->sub_socket, is_frozen);
  149. }
  150. static const char *sk_proxy_socket_error (Socket *s)
  151. {
  152. ProxySocket *ps = container_of(s, ProxySocket, sock);
  153. if (ps->error != NULL || ps->sub_socket == NULL) {
  154. return ps->error;
  155. }
  156. return sk_socket_error(ps->sub_socket);
  157. }
  158. /* basic proxy plug functions */
  159. static void plug_proxy_log(Plug *plug, PlugLogType type, SockAddr *addr,
  160. int port, const char *error_msg, int error_code)
  161. {
  162. ProxySocket *ps = container_of(plug, ProxySocket, plugimpl);
  163. plug_log(ps->plug, type, addr, port, error_msg, error_code);
  164. }
  165. static void plug_proxy_closing(Plug *p, PlugCloseType type,
  166. const char *error_msg)
  167. {
  168. ProxySocket *ps = container_of(p, ProxySocket, plugimpl);
  169. proxy_negotiator_cleanup(ps);
  170. plug_closing(ps->plug, type, error_msg);
  171. }
  172. static void proxy_negotiate(ProxySocket *ps)
  173. {
  174. assert(ps->pn);
  175. proxy_negotiator_process_queue(ps->pn);
  176. if (ps->pn->error) {
  177. char *err = dupprintf("Proxy error: %s", ps->pn->error);
  178. sfree(ps->pn->error);
  179. proxy_negotiator_cleanup(ps);
  180. plug_closing_error(ps->plug, err);
  181. sfree(err);
  182. return;
  183. } else if (ps->pn->aborted) {
  184. proxy_negotiator_cleanup(ps);
  185. plug_closing_user_abort(ps->plug);
  186. return;
  187. }
  188. if (ps->pn->reconnect) {
  189. sk_close(ps->sub_socket);
  190. SockAddr *proxy_addr = sk_addr_dup(ps->proxy_addr);
  191. ps->sub_socket = sk_new(proxy_addr, ps->proxy_port,
  192. ps->proxy_privport, ps->proxy_oobinline,
  193. ps->proxy_nodelay, ps->proxy_keepalive,
  194. &ps->plugimpl);
  195. ps->pn->reconnect = false;
  196. /* If the negotiator has asked us to reconnect, they are
  197. * expecting that on the next call their input queue will
  198. * consist entirely of data from the _new_ connection, without
  199. * any remaining data buffered from the old one. (If they'd
  200. * wanted the latter, they could have read it out of the input
  201. * queue before asking us to close the connection.) */
  202. bufchain_clear(&ps->pending_input_data);
  203. }
  204. while (bufchain_size(&ps->output_from_negotiator)) {
  205. ptrlen data = bufchain_prefix(&ps->output_from_negotiator);
  206. sk_write(ps->sub_socket, data.ptr, data.len);
  207. bufchain_consume(&ps->output_from_negotiator, data.len);
  208. }
  209. if (ps->pn->done)
  210. proxy_activate(ps);
  211. }
  212. static void plug_proxy_receive(
  213. Plug *p, int urgent, const char *data, size_t len)
  214. {
  215. ProxySocket *ps = container_of(p, ProxySocket, plugimpl);
  216. if (ps->pn) {
  217. /* we will lose the urgentness of this data, but since most,
  218. * if not all, of this data will be consumed by the negotiation
  219. * process, hopefully it won't affect the protocol above us
  220. */
  221. bufchain_add(&ps->pending_input_data, data, len);
  222. proxy_negotiate(ps);
  223. } else {
  224. plug_receive(ps->plug, urgent, data, len);
  225. }
  226. }
  227. static void plug_proxy_sent (Plug *p, size_t bufsize)
  228. {
  229. ProxySocket *ps = container_of(p, ProxySocket, plugimpl);
  230. if (ps->pn)
  231. return;
  232. plug_sent(ps->plug, bufsize);
  233. }
  234. static int plug_proxy_accepting(Plug *p,
  235. accept_fn_t constructor, accept_ctx_t ctx)
  236. {
  237. unreachable("ProxySockets never create listening Sockets");
  238. }
  239. /*
  240. * This function can accept a NULL pointer as `addr', in which case
  241. * it will only check the host name.
  242. */
  243. static bool proxy_for_destination(SockAddr *addr, const char *hostname,
  244. int port, Conf *conf)
  245. {
  246. int s = 0, e = 0;
  247. char hostip[64];
  248. int hostip_len, hostname_len;
  249. const char *exclude_list;
  250. /*
  251. * Special local connections such as Unix-domain sockets
  252. * unconditionally cannot be proxied, even in proxy-localhost
  253. * mode. There just isn't any way to ask any known proxy type for
  254. * them.
  255. */
  256. if (addr && sk_address_is_special_local(addr))
  257. return false; /* do not proxy */
  258. /*
  259. * Check the host name and IP against the hard-coded
  260. * representations of `localhost'.
  261. */
  262. if (!conf_get_bool(conf, CONF_even_proxy_localhost) &&
  263. (sk_hostname_is_local(hostname) ||
  264. (addr && sk_address_is_local(addr))))
  265. return false; /* do not proxy */
  266. /* we want a string representation of the IP address for comparisons */
  267. if (addr) {
  268. sk_getaddr(addr, hostip, 64);
  269. hostip_len = strlen(hostip);
  270. } else
  271. hostip_len = 0; /* placate gcc; shouldn't be required */
  272. hostname_len = strlen(hostname);
  273. exclude_list = conf_get_str(conf, CONF_proxy_exclude_list);
  274. /* now parse the exclude list, and see if either our IP
  275. * or hostname matches anything in it.
  276. */
  277. while (exclude_list[s]) {
  278. while (exclude_list[s] &&
  279. (isspace((unsigned char)exclude_list[s]) ||
  280. exclude_list[s] == ',')) s++;
  281. if (!exclude_list[s]) break;
  282. e = s;
  283. while (exclude_list[e] &&
  284. (isalnum((unsigned char)exclude_list[e]) ||
  285. exclude_list[e] == '-' ||
  286. exclude_list[e] == '.' ||
  287. exclude_list[e] == '*')) e++;
  288. if (exclude_list[s] == '*') {
  289. /* wildcard at beginning of entry */
  290. if ((addr && strnicmp(hostip + hostip_len - (e - s - 1),
  291. exclude_list + s + 1, e - s - 1) == 0) ||
  292. strnicmp(hostname + hostname_len - (e - s - 1),
  293. exclude_list + s + 1, e - s - 1) == 0) {
  294. /* IP/hostname range excluded. do not use proxy. */
  295. return false;
  296. }
  297. } else if (exclude_list[e-1] == '*') {
  298. /* wildcard at end of entry */
  299. if ((addr && strnicmp(hostip, exclude_list + s, e - s - 1) == 0) ||
  300. strnicmp(hostname, exclude_list + s, e - s - 1) == 0) {
  301. /* IP/hostname range excluded. do not use proxy. */
  302. return false;
  303. }
  304. } else {
  305. /* no wildcard at either end, so let's try an absolute
  306. * match (ie. a specific IP)
  307. */
  308. if (addr && strnicmp(hostip, exclude_list + s, e - s) == 0)
  309. return false; /* IP/hostname excluded. do not use proxy. */
  310. if (strnicmp(hostname, exclude_list + s, e - s) == 0)
  311. return false; /* IP/hostname excluded. do not use proxy. */
  312. }
  313. s = e;
  314. /* Make sure we really have reached the next comma or end-of-string */
  315. while (exclude_list[s] &&
  316. !isspace((unsigned char)exclude_list[s]) &&
  317. exclude_list[s] != ',') s++;
  318. }
  319. /* no matches in the exclude list, so use the proxy */
  320. return true;
  321. }
  322. static char *dns_log_msg(const char *host, int addressfamily,
  323. const char *reason)
  324. {
  325. return dupprintf("Looking up host \"%s\"%s for %s", host,
  326. (addressfamily == ADDRTYPE_IPV4 ? " (IPv4)" :
  327. addressfamily == ADDRTYPE_IPV6 ? " (IPv6)" :
  328. ""), reason);
  329. }
  330. SockAddr *name_lookup(const char *host, int port, char **canonicalname,
  331. Conf *conf, int addressfamily, LogContext *logctx,
  332. const char *reason)
  333. {
  334. if (conf_get_int(conf, CONF_proxy_type) != PROXY_NONE &&
  335. do_proxy_dns(conf) &&
  336. proxy_for_destination(NULL, host, port, conf)) {
  337. if (logctx)
  338. logeventf(logctx, "Leaving host lookup to proxy of \"%s\""
  339. " (for %s)", host, reason);
  340. *canonicalname = dupstr(host);
  341. return sk_nonamelookup(host);
  342. } else {
  343. if (logctx)
  344. logevent_and_free(
  345. logctx, dns_log_msg(host, addressfamily, reason));
  346. return sk_namelookup(host, canonicalname, addressfamily);
  347. }
  348. }
  349. static const SocketVtable ProxySocket_sockvt = {
  350. .plug = sk_proxy_plug,
  351. .close = sk_proxy_close,
  352. .write = sk_proxy_write,
  353. .write_oob = sk_proxy_write_oob,
  354. .write_eof = sk_proxy_write_eof,
  355. .set_frozen = sk_proxy_set_frozen,
  356. .socket_error = sk_proxy_socket_error,
  357. .peer_info = NULL,
  358. };
  359. static const PlugVtable ProxySocket_plugvt = {
  360. .log = plug_proxy_log,
  361. .closing = plug_proxy_closing,
  362. .receive = plug_proxy_receive,
  363. .sent = plug_proxy_sent,
  364. .accepting = plug_proxy_accepting
  365. };
  366. static char *proxy_description(Interactor *itr)
  367. {
  368. ProxySocket *ps = container_of(itr, ProxySocket, interactor);
  369. assert(ps->pn);
  370. return dupprintf("%s connection to %s port %d", ps->pn->vt->type,
  371. conf_get_str(ps->conf, CONF_proxy_host),
  372. conf_get_int(ps->conf, CONF_proxy_port));
  373. }
  374. static LogPolicy *proxy_logpolicy(Interactor *itr)
  375. {
  376. ProxySocket *ps = container_of(itr, ProxySocket, interactor);
  377. return ps->clientlp;
  378. }
  379. static Seat *proxy_get_seat(Interactor *itr)
  380. {
  381. ProxySocket *ps = container_of(itr, ProxySocket, interactor);
  382. return ps->clientseat;
  383. }
  384. static void proxy_set_seat(Interactor *itr, Seat *seat)
  385. {
  386. ProxySocket *ps = container_of(itr, ProxySocket, interactor);
  387. ps->clientseat = seat;
  388. }
  389. static const InteractorVtable ProxySocket_interactorvt = {
  390. .description = proxy_description,
  391. .logpolicy = proxy_logpolicy,
  392. .get_seat = proxy_get_seat,
  393. .set_seat = proxy_set_seat,
  394. };
  395. static void proxy_prompts_callback(void *ctx)
  396. {
  397. proxy_negotiate((ProxySocket *)ctx);
  398. }
  399. prompts_t *proxy_new_prompts(ProxySocket *ps)
  400. {
  401. prompts_t *prs = new_prompts();
  402. prs->callback = proxy_prompts_callback;
  403. prs->callback_ctx = ps;
  404. return prs;
  405. }
  406. void proxy_spr_abort(ProxyNegotiator *pn, SeatPromptResult spr)
  407. {
  408. if (spr.kind == SPRK_SW_ABORT) {
  409. pn->error = spr_get_error_message(spr);
  410. } else {
  411. assert(spr.kind == SPRK_USER_ABORT);
  412. pn->aborted = true;
  413. }
  414. }
  415. Socket *new_connection(SockAddr *addr, const char *hostname,
  416. int port, bool privport,
  417. bool oobinline, bool nodelay, bool keepalive,
  418. Plug *plug, Conf *conf, Interactor *itr)
  419. {
  420. int type = conf_get_int(conf, CONF_proxy_type);
  421. if (type != PROXY_NONE &&
  422. proxy_for_destination(addr, hostname, port, conf))
  423. {
  424. ProxySocket *ps;
  425. SockAddr *proxy_addr;
  426. char *proxy_canonical_name;
  427. Socket *sret;
  428. if ((type == PROXY_SSH_TCPIP ||
  429. type == PROXY_SSH_EXEC ||
  430. type == PROXY_SSH_SUBSYSTEM) &&
  431. (sret = sshproxy_new_connection(addr, hostname, port, privport,
  432. oobinline, nodelay, keepalive,
  433. plug, conf, itr)) != NULL)
  434. return sret;
  435. if ((sret = platform_new_connection(addr, hostname, port, privport,
  436. oobinline, nodelay, keepalive,
  437. plug, conf, itr)) != NULL)
  438. return sret;
  439. ps = snew(ProxySocket);
  440. ps->sock.vt = &ProxySocket_sockvt;
  441. ps->plugimpl.vt = &ProxySocket_plugvt;
  442. ps->interactor.vt = &ProxySocket_interactorvt;
  443. ps->conf = conf_copy(conf);
  444. ps->plug = plug;
  445. ps->remote_addr = addr; /* will need to be freed on close */
  446. ps->remote_port = port;
  447. ps->error = NULL;
  448. ps->pending_eof = false;
  449. ps->freeze = false;
  450. bufchain_init(&ps->pending_input_data);
  451. bufchain_init(&ps->pending_output_data);
  452. bufchain_init(&ps->pending_oob_output_data);
  453. bufchain_init(&ps->output_from_negotiator);
  454. ps->sub_socket = NULL;
  455. /*
  456. * If we've been given an Interactor by the caller, set ourselves
  457. * up to work with it.
  458. */
  459. if (itr) {
  460. ps->clientitr = itr;
  461. interactor_set_child(ps->clientitr, &ps->interactor);
  462. ps->clientlp = interactor_logpolicy(ps->clientitr);
  463. ps->clientseat = interactor_borrow_seat(ps->clientitr);
  464. }
  465. const ProxyNegotiatorVT *vt;
  466. switch (type) {
  467. case PROXY_HTTP:
  468. vt = &http_proxy_negotiator_vt;
  469. break;
  470. case PROXY_SOCKS4:
  471. vt = &socks4_proxy_negotiator_vt;
  472. break;
  473. case PROXY_SOCKS5:
  474. vt = &socks5_proxy_negotiator_vt;
  475. break;
  476. case PROXY_TELNET:
  477. vt = &telnet_proxy_negotiator_vt;
  478. break;
  479. default:
  480. ps->error = "Proxy error: Unknown proxy method";
  481. return &ps->sock;
  482. }
  483. ps->pn = proxy_negotiator_new(vt);
  484. ps->pn->ps = ps;
  485. ps->pn->done = false;
  486. ps->pn->error = NULL;
  487. ps->pn->aborted = false;
  488. ps->pn->input = &ps->pending_input_data;
  489. /* Provide an Interactor to the negotiator if and only if we
  490. * are usefully able to ask interactive questions of the user */
  491. ps->pn->itr = ps->clientseat ? &ps->interactor : NULL;
  492. bufchain_sink_init(ps->pn->output, &ps->output_from_negotiator);
  493. {
  494. char *logmsg = dupprintf("Will use %s proxy at %s:%d to connect"
  495. " to %s:%d", vt->type,
  496. conf_get_str(conf, CONF_proxy_host),
  497. conf_get_int(conf, CONF_proxy_port),
  498. hostname, port);
  499. plug_log(plug, PLUGLOG_PROXY_MSG, NULL, 0, logmsg, 0);
  500. sfree(logmsg);
  501. }
  502. {
  503. char *logmsg = dns_log_msg(conf_get_str(conf, CONF_proxy_host),
  504. conf_get_int(conf, CONF_addressfamily),
  505. "proxy");
  506. plug_log(plug, PLUGLOG_PROXY_MSG, NULL, 0, logmsg, 0);
  507. sfree(logmsg);
  508. }
  509. /* look-up proxy */
  510. proxy_addr = sk_namelookup(conf_get_str(conf, CONF_proxy_host),
  511. &proxy_canonical_name,
  512. conf_get_int(conf, CONF_addressfamily));
  513. if (sk_addr_error(proxy_addr) != NULL) {
  514. ps->error = "Proxy error: Unable to resolve proxy host name";
  515. sk_addr_free(proxy_addr);
  516. return &ps->sock;
  517. }
  518. sfree(proxy_canonical_name);
  519. {
  520. char addrbuf[256], *logmsg;
  521. sk_getaddr(proxy_addr, addrbuf, lenof(addrbuf));
  522. logmsg = dupprintf("Connecting to %s proxy at %s port %d",
  523. vt->type, addrbuf,
  524. conf_get_int(conf, CONF_proxy_port));
  525. plug_log(plug, PLUGLOG_PROXY_MSG, NULL, 0, logmsg, 0);
  526. sfree(logmsg);
  527. }
  528. /* create the actual socket we will be using,
  529. * connected to our proxy server and port.
  530. */
  531. ps->proxy_addr = sk_addr_dup(proxy_addr);
  532. ps->proxy_port = conf_get_int(conf, CONF_proxy_port);
  533. ps->proxy_privport = privport;
  534. ps->proxy_oobinline = oobinline;
  535. ps->proxy_nodelay = nodelay;
  536. ps->proxy_keepalive = keepalive;
  537. ps->sub_socket = sk_new(proxy_addr, ps->proxy_port,
  538. ps->proxy_privport, ps->proxy_oobinline,
  539. ps->proxy_nodelay, ps->proxy_keepalive,
  540. &ps->plugimpl);
  541. if (sk_socket_error(ps->sub_socket) != NULL)
  542. return &ps->sock;
  543. /* start the proxy negotiation process... */
  544. sk_set_frozen(ps->sub_socket, false);
  545. proxy_negotiate(ps);
  546. return &ps->sock;
  547. }
  548. /* no proxy, so just return the direct socket */
  549. return sk_new(addr, port, privport, oobinline, nodelay, keepalive, plug);
  550. }
  551. Socket *new_listener(const char *srcaddr, int port, Plug *plug,
  552. bool local_host_only, Conf *conf, int addressfamily)
  553. {
  554. /* TODO: SOCKS (and potentially others) support inbound
  555. * TODO: connections via the proxy. support them.
  556. */
  557. return sk_newlistener(srcaddr, port, plug, local_host_only, addressfamily);
  558. }