Overview
Comment: | Added more log messages and support for error pages |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
70ecb45a61751dbf49c4a03fd7f0909e |
User & Date: | rkeene on 2014-02-04 11:51:37 |
Other Links: | manifest | tags |
Context
2014-02-04
| ||
12:02 | Check sendfile() output and log check-in: 16b1aecd99 user: rkeene tags: trunk | |
11:51 | Added more log messages and support for error pages check-in: 70ecb45a61 user: rkeene tags: trunk | |
10:18 | Added basic support for HTTP requests check-in: 4bbee8f607 user: rkeene tags: trunk | |
Changes
Modified filed.c from [0f86783dca] to [456b09599d].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | #include <sys/sendfile.h> #include <sys/socket.h> #include <sys/types.h> #include <arpa/inet.h> #include <sys/mman.h> #include <sys/stat.h> #include <pthread.h> #include <stdlib.h> #include <unistd.h> #include <string.h> #include <fcntl.h> #include <stdio.h> /* Default values */ #define MAX_FAILURE_COUNT 30 #define PORT 8080 #define THREAD_COUNT 10 #define BIND_ADDR "::" /* Arguments for worker threads */ struct filed_worker_thread_args { int fd; }; static void filed_init(void) { mlockall(MCL_CURRENT | MCL_FUTURE); } static int filed_listen(const char *address, unsigned int port) { struct sockaddr_in6 addr; int pton_ret, bind_ret, listen_ret; int fd; addr.sin6_family = AF_INET6; addr.sin6_flowinfo = 0; | > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | #include <sys/sendfile.h> #include <sys/socket.h> #include <sys/types.h> #include <arpa/inet.h> #include <sys/mman.h> #include <sys/stat.h> #include <pthread.h> #include <stdlib.h> #include <unistd.h> #include <string.h> #include <fcntl.h> #include <stdio.h> #include <time.h> /* Default values */ #define MAX_FAILURE_COUNT 30 #define PORT 8080 #define THREAD_COUNT 10 #define BIND_ADDR "::" /* Arguments for worker threads */ struct filed_worker_thread_args { int fd; }; /* File information */ struct filed_fileinfo { int fd; size_t len; char *lastmod; char lastmod_b[64]; char *type; }; /* Initialize process */ static void filed_init(void) { mlockall(MCL_CURRENT | MCL_FUTURE); } /* Listen on a particular address/port */ static int filed_listen(const char *address, unsigned int port) { struct sockaddr_in6 addr; int pton_ret, bind_ret, listen_ret; int fd; addr.sin6_family = AF_INET6; addr.sin6_flowinfo = 0; |
︙ | ︙ | |||
58 59 60 61 62 63 64 65 66 67 68 69 | return(-1); } return(fd); } static int filed_logging_thread_init(void) { /* XXX:TODO: Unimplemented */ return(0); } | > > | > > | > | > > > | > > > > | > > | > | > > | > | | > > | | > | > > > | < | > > > > > > > > > > > > > > > > > | | | > > > > | > > > | > > > > > > > > | > > > > > | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 | return(-1); } return(fd); } /* Initialize logging thread */ static int filed_logging_thread_init(void) { /* XXX:TODO: Unimplemented */ return(0); } /* Log a message */ static void filed_log_msg(const char *buffer) { /* XXX:TODO: Unimplemented */ buffer = buffer; return; } /* Format time per RFC2616 */ static char *filed_format_time(char *buffer, size_t buffer_len, const time_t timeinfo) { struct tm timeinfo_tm, *timeinfo_tm_p; timeinfo_tm_p = gmtime_r(&timeinfo, &timeinfo_tm); if (timeinfo_tm_p == NULL) { return("unknown"); } buffer[buffer_len - 1] = '\0'; buffer_len = strftime(buffer, buffer_len - 1, "%a, %d %b %Y %H:%M:%S GMT", timeinfo_tm_p); return(buffer); } /* Open a file and return file information */ static struct filed_fileinfo *filed_open_file(const char *path, struct filed_fileinfo *buffer) { /* XXX:TODO: Cache file descriptors */ off_t len; int fd; fd = open(path, O_RDONLY); if (fd < 0) { return(NULL); } len = lseek(fd, 0, SEEK_END); lseek(fd, 0, SEEK_SET); buffer->fd = fd; buffer->len = len; /* XXX:TODO: Determine */ buffer->type = "text/plain"; buffer->lastmod = filed_format_time(buffer->lastmod_b, sizeof(buffer->lastmod_b), time(NULL) - 30); return(buffer); } /* Process an HTTP request and return the path requested */ static char *filed_get_http_request(FILE *fp, char *buffer, size_t buffer_len) { char *method, *path; char tmpbuf[1010]; int i; filed_log_msg("WAIT_FOR_REQUEST FD=..."); fgets(buffer, buffer_len, fp); method = buffer; buffer = strchr(buffer, ' '); if (buffer == NULL) { filed_log_msg("GOT_REQUEST FD=... ERROR=format"); return(NULL); } *buffer = '\0'; buffer++; path = buffer; buffer = strchr(buffer, ' '); if (buffer != NULL) { *buffer = '\0'; buffer++; } filed_log_msg("GOT_REQUEST FD=... PATH=..."); filed_log_msg("WAIT_FOR_HEADERS FD=..."); for (i = 0; i < 100; i++) { fgets(tmpbuf, sizeof(tmpbuf), fp); if (memcmp(tmpbuf, "\r\n", 2) == 0) { break; } } filed_log_msg("GOT_HEADERS FD=..."); fflush(fp); /* We only handle the "GET" method */ if (strcasecmp(method, "get") != 0) { return(NULL); } return(path); } /* Return an error page */ static void filed_error_page(FILE *fp, const char *date_current, int error_number) { char *error_string = "ERROR"; fprintf(fp, "HTTP/1.1 %i OK\r\nDate: %s\r\nServer: filed\r\nLast-Modified: %s\r\nContent-Length: %llu\r\nContent-Type: %s\r\nConnection: close\r\n\r\n%s", error_number, date_current, date_current, (unsigned long long) strlen(error_string), "text/html", error_string ); } /* Handle a single request from a client */ static void filed_handle_client(int fd) { struct filed_fileinfo *fileinfo, fileinfo_b; char *path, path_b[1010]; char *date_current, date_current_b[64]; FILE *fp; /* Determine current time */ date_current = filed_format_time(date_current_b, sizeof(date_current_b), time(NULL)); /* Open socket as ANSI I/O for ease of use */ fp = fdopen(fd, "w+b"); if (fp == NULL) { close(fd); return; } path = filed_get_http_request(fp, path_b, sizeof(path_b)); filed_log_msg("PROCESS_REPLY_START FD=... PATH=..."); if (path == NULL) { filed_error_page(fp, date_current, 500); filed_log_msg("PROCESS_REPLY_COMPLETE FD=... ERROR=500"); fclose(fp); return; } fileinfo = filed_open_file(path, &fileinfo_b); if (fileinfo == NULL) { filed_error_page(fp, date_current, 404); filed_log_msg("PROCESS_REPLY_COMPLETE FD=... ERROR=404"); } else { fprintf(fp, "HTTP/1.1 200 OK\r\nDate: %s\r\nServer: filed\r\nLast-Modified: %s\r\nContent-Length: %llu\r\nContent-Type: %s\r\nConnection: close\r\n\r\n", date_current, fileinfo->lastmod, (unsigned long long) fileinfo->len, fileinfo->type ); fflush(fp); filed_log_msg("PROCESS_REPLY_COMPLETE FD=... STATUS=200"); filed_log_msg("SEND_START IFD=... OFD=... BYTES=..."); sendfile(fd, fileinfo->fd, NULL, fileinfo->len); filed_log_msg("SEND_COMPLETE IFD=... OFD=... BYTES=..."); close(fileinfo->fd); filed_log_msg("CLOSE_FILE FD=..."); } filed_log_msg("CLOSE_CONNECTION FD=..."); fclose(fp); return; } /* Handle incoming connections */ static void *filed_worker_thread(void *arg_v) { struct filed_worker_thread_args *arg; struct sockaddr_in6 addr; socklen_t addrlen; int failure_count = 0, max_failure_count = MAX_FAILURE_COUNT; int master_fd, fd; |
︙ | ︙ | |||
212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 | fd = accept(master_fd, (struct sockaddr *) &addr, &addrlen); /* * If we fail, make a note of it so we don't go into a loop of * accept() failing */ if (fd < 0) { failure_count++; continue; } /* Reset failure count*/ failure_count = 0; /* Handle socket */ filed_handle_client(fd); } /* XXX:TODO: Report error */ return(NULL); } static int filed_worker_threads_init(int fd, int thread_count) { struct filed_worker_thread_args *arg; pthread_t threadid; int pthread_ret; int i; for (i = 0; i < thread_count; i++) { arg = malloc(sizeof(*arg)); arg->fd = fd; pthread_ret = pthread_create(&threadid, NULL, filed_worker_thread, arg); if (pthread_ret != 0) { return(-1); } } return(0); } int main(int argc, char **argv) { int port = PORT, thread_count = THREAD_COUNT; const char *bind_addr = BIND_ADDR; int fd; /* Ignore */ argc = argc; | > > > > > > > > | 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 | fd = accept(master_fd, (struct sockaddr *) &addr, &addrlen); /* * If we fail, make a note of it so we don't go into a loop of * accept() failing */ if (fd < 0) { /* Log the new connection */ filed_log_msg("ACCEPT_FAILED"); failure_count++; continue; } /* Log the new connection */ filed_log_msg("NEW_CONNECTION SRC_ADDR=... SRC_PORT=... FD=..."); /* Reset failure count*/ failure_count = 0; /* Handle socket */ filed_handle_client(fd); } /* XXX:TODO: Report error */ return(NULL); } /* Create worker threads */ static int filed_worker_threads_init(int fd, int thread_count) { struct filed_worker_thread_args *arg; pthread_t threadid; int pthread_ret; int i; for (i = 0; i < thread_count; i++) { arg = malloc(sizeof(*arg)); arg->fd = fd; pthread_ret = pthread_create(&threadid, NULL, filed_worker_thread, arg); if (pthread_ret != 0) { return(-1); } } return(0); } /* Run process */ int main(int argc, char **argv) { int port = PORT, thread_count = THREAD_COUNT; const char *bind_addr = BIND_ADDR; int fd; /* Ignore */ argc = argc; |
︙ | ︙ |