sigmasternchen/CFloor
1
0
Fork 0
mirror of https://github.com/sigmasternchen/CFloor synced 2025-03-15 12:28:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

get peer addr and name

Browse source
This commit is contained in:
overflowerror 2019-03-07 16:55:29 +01:00
parent 4162b78397
commit 7fc0da16f4
3 changed files with 51 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/misc.h
View file

@ -5,6 +5,8 @@
#include <pthread.h>
#include <arpa/inet.h>
enum method {
GET, POST, PUT
};
@ -46,8 +48,15 @@ struct bind {
struct bind_private _private;
};
struct peer {
// INET6_ADDRSTRLEN should be enough
char addr[INET6_ADDRSTRLEN + 1];
char* name;
};
struct request {
struct metaData metaData;
struct peer peer;
struct headers* headers;
struct bind bind;
int fd;

44
src/networking.c
View file

@ -10,6 +10,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
#include <arpa/inet.h>
#include "networking.h"
#include "linked.h"
@ -101,6 +102,9 @@ void cleanup() {
close(connection->fd);
if (connection->peer.name != NULL)
free(connection->peer.name);
free(connection);
linked_unlink(link);
@ -226,6 +230,7 @@ void* responseThread(void* data) {
.metaData = connection->metaData,
.headers = &(connection->headers),
.fd = connection->threads.requestFd,
.peer = connection->peer,
.userData = connection->threads.handler.data,
._private = connection
}, (struct response) {
@ -552,8 +557,8 @@ void* listenThread(void* _bind) {
freeaddrinfo(result);
while(true) {
struct sockaddr_in client;
socklen_t clientSize = sizeof (struct sockaddr_in);
struct sockaddr_storage client;
socklen_t clientSize = sizeof (client);
tmp = accept(bindObj->_private.socketFd, (struct sockaddr *) &client, &clientSize);
if (tmp < 0) {
@ -588,8 +593,41 @@ void* listenThread(void* _bind) {
continue;
}
struct peer peer;
int family = client.ss_family;
void* addrPtr;
if (family == AF_INET)
addrPtr = &(((struct sockaddr_in*) &(client))->sin_addr);
else if (family == AF_INET6)
addrPtr = &(((struct sockaddr_in*) &(client))->sin_addr);
if (inet_ntop(family, addrPtr, &(peer.addr[0]), INET6_ADDRSTRLEN + 1) == NULL) {
error("networking: Couldn't set peer addr string: %s", strerror(errno));
return NULL;
}
struct hostent entry;
struct hostent* result;
int h_errno;
#define LOCAL_BUFFER_SIZE (128)
char buffer[LOCAL_BUFFER_SIZE];
gethostbyaddr_r(&(client), sizeof(client), family, &entry, &(buffer[0]), LOCAL_BUFFER_SIZE, &result, &h_errno);
if (result == NULL) {
peer.name = strclone("");
} else {
peer.name = strclone(entry.h_name);
if (peer.name == NULL) {
error("networking: Couldn't strclone hostname: %s", strerror(errno));
peer.name = strclone("");
}
}
connection->state = OPENED;
connection->client = client;
connection->peer = peer;
connection->bind = bindObj;
connection->fd = tmp;
connection->metaData = (struct metaData) {

2
src/networking.h
View file

@ -41,7 +41,7 @@ struct threads {
struct connection {
enum connectionState state;
struct sockaddr_in client;
struct peer peer;
struct bind* bind;
volatile sig_atomic_t inUse;
int fd;