global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-19 05:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

daemon: add helper function setup_named_sock()

Browse Source 
Add setup_named_sock() as helper function for socksetup to make it easier
to create more than one listen sockets. named_sock_setup can be called
more than one time and add the new sockets to the supplied socklist_p.

Signed-off-by: Alexander Sulfrian <alexander@sulfrian.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alexander Sulfrian
2010-08-29 17:13:15 +02:00
committed by Junio C Hamano
parent 515cc01019
commit 9b178ba84d
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
daemon.c
View File

@@ -736,9 +736,9 @@ static int set_reuse_addr(int sockfd)
#ifndef NO_IPV6
static int socksetup(char *listen_addr, int listen_port, int **socklist_p)
static int setup_named_sock(char *listen_addr, int listen_port, int **socklist_p, int socknum)
{
int socknum = 0, *socklist = NULL;
int *socklist = *socklist_p;
int maxfd = -1;
char pbuf[NI_MAXSERV];
struct addrinfo hints, *ai0, *ai;
@@ -810,8 +810,9 @@ static int socksetup(char *listen_addr, int listen_port, int **socklist_p)
#else /* NO_IPV6 */
static int socksetup(char *listen_addr, int listen_port, int **socklist_p)
static int setup_named_sock(char *listen_addr, int listen_port, int **socklist_p, int socknum)
{
int *socklist = *socklist_p;
struct sockaddr_in sin;
int sockfd;
long flags;
@@ -823,41 +824,53 @@ static int socksetup(char *listen_addr, int listen_port, int **socklist_p)
if (listen_addr) {
/* Well, host better be an IP address here. */
if (inet_pton(AF_INET, listen_addr, &sin.sin_addr.s_addr) <= 0)
return 0;
return socknum;
} else {
sin.sin_addr.s_addr = htonl(INADDR_ANY);
}
sockfd = socket(AF_INET, SOCK_STREAM, 0);
if (sockfd < 0)
return 0;
return socknum;
if (set_reuse_addr(sockfd)) {
close(sockfd);
return 0;
return socknum;
}
if ( bind(sockfd, (struct sockaddr *)&sin, sizeof sin) < 0 ) {
close(sockfd);
return 0;
return socknum;
}
if (listen(sockfd, 5) < 0) {
close(sockfd);
return 0;
return socknum;
}
flags = fcntl(sockfd, F_GETFD, 0);
if (flags >= 0)
fcntl(sockfd, F_SETFD, flags | FD_CLOEXEC);
*socklist_p = xmalloc(sizeof(int));
**socklist_p = sockfd;
return 1;
socklist = xrealloc(socklist, sizeof(int) * (socknum + 1));
socklist[socknum++] = sockfd;
*socklist_p = socklist;
return socknum;
}
#endif
static int socksetup(char *listen_addr, int listen_port, int **socklist_p)
{
int socknum = 0, *socklist = NULL;
socknum = setup_named_sock(listen_addr, listen_port, &socklist, socknum);
*socklist_p = socklist;
return socknum;
}
static int service_loop(int socknum, int *socklist)
{
struct pollfd *pfd;