third-party-mirrors/sslh
1
0
Fork 0
mirror of https://github.com/yrutschle/sslh.git synced 2025-04-13 07:37:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

alloc_cnx returns cnx pointer instead of simple error code

Browse Source
This commit is contained in:
yrutschle 2021-04-17 21:29:38 +02:00
parent a487ad4cbe
commit 41a914b350
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
collection.c
View File

@ -61,11 +61,11 @@ int collection_add_fd(cnx_collection* collection, struct connection* cnx, int fd
} }
/* Allocates a connection and inits it with specified file descriptor */ /* Allocates a connection and inits it with specified file descriptor */
int collection_alloc_cnx_from_fd(struct cnx_collection* collection, int fd) struct connection* collection_alloc_cnx_from_fd(struct cnx_collection* collection, int fd)
{ {
struct connection* cnx = malloc(sizeof(*cnx)); struct connection* cnx = malloc(sizeof(*cnx));
if (!cnx) return -1; if (!cnx) return NULL;
init_cnx(cnx); init_cnx(cnx);
cnx->q[0].fd = fd; cnx->q[0].fd = fd;
@ -74,7 +74,7 @@ int collection_alloc_cnx_from_fd(struct cnx_collection* collection, int fd)
gap_set(collection->fd2cnx, fd, cnx); gap_set(collection->fd2cnx, fd, cnx);
return 0; return cnx;
} }
/* Remove a connection from the collection */ /* Remove a connection from the collection */

2
collection.h
View File

@ -7,7 +7,7 @@ typedef struct cnx_collection cnx_collection;
cnx_collection* collection_init(void); cnx_collection* collection_init(void);
void collection_destroy(cnx_collection* collection); void collection_destroy(cnx_collection* collection);
int collection_alloc_cnx_from_fd(cnx_collection* collection, int fd); struct connection* collection_alloc_cnx_from_fd(cnx_collection* collection, int fd);
int collection_add_fd(cnx_collection* collection, struct connection* cnx, int fd); int collection_add_fd(cnx_collection* collection, struct connection* cnx, int fd);
/* Remove a connection from the collection */ /* Remove a connection from the collection */

4
sslh-select.c
View File

@ -113,8 +113,8 @@ static int accept_new_connection(int listen_socket, struct cnx_collection *colle
return -1; return -1;
} }
res = collection_alloc_cnx_from_fd(collection, in_socket); struct connection* cnx = collection_alloc_cnx_from_fd(collection, in_socket);
if (res == -1) { if (!cnx) {
close(in_socket); close(in_socket);
return -1; return -1;
} }