Fix e2 port specs, otherwise we get:

"Error from socket() fd2: Protocol not supported (43)
Error opening socket: Bad file descriptor (9)"
pull/13/head
Soner Tari 7 years ago
parent 85a96ec844
commit ad63380b07

@ -334,6 +334,17 @@ proxyspec_parse(int *argc, char **argv[], const char *natengine)
case 1: case 1:
/* listenaddr */ /* listenaddr */
addr = **argv; addr = **argv;
/* XXX: E2 address defs */
/* TODO: Make this command line or conf file option */
sys_sockaddr_parse(&spec->e2src_addr,
&spec->e2src_addrlen,
"127.0.0.1", "8080", AF_INET, 0);
sys_sockaddr_parse(&spec->e2dst_addr,
&spec->e2dst_addrlen,
"127.0.0.1", "0", AF_INET, 0);
state++; state++;
break; break;
case 2: case 2:
@ -438,15 +449,15 @@ proxyspec_parse(int *argc, char **argv[], const char *natengine)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
sys_sockaddr_parse(&spec->e2src_addr, // sys_sockaddr_parse(&spec->e2src_addr,
&spec->e2src_addrlen, // &spec->e2src_addrlen,
"127.0.0.1", "8080", AF_INET, 0); // "127.0.0.1", "8080", AF_INET, 0);
// "127.0.0.1", "8128", AF_INET, 0); //// "127.0.0.1", "8128", AF_INET, 0);
//
sys_sockaddr_parse(&spec->e2dst_addr, // sys_sockaddr_parse(&spec->e2dst_addr,
&spec->e2dst_addrlen, // &spec->e2dst_addrlen,
// "127.0.0.1", "8128", AF_INET, 0); //// "127.0.0.1", "8128", AF_INET, 0);
"127.0.0.1", "0", AF_INET, 0); // "127.0.0.1", "0", AF_INET, 0);
return spec; return spec;
} }

@ -247,7 +247,7 @@ proxy_listener_acceptcb(UNUSED struct evconnlistener *listener,
log_dbg_printf(">>>>>------------------------------------------------------------------------------------ proxy_listener_acceptcb(): fd=%d, previous fd2=%d\n", fd, lctx->fd2); log_dbg_printf(">>>>>------------------------------------------------------------------------------------ proxy_listener_acceptcb(): fd=%d, previous fd2=%d\n", fd, lctx->fd2);
log_dbg_printf(">>>>> proxy_listener_acceptcb: SETTING UP E2\n"); log_dbg_printf(">>>>> proxy_listener_acceptcb: SETTING UP E2, lctx->clisock=%d\n", lctx->clisock);
evutil_socket_t fd2; evutil_socket_t fd2;
if ((fd2 = privsep_client_opensock_e2(lctx->clisock, lctx->spec)) == -1) { if ((fd2 = privsep_client_opensock_e2(lctx->clisock, lctx->spec)) == -1) {
log_err_printf("Error opening socket: %s (%i)\n", log_err_printf("Error opening socket: %s (%i)\n",

Loading…
Cancel
Save