Overview
Comment: | Added support for becoming a daemon |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
82653deb02f5d6c7d6c70a4cd00936b1 |
User & Date: | rkeene on 2014-02-07 21:44:25 |
Other Links: | manifest | tags |
Context
2014-02-07
| ||
21:51 | Updated wiki HTML page check-in: e7fa8416e1 user: rkeene tags: trunk | |
21:44 | Added support for becoming a daemon check-in: 82653deb02 user: rkeene tags: trunk | |
21:12 | Normalized macro names check-in: 25c96dfee9 user: rkeene tags: trunk | |
Changes
Modified filed.1 from [fae93fba37] to [88912a76e0].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | .PU .TH FILED 1 "06 Feb 14" "filed 1.0" .SH NAME filed \- serve files over HTTP .SH SYNOPSIS .ll +10 .B filed .RB [{ \-h | \-\-help }] .RB [{ \-b | \-\-bind } .IR address ] .RB [{ \-p | \-\-port } .IR port ] .RB [{ \-t | \-\-threads } .IR count ] .RB [{ \-c | \-\-cache } | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | .PU .TH FILED 1 "06 Feb 14" "filed 1.0" .SH NAME filed \- serve files over HTTP .SH SYNOPSIS .ll +10 .B filed .RB [{ \-h | \-\-help }] .RB [{ \-d | \-\-daemon }] .RB [{ \-b | \-\-bind } .IR address ] .RB [{ \-p | \-\-port } .IR port ] .RB [{ \-t | \-\-threads } .IR count ] .RB [{ \-c | \-\-cache } |
︙ | ︙ | |||
25 26 27 28 29 30 31 32 33 34 35 36 37 38 | serves files over HTTP as minimally as possible. Only static files (i.e., files that never change or are replaced) are supported. .SH OPTIONS .TP .B -h (or --help) Prints detailed usage information .TP .B -b (or --bind) Specifies the address to listen for incoming HTTP requests on. .TP .B -p (or --port) | > > > > > | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | serves files over HTTP as minimally as possible. Only static files (i.e., files that never change or are replaced) are supported. .SH OPTIONS .TP .B -h (or --help) Prints detailed usage information .TP .B -d (or --daemon) Instructs filed to become a daemon after initializing the listening TCP socket and log files. .TP .B -b (or --bind) Specifies the address to listen for incoming HTTP requests on. .TP .B -p (or --port) |
︙ | ︙ |
Modified filed.c from [f6d6d04c13] to [5138c920c1].
1 2 3 4 5 6 7 8 9 10 11 12 13 | #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 <strings.h> #include <signal.h> #include <stdlib.h> #include <unistd.h> #include <string.h> #include <getopt.h> | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | #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 <sys/wait.h> #include <pthread.h> #include <strings.h> #include <signal.h> #include <stdlib.h> #include <unistd.h> #include <string.h> #include <getopt.h> |
︙ | ︙ | |||
684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 | if (extra) { fprintf(output, "%s\n", extra); } fprintf(output, "Usage: filed [<options>]\n"); fprintf(output, " Options:\n"); fprintf(output, " -h, --help\n"); fprintf(output, " -b <address>, --bind <address>\n"); fprintf(output, " -p <port>, --port <port>\n"); fprintf(output, " -t <count>, --threads <count>\n"); fprintf(output, " -c <entries>, --cache <entries>\n"); fprintf(output, " -u <user>, --user <user>\n"); fprintf(output, " -r <directory>, --root <directory>\n"); if (long_help) { fprintf(output, "\n"); fprintf(output, " Usage:\n"); fprintf(output, " -h (or --help) prints this usage information\n"); fprintf(output, "\n"); fprintf(output, " -b (or --bind) specifies the address to listen for incoming HTTP\n"); fprintf(output, " requests on. The default value is \"%s\".\n", BIND_ADDR); fprintf(output, "\n"); fprintf(output, " -p (or --port) specifies the TCP port number to listen for incoming HTTP\n"); fprintf(output, " requests on. The default is %u.\n", (unsigned int) PORT); fprintf(output, "\n"); | > > > > | 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 | if (extra) { fprintf(output, "%s\n", extra); } fprintf(output, "Usage: filed [<options>]\n"); fprintf(output, " Options:\n"); fprintf(output, " -h, --help\n"); fprintf(output, " -d, --daemon\n"); fprintf(output, " -b <address>, --bind <address>\n"); fprintf(output, " -p <port>, --port <port>\n"); fprintf(output, " -t <count>, --threads <count>\n"); fprintf(output, " -c <entries>, --cache <entries>\n"); fprintf(output, " -u <user>, --user <user>\n"); fprintf(output, " -r <directory>, --root <directory>\n"); if (long_help) { fprintf(output, "\n"); fprintf(output, " Usage:\n"); fprintf(output, " -h (or --help) prints this usage information\n"); fprintf(output, "\n"); fprintf(output, " -d (or --daemon) instructs filed to become a daemon after initializing\n"); fprintf(output, " the listening TCP socket and log files.\n"); fprintf(output, "\n"); fprintf(output, " -b (or --bind) specifies the address to listen for incoming HTTP\n"); fprintf(output, " requests on. The default value is \"%s\".\n", BIND_ADDR); fprintf(output, "\n"); fprintf(output, " -p (or --port) specifies the TCP port number to listen for incoming HTTP\n"); fprintf(output, " requests on. The default is %u.\n", (unsigned int) PORT); fprintf(output, "\n"); |
︙ | ︙ | |||
767 768 769 770 771 772 773 774 775 776 | return(1); } *user_id = user_id_check; return(0); } /* Run process */ int main(int argc, char **argv) { | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | > | | 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 | return(1); } *user_id = user_id_check; return(0); } /* Daemonize */ static int filed_daemonize(void) { pid_t setsid_ret, fork_ret; int chdir_ret, dup2_ret; int fd_in, fd_out; chdir_ret = chdir("/"); if (chdir_ret != 0) { return(1); } fork_ret = fork(); if (fork_ret < 0) { return(1); } if (fork_ret > 0) { /* Parent */ waitpid(fork_ret, NULL, 0); exit(EXIT_SUCCESS); } /* Child */ if (fork() != 0) { /* Child */ exit(EXIT_SUCCESS); } /* Grand child */ setsid_ret = setsid(); if (setsid_ret == ((pid_t) -1)) { return(1); } fd_in = open("/dev/null", O_RDONLY); fd_out = open("/dev/null", O_WRONLY); if (fd_in < 0 || fd_out < 0) { return(1); } dup2_ret = dup2(fd_in, STDIN_FILENO); if (dup2_ret != STDIN_FILENO) { return(1); } dup2_ret = dup2(fd_out, STDOUT_FILENO); if (dup2_ret != STDOUT_FILENO) { return(1); } dup2_ret = dup2(fd_out, STDERR_FILENO); if (dup2_ret != STDERR_FILENO) { return(1); } close(fd_in); close(fd_out); return(0); } /* Run process */ int main(int argc, char **argv) { struct option options[9]; const char *bind_addr = BIND_ADDR, *newroot = NULL; uid_t user = 0; int port = PORT, thread_count = THREAD_COUNT; int cache_size = CACHE_SIZE; int init_ret, chroot_ret, setuid_ret, lookup_ret, chdir_ret; int setuid_enabled = 0, daemon_enabled = 0; int ch; int fd; /* Process arguments */ filed_getopt_long_setopt(&options[0], "port", required_argument, 'p'); filed_getopt_long_setopt(&options[1], "threads", required_argument, 't'); filed_getopt_long_setopt(&options[2], "cache", required_argument, 'c'); filed_getopt_long_setopt(&options[3], "bind", required_argument, 'b'); filed_getopt_long_setopt(&options[4], "user", required_argument, 'u'); filed_getopt_long_setopt(&options[5], "root", required_argument, 'r'); filed_getopt_long_setopt(&options[6], "help", no_argument, 'h'); filed_getopt_long_setopt(&options[7], "daemon", no_argument, 'd'); filed_getopt_long_setopt(&options[8], NULL, 0, 0); while ((ch = getopt_long(argc, argv, "p:t:c:b:u:r:hd", options, NULL)) != -1) { switch(ch) { case 'p': port = atoi(optarg); break; case 't': thread_count = atoi(optarg); break; |
︙ | ︙ | |||
815 816 817 818 819 820 821 822 823 824 825 826 827 828 | return(1); } break; case 'r': newroot = strdup(optarg); break; case '?': case ':': filed_print_help(stderr, 0, NULL); return(1); case 'h': filed_print_help(stdout, 1, NULL); | > > > | 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 | return(1); } break; case 'r': newroot = strdup(optarg); break; case 'd': daemon_enabled = 1; break; case '?': case ':': filed_print_help(stderr, 0, NULL); return(1); case 'h': filed_print_help(stdout, 1, NULL); |
︙ | ︙ | |||
863 864 865 866 867 868 869 | perror("setuid"); return(1); } } /* Become a daemon */ | > | > | 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 | perror("setuid"); return(1); } } /* Become a daemon */ if (daemon_enabled) { filed_daemonize(); } /* Initialize */ init_ret = filed_init(cache_size); if (init_ret != 0) { perror("filed_init"); return(3); |
︙ | ︙ |