Commit f5305fef authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

- Do not store HTTPd clients addresses (unused anyway)

- Use net_Accept()
parent 558e0a6f
...@@ -164,8 +164,6 @@ struct httpd_client_t ...@@ -164,8 +164,6 @@ struct httpd_client_t
int i_ref; int i_ref;
struct sockaddr_storage sock;
int i_sock_size;
int fd; int fd;
int i_mode; int i_mode;
...@@ -1508,9 +1506,7 @@ static void httpd_ClientClean( httpd_client_t *cl ) ...@@ -1508,9 +1506,7 @@ static void httpd_ClientClean( httpd_client_t *cl )
} }
} }
static httpd_client_t *httpd_ClientNew( int fd, struct sockaddr_storage *sock, static httpd_client_t *httpd_ClientNew( int fd, tls_session_t *p_tls, mtime_t now )
int i_sock_size,
tls_session_t *p_tls, mtime_t now )
{ {
httpd_client_t *cl = malloc( sizeof( httpd_client_t ) ); httpd_client_t *cl = malloc( sizeof( httpd_client_t ) );
...@@ -1518,8 +1514,6 @@ static httpd_client_t *httpd_ClientNew( int fd, struct sockaddr_storage *sock, ...@@ -1518,8 +1514,6 @@ static httpd_client_t *httpd_ClientNew( int fd, struct sockaddr_storage *sock,
cl->i_ref = 0; cl->i_ref = 0;
cl->fd = fd; cl->fd = fd;
memcpy( &cl->sock, sock, sizeof( cl->sock ) );
cl->i_sock_size = i_sock_size;
cl->url = NULL; cl->url = NULL;
cl->p_tls = p_tls; cl->p_tls = p_tls;
...@@ -2443,15 +2437,10 @@ static void httpd_HostThread( httpd_host_t *host ) ...@@ -2443,15 +2437,10 @@ static void httpd_HostThread( httpd_host_t *host )
if (ufd[nfd].revents == 0) if (ufd[nfd].revents == 0)
continue; continue;
struct sockaddr_storage addr; int fd = net_Accept (host, host->fds, 0);
socklen_t addrlen = sizeof (addr);
int fd = accept (ufd[nfd].fd, (struct sockaddr *)&addr, &addrlen);
if (fd == -1) if (fd == -1)
continue; continue;
net_SetupSocket (fd);
int i_state = 0; int i_state = 0;
if (p_tls != NULL) if (p_tls != NULL)
...@@ -2474,23 +2463,22 @@ static void httpd_HostThread( httpd_host_t *host ) ...@@ -2474,23 +2463,22 @@ static void httpd_HostThread( httpd_host_t *host )
break; break;
} }
if (p_tls == NULL) if ((p_tls == NULL) != (host->p_tls == NULL))
break; // wasted TLS session, cannot accept() anymore break; // wasted TLS session, cannot accept() anymore
} }
httpd_client_t *cl; httpd_client_t *cl;
char ip[NI_MAXNUMERICHOST];
stats_UpdateInteger( host, host->p_total_counter, 1, NULL ); stats_UpdateInteger( host, host->p_total_counter, 1, NULL );
stats_UpdateInteger( host, host->p_active_counter, 1, NULL ); stats_UpdateInteger( host, host->p_active_counter, 1, NULL );
cl = httpd_ClientNew( fd, &addr, addrlen, p_tls, now ); cl = httpd_ClientNew( fd, p_tls, now );
httpd_ClientIP( cl, ip );
msg_Dbg( host, "Connection from %s", ip );
p_tls = NULL; p_tls = NULL;
vlc_mutex_lock( &host->lock ); vlc_mutex_lock( &host->lock );
TAB_APPEND( host->i_client, host->client, cl ); TAB_APPEND( host->i_client, host->client, cl );
vlc_mutex_unlock( &host->lock ); vlc_mutex_unlock( &host->lock );
cl->i_state = i_state; // override state for TLS cl->i_state = i_state; // override state for TLS
break; // cannot accept more than one because of TLS
if (host->p_tls != NULL)
break; // cannot accept further without new TLS session
} }
/* now try all others socket */ /* now try all others socket */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment