Public/fileshare
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Show client’s ip address in log

Browse source
This commit is contained in:
Thomas Kolb 2013-08-21 16:07:05 +02:00
parent 7a3d20ee25
commit 119ac79beb
2 changed files with 51 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/main.h
View file

@ -3,6 +3,8 @@
#include <limits.h> #include <limits.h>
#define IPSTR_MAXLEN 47
enum ResultCode { enum ResultCode {
RC_OK = 0, // No problem (so far) RC_OK = 0, // No problem (so far)
RC_EXISTS = 1, // On upload, the file to be uploaded already existed RC_EXISTS = 1, // On upload, the file to be uploaded already existed
@ -26,6 +28,8 @@ struct ConnectionState {
FILE *upload_fd; FILE *upload_fd;
char uploadFilename[PATH_MAX]; char uploadFilename[PATH_MAX];
char clientIP[IPSTR_MAXLEN];
enum ResultCode result; enum ResultCode result;
enum RequestType requestType; enum RequestType requestType;

49
src/main.c
View file

@ -78,6 +78,48 @@ void request_completed(void *cls,
free(connstate); free(connstate);
} }
void get_client_ip_from_connection(struct MHD_Connection *connection,
struct ConnectionState *connstate) {
struct sockaddr **ci =
(struct sockaddr **)MHD_get_connection_info(
connection, MHD_CONNECTION_INFO_CLIENT_ADDRESS);
if(!ci) {
LOG(LVL_ERR, "Could not determine client address.");
return;
}
struct sockaddr *sa = *ci;
// convert ip address and extract port
uint16_t port = 0;
switch(sa->sa_family) {
case AF_INET:
inet_ntop(AF_INET, &(((struct sockaddr_in*)sa)->sin_addr), connstate->clientIP, IPSTR_MAXLEN);
port = ntohs(((struct sockaddr_in*)sa)->sin_port);
break;
case AF_INET6:
strcpy(connstate->clientIP, "[");
inet_ntop(AF_INET6, &(((struct sockaddr_in6*)sa)->sin6_addr), connstate->clientIP+1, IPSTR_MAXLEN-1);
strcat(connstate->clientIP, "]");
port = ntohs(((struct sockaddr_in6*)sa)->sin6_port);
break;
default:
LOG(LVL_ERR, "Address family is invalid: %i.", sa->sa_family);
return;
};
strcat(connstate->clientIP, ":");
int offset = strlen(connstate->clientIP);
sprintf(connstate->clientIP + offset, "%u", port);
}
int parse_range(const char *range, off_t total_len, struct RequestRange *result) { int parse_range(const char *range, off_t total_len, struct RequestRange *result) {
char *numstr; char *numstr;
char *dashptr; char *dashptr;
@ -404,8 +446,11 @@ static int connection_handler(void * cls,
strncpy(connstate->cleanedURL, url, PATH_MAX); strncpy(connstate->cleanedURL, url, PATH_MAX);
remove_trailing_slash(connstate->cleanedURL); remove_trailing_slash(connstate->cleanedURL);
LOG(LVL_INFO, "%s %s (local: %s)", // get the remote address as a string
method, url, connstate->localFileName); get_client_ip_from_connection(connection, connstate);
LOG(LVL_INFO, "%s - %s %s (local: %s)",
connstate->clientIP, method, url, connstate->localFileName);
if (0 == strcmp(method, "GET") || 0 == strcmp(method, "HEAD")) { if (0 == strcmp(method, "GET") || 0 == strcmp(method, "HEAD")) {
// process GET arguments // process GET arguments