Skip to content

Commit c7fa7bf

Browse files
committed
simplify start_chain struct setup
1 parent 29df9ab commit c7fa7bf

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/core.c

+6-7
Original file line numberDiff line numberDiff line change
@@ -432,21 +432,20 @@ static int tunnel_to(int sock, ip_type ip, unsigned short port, proxy_type pt, c
432432
#define RRT "Round Robin chain"
433433

434434
static int start_chain(int *fd, proxy_data * pd, char *begin_mark) {
435-
struct sockaddr_in addr;
436-
char ip_buf[16];
437-
438435
*fd = socket(PF_INET, SOCK_STREAM, 0);
439436
if(*fd == -1)
440437
goto error;
441438

439+
char ip_buf[16];
442440
pc_stringfromipv4(&pd->ip.octet[0], ip_buf);
443441
proxychains_write_log(LOG_PREFIX "%s " TP " %s:%d ",
444442
begin_mark, ip_buf, htons(pd->port));
445443
pd->ps = PLAY_STATE;
446-
memset(&addr, 0, sizeof(addr));
447-
addr.sin_family = AF_INET;
448-
addr.sin_addr.s_addr = (in_addr_t) pd->ip.as_int;
449-
addr.sin_port = pd->port;
444+
struct sockaddr_in addr = {
445+
.sin_family = AF_INET,
446+
.sin_port = pd->port,
447+
.sin_addr.s_addr = (in_addr_t) pd->ip.as_int
448+
};
450449
if(timed_connect(*fd, (struct sockaddr *) &addr, sizeof(addr))) {
451450
pd->ps = DOWN_STATE;
452451
goto error1;

0 commit comments

Comments
 (0)