From f435ce69a7cce1095f97536e79cede248d7a1fe7 Mon Sep 17 00:00:00 2001 From: Razvan Crainea Date: Thu, 22 Jan 2015 13:18:01 +0200 Subject: [PATCH] rename old tcp_init function --- main.c | 2 +- tcp_init.h | 2 +- tcp_main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main.c b/main.c index 4953c07d75..0a7c73283b 100644 --- a/main.c +++ b/main.c @@ -816,7 +816,7 @@ static int main_loop(void) if (!tcp_disable){ for(si=tcp_listen; si; si=si->next){ /* same thing for tcp */ - if (tcp_init(si)==-1) goto error; + if (tcp_init_old(si)==-1) goto error; /* get first ipv4/ipv6 socket*/ if ((si->address.af==AF_INET)& ((sendipv4_tcp==0)||(sendipv4_tcp->flags&SI_IS_LO))) diff --git a/tcp_init.h b/tcp_init.h index 6cb6bb69fd..4934ae5e3c 100644 --- a/tcp_init.h +++ b/tcp_init.h @@ -31,7 +31,7 @@ int init_tcp(); void destroy_tcp(); -int tcp_init(struct socket_info* sock_info); +int tcp_init_old(struct socket_info* sock_info); int tcp_init_children(int *chd_rank, int *startup_done); void tcp_main_loop(); void tcp_receive_loop(int unix_sock); diff --git a/tcp_main.c b/tcp_main.c index 57513e9ca0..13b4b38873 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -1307,7 +1307,7 @@ int tcp_send(struct socket_info* send_sock, int type, char* buf, unsigned len, -int tcp_init(struct socket_info* sock_info) +int tcp_init_old(struct socket_info* sock_info) { union sockaddr_union* addr; int optval;