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

refactor done (mostly, at least), ipv6 works btw

Browse Source
This commit is contained in:
Arthur-Coppey 2021-11-12 16:57:17 +01:00
parent a0a1cafa8a
commit 3db7ea49b0
2 changed files with 77 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/main.c
View File

@ -1,10 +1,8 @@
#include "server.h" #include "server.h"
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
// char quote[1024]; // TODO: shell args
// getRandomQuote(quote); server(1, 1);
// printf("%s\n", quote);
tcpServer();
return 0; return 0;
} }

198
server/server.c
View File

@ -4,111 +4,52 @@
#include "server.h" #include "server.h"
//TODO: refactor
//TODO: object-like C //TODO: object-like C
extern int errno; extern int errno;
unsigned long addressLength = sizeof(struct sockaddr_in); _Noreturn void udpListen(int serverSocket, struct sockaddr * clientAddress, unsigned long addressLength) {
long recvLen; int recvLen;
int sock, serverSocket, clientSocket, socketType, socketProtocol; char clientMessage[MESSAGE_STRING_LENGTH], quote[MESSAGE_STRING_LENGTH];
struct sockaddr * srvAddr;
struct sockaddr_in serverAddress, clientAddress;
struct sockaddr_in serverAddress4, clientAddress4;
struct sockaddr_in6 serverAddress6, clientAddress6;
char quote[MESSAGE_STRING_LENGTH] = "";
char clientMessage[MESSAGE_STRING_LENGTH] = "";
void server(int tcp, int ipv6) { for (;;) {
// TODO: things common between tcp/udp here // receive data
// init sock info recvLen = recvfrom(serverSocket, clientMessage, MESSAGE_STRING_LENGTH, 0, clientAddress, (socklen_t *) &addressLength);
memset(&serverAddress, 0, addressLength);
memset(&clientAddress, 0, addressLength);
if (ipv6) { perror("recvfrom");
serverAddress6.sin6_family = AF_INET6; if (recvLen >= 0) {
serverAddress6.sin6_addr = in6addr_any; printf("client says: %s\n", clientMessage);
serverAddress6.sin6_port = htons(17);
srvAddr = (struct sockaddr *) &serverAddress6; // send data
} else { getRandomQuote(quote);
serverAddress4.sin_family = AF_INET; printf("responding: `%s`\n", quote);
serverAddress4.sin_addr.s_addr = INADDR_ANY; sendto(serverSocket, quote, strlen(quote), 0, clientAddress, addressLength);
serverAddress4.sin_port = htons(17); perror("sendto");
srvAddr = (struct sockaddr *) &serverAddress4; }
} }
// create sock
if (tcp) {
socketType = SOCK_STREAM;
socketProtocol = IPPROTO_TCP;
} else {
socketType = SOCK_DGRAM;
socketProtocol = IPPROTO_UDP;
}
serverSocket = socket(srvAddr->sa_family, socketType, socketProtocol);
if (serverSocket == -1) {
puts("socket not created");
exit(1);
}
puts("socket created");
// bind sock
if (bind(serverSocket, srvAddr, addressLength) < 0) {
puts("bind failed");
exit(2);
}
// TODO: udp/tcp
} }
void tcpServer() { void tcpListen(int serverSocket, struct sockaddr * clientAddress, unsigned long addressLength) {
/*initialize socket info*/ int clientSocket;
memset(&serverAddress, 0, addressLength); char quote[MESSAGE_STRING_LENGTH] = "", clientMessage[MESSAGE_STRING_LENGTH] = "";
memset(&clientAddress, 0, addressLength);
serverAddress.sin_family = AF_INET;
serverAddress.sin_addr.s_addr = INADDR_ANY;
serverAddress.sin_port = htons(17);
/*create socket*/
serverSocket = socket(serverAddress.sin_family, SOCK_STREAM, IPPROTO_TCP);
if (serverSocket == -1) {
puts("socket not created");
exit(1);
}
puts("socket created");
/*bind socket to address:port*/
if (bind(serverSocket, (const struct sockaddr *) &serverAddress, addressLength) < 0) {
puts("bind failed");
exit(2);
}
puts("address bound");
/*start listening*/
listen(serverSocket, 5); listen(serverSocket, 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, (struct sockaddr *) &clientAddress, (socklen_t *) &addressLength)) >= while ((clientSocket = accept(serverSocket, clientAddress, (socklen_t *) &addressLength)) >=
0) { 0) {
puts("client connected"); puts("client connected");
/*receive data*/ // receive data
while ((recvLen = recv(clientSocket, clientMessage, MESSAGE_STRING_LENGTH, 0))) { while (recv(clientSocket, clientMessage, MESSAGE_STRING_LENGTH, 0) >= 0) {
if (recvLen < 0) { printf("client says: %s\n", clientMessage);
puts("receive failed");
} else {
printf("client says: %s\n", clientMessage);
/*send data*/ // send data
getRandomQuote(quote); getRandomQuote(quote);
printf("responding: \"%s\"\n", quote); printf("responding: \"%s\"\n", quote);
send(clientSocket, quote, strlen(quote), 0); send(clientSocket, quote, strlen(quote), 0);
}
} }
puts("client disconnected"); puts("client disconnected");
@ -120,50 +61,61 @@ void tcpServer() {
} }
} }
_Noreturn void udpServer() { void server(int tcp, int ipv6) {
/*initialize sock info*/ int serverSocket, socketType, socketProtocol;
memset(&serverAddress, 0, addressLength); unsigned long serverAddressLength, clientAddressLength;
memset(&clientAddress, 0, addressLength); struct sockaddr *serverAddress, *clientAddress;
struct sockaddr_in serverAddress4, clientAddress4;
struct sockaddr_in6 serverAddress6, clientAddress6;
serverAddress.sin_family = AF_INET; if (ipv6) {
serverAddress.sin_addr.s_addr = INADDR_ANY; serverAddress6.sin6_family = AF_INET6;
serverAddress.sin_port = htons(17); serverAddress6.sin6_addr = in6addr_any;
serverAddress6.sin6_port = htons(17);
serverAddress = (struct sockaddr *) &serverAddress6;
serverAddressLength = sizeof serverAddress6;
/*create sock*/ clientAddress6.sin6_family = AF_INET6;
sock = socket(serverAddress.sin_family, SOCK_DGRAM, IPPROTO_UDP); clientAddress = (struct sockaddr *) &clientAddress6;
if (sock == -1) { clientAddressLength = sizeof clientAddress6;
puts("sock not created"); } else {
serverAddress4.sin_family = AF_INET;
serverAddress4.sin_addr.s_addr = INADDR_ANY;
serverAddress4.sin_port = htons(17);
serverAddress = (struct sockaddr *) &serverAddress4;
serverAddressLength = sizeof serverAddress4;
clientAddress4.sin_family = AF_INET;
clientAddress = (struct sockaddr *) &clientAddress4;
clientAddressLength = sizeof clientAddress4;
}
if (tcp) {
socketType = SOCK_STREAM;
socketProtocol = IPPROTO_TCP;
} else {
socketType = SOCK_DGRAM;
socketProtocol = IPPROTO_UDP;
}
// create sock
serverSocket = socket(serverAddress->sa_family, socketType, socketProtocol);
if (serverSocket == -1) {
puts("socket not created");
exit(1); exit(1);
} }
puts("sock created"); puts("socket created");
/*bind sock to address:port*/ // bind sock
if (bind(sock, (const struct sockaddr *) &serverAddress, addressLength) < 0) { if (bind(serverSocket, serverAddress, serverAddressLength) < 0) {
puts("bind failed"); puts("bind failed");
exit(2); exit(2);
} }
puts("address bound");
//TODO: t h r e a d s ? // TODO: threads to run both at the same time
for (;;) { if (tcp) {
/*receive data*/ tcpListen(serverSocket, clientAddress, clientAddressLength);
recvLen = recvfrom(sock, clientMessage, MESSAGE_STRING_LENGTH, 0, } else {
(struct sockaddr *) &clientAddress, (socklen_t *) &addressLength); udpListen(serverSocket, clientAddress, clientAddressLength);
uint16_t port = ntohs(clientAddress.sin_port);
char *ipv4 = inet_ntoa(clientAddress.sin_addr);
printf("recvLen = %ld from = %s:%d\nmsg = `%s`\n", recvLen, ipv4, port, clientMessage);
perror("recvfrom");
if (recvLen >= 0) {
printf("client says: %s\n", clientMessage);
/*send data*/
getRandomQuote(quote);
printf("responding: `%s`\n", quote);
sendto(sock, strcat(quote, "\n"), sizeof quote, 0, (struct sockaddr *) &clientAddress, addressLength);
perror("sendto");
}
} }
} }