K0RB4K/qotd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Threads work, turns out listening on ipv6 also listens on ipv4. Look into IPV6_V6ONLY flag.

Browse Source
This commit is contained in:
Arthur-Coppey 2022-11-06 01:22:24 +01:00 committed by K0RB4K
parent cea7131f77
commit 252493b4ea
No known key found for this signature in database
GPG Key ID: F660F5EB2DE2EA3E
5 changed files with 93 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.h
View File

@ -5,8 +5,8 @@
#ifndef QOTD_CONFIG_H #ifndef QOTD_CONFIG_H
#define QOTD_CONFIG_H #define QOTD_CONFIG_H
#define QUOTES_FILE "./quotes.txt" #define QUOTES_FILE "./qotd.txt"
#define MESSAGE_STRING_LENGTH 2048 #define MESSAGE_STRING_LENGTH 2048
#define DEFAULT_LISTEN_PORT 17 // should be 17 to be RFC compliant #define DEFAULT_LISTEN_PORT 7878 // should be 17 to be RFC compliant
#endif //QOTD_CONFIG_H #endif //QOTD_CONFIG_H

9
main.c
View File

@ -4,14 +4,7 @@
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
// TODO: shell args // TODO: shell args
// pthread_t threadHandle; server(1, 0);
// pthread_attr_t attr;
// pthread_attr_init(&attr);
// pthread_create(&threadHandle, &attr, (void *(*)(void *)) threadTest, "a");
// void * ret;
// pthread_join(threadHandle, &ret);
// printf("%d", ret);
server(1, 1);
return 0; return 0;
} }

2
quote.c
View File

