Skip to content

Give each PSK thread its own heap copy of connfd #582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
night1rider wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Give each PSK thread its own heap copy of connfd #582

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion psk/server-psk-threaded.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ void* wolfssl_thread(void* fd)
char buf[MAXLINE];
char response[] = "I hear ya for shizzle";

/* fd was heap-allocated per connection by main(); free it now that the
* descriptor has been copied into connfd. */
free(fd);

memset(buf, 0, MAXLINE);

/* create WOLFSSL object */
Expand Down Expand Up @@ -230,12 +234,26 @@ int main()
return 1;
}
else {
int* connfd_ptr;

printf("Connection from %s, port %d\n",
inet_ntop(AF_INET, &cliAddr.sin_addr, buff, sizeof(buff)),
ntohs(cliAddr.sin_port));

if (pthread_create(&thread, NULL, &wolfssl_thread, (void*) &connfd)
/* Give each thread its own heap-allocated copy of the descriptor;
* passing &connfd would let the next accept() overwrite it. */
connfd_ptr = malloc(sizeof(int));
if (connfd_ptr == NULL) {
printf("Fatal error : malloc error\n");
close(connfd);
return 1;
}
*connfd_ptr = connfd;

if (pthread_create(&thread, NULL, &wolfssl_thread, connfd_ptr)
!= 0) {
close(connfd);
free(connfd_ptr);
return 1;
}
if (pthread_detach(thread) != 0) {
Expand Down