@ -5,6 +5,8 @@
#include "quote.h" #include "quote.h"
#include "config.h" #include "config.h"
//TODO: error handling
void getRandomQuote(char quote[2048]) { void getRandomQuote(char quote[2048]) {
int lineCount; int lineCount;
long line; long line;

164
server.c
View File

@ -6,141 +6,147 @@
#include "config.h" #include "config.h"
//TODO: object-like C //TODO: object-like C
//TODO: refactoring, cleanup
extern int errno; extern int errno;
_Noreturn void udpListen(void * sock) { _Noreturn void udpListen(void * args[]) {
struct sockinfo * socket = (struct sockinfo *) sock; struct sockinfo * server = (struct sockinfo *) args[0];
struct sockinfo * client = (struct sockinfo *) args[1];
char quote[MESSAGE_STRING_LENGTH] = "", clientMessage[MESSAGE_STRING_LENGTH] = "";
char clientMessage[MESSAGE_STRING_LENGTH], quote[MESSAGE_STRING_LENGTH]; // create args
int serverSocket = socket->handle; server->handle = socket(server->address->sa_family, SOCK_DGRAM, IPPROTO_UDP);
struct sockaddr * clientAddress = socket->address; if (server->handle == -1) {
unsigned long addressLength = socket->addressLength; perror("socket not created");
exit(1);
}
puts("socket created");
// bind args
if (bind(server->handle, server->address, server->addressLength) < 0) {
perror("bind failed");
exit(2);
}
for (;;) { for (;;) {
// receive data // receive data
if (recvfrom(server->handle, clientMessage, MESSAGE_STRING_LENGTH, IPV6_V6ONLY, client->address, &client->addressLength) >= 0) {
if (recvfrom(serverSocket, clientMessage, MESSAGE_STRING_LENGTH, 0, clientAddress, (socklen_t *) &addressLength) >= 0) {
printf("received: %s\n", clientMessage); printf("received: %s\n", clientMessage);
// send data // send data
getRandomQuote(quote); getRandomQuote(quote);
printf("sending: %s\n", quote); printf("sending: %s\n", quote);
if (sendto(serverSocket, quote, strlen(quote), 0, clientAddress, addressLength) == -1) { if (sendto(server->handle, quote, (long) strlen(quote), IPV6_V6ONLY, client->address, client->addressLength) == -1) {
perror("udp: sendto"); perror("[UDP: SENDTO]");
} }
} else { } else {
perror("udp: recvfrom"); perror("[UDP: RECVFROM]");
} }
} }
} }
void tcpListen(void * sock) { void tcpListen(void * args[]) {
struct sockinfo * socket = (struct sockinfo *) sock; struct sockinfo * server = (struct sockinfo *) args[0];
struct sockinfo * client = (struct sockinfo *) args[1];
int clientSocket;
char quote[MESSAGE_STRING_LENGTH] = "", clientMessage[MESSAGE_STRING_LENGTH] = ""; char quote[MESSAGE_STRING_LENGTH] = "", clientMessage[MESSAGE_STRING_LENGTH] = "";
int serverSocket = socket->handle;
struct sockaddr * clientAddress = socket->address;
unsigned long addressLength = socket->addressLength;
listen(serverSocket, 5); // create args
server->handle = socket(server->address->sa_family, SOCK_STREAM, IPPROTO_TCP);
if (server->handle == -1) {
perror("socket not created");
exit(1);
}
puts("socket created");
// bind args
if (bind(server->handle, server->address, server->addressLength) < 0) {
perror("bind failed");
exit(2);
}
listen(server->handle, 5);
puts("server listening"); puts("server listening");
// accept connections // accept connections
//TODO: t h r e a d s //TODO: t h r e a d s
while ((clientSocket = accept(serverSocket, clientAddress, (socklen_t *) &addressLength)) >= 0) { while ((client->handle = accept(server->handle, client->address, &client->addressLength)) >= 0) {
puts("client connected"); puts("client connected");
// receive data // receive data
if (recv(clientSocket, clientMessage, MESSAGE_STRING_LENGTH, 0) >= 0) { if (recv(client->handle, clientMessage, MESSAGE_STRING_LENGTH, IPV6_V6ONLY) >= 0) {
printf("client says: %s\n", clientMessage); printf("client says: %s\n", clientMessage);
// send data // send data
getRandomQuote(quote); getRandomQuote(quote);
printf("responding: \"%s\"\n", quote); printf("responding: \"%s\"\n", quote);
if (send(clientSocket, quote, strlen(quote), 0) == -1) { if (send(client->handle, quote, (long) strlen(quote), IPV6_V6ONLY) == -1) {
perror("tcp: send"); perror("[TCP: SEND]");
} }
} else { } else {
perror("tcp: recv"); perror("[TCP: RECV]");
} }
close(clientSocket); close(client->handle);
puts("closed connection"); puts("closed connection");
} }
if (clientSocket < 0) { if (client->handle < 0) {
puts("client connection failed"); perror("client connection failed");
exit(3); exit(3);
} }
} }
void server(int tcp, int ipv6) { void server(int tcp, int ipv6) {
int socketType, socketProtocol; struct sockinfo client4, client6;
struct sockinfo server, client; struct sockinfo udp4, udp6, tcp4, tcp6;
struct sockaddr_in serverAddress4, clientAddress4; struct sockaddr_in serverAddress4, clientAddress4;
struct sockaddr_in6 serverAddress6, clientAddress6; struct sockaddr_in6 serverAddress6, clientAddress6;
if (ipv6) { serverAddress6.sin6_family = AF_INET6;
serverAddress6.sin6_family = AF_INET6; serverAddress6.sin6_addr = in6addr_any;
serverAddress6.sin6_addr = in6addr_any; serverAddress6.sin6_port = htons(DEFAULT_LISTEN_PORT);
serverAddress6.sin6_port = htons(DEFAULT_LISTEN_PORT);
server.address = (struct sockaddr *) &serverAddress6; tcp6.address = (struct sockaddr *) &serverAddress6;
server.addressLength = sizeof serverAddress6; udp6.address = (struct sockaddr *) &serverAddress6;
tcp6.addressLength = sizeof serverAddress6;
udp6.addressLength = sizeof serverAddress6;
clientAddress6.sin6_family = AF_INET6; clientAddress6.sin6_family = AF_INET6;
client.address = (struct sockaddr *) &clientAddress6; client6.address = (struct sockaddr *) &clientAddress6;
client.addressLength = sizeof clientAddress6; client6.addressLength = sizeof clientAddress6;
} else {
serverAddress4.sin_family = AF_INET;
serverAddress4.sin_addr.s_addr = INADDR_ANY;
serverAddress4.sin_port = htons(DEFAULT_LISTEN_PORT);
server.address = (struct sockaddr *) &serverAddress4; serverAddress4.sin_family = AF_INET;
server.addressLength = sizeof serverAddress4; serverAddress4.sin_addr.s_addr = INADDR_ANY;
serverAddress4.sin_port = htons(DEFAULT_LISTEN_PORT);
clientAddress4.sin_family = AF_INET; tcp4.address = (struct sockaddr *) &serverAddress4;
client.address = (struct sockaddr *) &clientAddress4; udp4.address = (struct sockaddr *) &serverAddress4;
client.addressLength = sizeof clientAddress4; tcp4.addressLength = sizeof serverAddress4;
} udp4.addressLength = sizeof serverAddress4;
if (tcp) { clientAddress4.sin_family = AF_INET;
socketType = SOCK_STREAM; client4.address = (struct sockaddr *) &clientAddress4;
socketProtocol = IPPROTO_TCP; client4.addressLength = sizeof clientAddress4;
} else {
socketType = SOCK_DGRAM;
socketProtocol = IPPROTO_UDP;
}
// create sock void * tcp6Args[] = {&tcp6, &client6};
server.handle = socket(server.address->sa_family, socketType, socketProtocol); void * udp6Args[] = {&udp6, &client6};
if (server.handle == -1) { void * tcp4Args[] = {&tcp4, &client4};
puts("socket not created"); void * udp4Args[] = {&udp4, &client4};
exit(1);
}
puts("socket created");
// bind sock
if (bind(server.handle, server.address, server.addressLength) < 0) {
puts("bind failed");
exit(2);
}
// TODO: threads to run both at the same time // TODO: threads to run both at the same time
pthread_t tcpHandle, udpHandle; pthread_t tcp6Handle, udp6Handle, tcp4Handle, udp4Handle;
pthread_attr_t attr; pthread_attr_t attr;
pthread_attr_init(&attr); pthread_attr_init(&attr);
pthread_create(&tcpHandle, &attr, (void *(*)(void *)) tcpListen, (void *) &server); pthread_create(&tcp6Handle, &attr, (void *(*)(void *)) tcpListen, tcp6Args);
pthread_create(&udpHandle, &attr, (void *(*)(void *)) udpListen, (void *) &server); pthread_create(&udp6Handle, &attr, (void *(*)(void *)) udpListen, udp6Args);
void * tcpReturn, * udpReturn; // pthread_create(&tcp4Handle, &attr, (void *(*)(void *)) tcpListen, tcp4Args);
pthread_join(tcpHandle, tcpReturn); // pthread_create(&udp4Handle, &attr, (void *(*)(void *)) udpListen, udp4Args);
pthread_join(udpHandle, udpReturn);
// if (tcp) { void * tcp6Return, * udp6Return, * tcp4Return, * udp4Return;
// tcpListen(&server); pthread_join(tcp6Handle, tcp6Return);
// } else { pthread_join(udp6Handle, udp6Return);
// udpListen(&server); // pthread_join(tcp4Handle, tcp4Return);
// } // pthread_join(udp4Handle, udp4Return);
} }

6
server.h
View File

@ -21,13 +21,13 @@
struct sockinfo { struct sockinfo {
int handle; int handle;
struct sockaddr * address; struct sockaddr * address;
unsigned long addressLength; socklen_t addressLength;
}; };
void server(int tcp, int ipv6); void server(int tcp, int ipv6);
void tcpListen(void * socket); void tcpListen(void * args[]);
_Noreturn void udpListen(void * socket); _Noreturn void udpListen(void * args[]);
#endif //QOTD_SERVER_H #endif //QOTD_SERVER_H