Subject | Hash | Author | Date (UTC) |
---|---|---|---|
Version string | 325ae4c314482d10fe46c5c16c2b581959af2f41 | GDR! | 2014-12-24 14:28:13 |
Logging framework and command line options | b8c1f1cf062ff681daf160411ad6c35ed7a49d42 | GDR! | 2014-12-22 02:22:38 |
Increased number of send retries - helpful on flaky links | 3f86c8bb935408fdfb056a412da23b6b181d0755 | GDR! | 2014-12-13 18:13:12 |
Tokssh formatted | 489cad267d4537cbe20f4c539f49a2d96ed6d0bb | GDR! | 2014-12-13 17:50:07 |
Added tokssh wrapper script | 967a260e4fb84659424e9b81cc7f6318380ae02d | GDR! | 2014-12-13 17:49:14 |
More robust connection algorithm | 4f28d0b194fdd9607955f2e32de44f8fbf5d7d31 | GDR! | 2014-12-13 17:24:39 |
Added -lrt for old glibc versions like raspbian | 9f66ecc193b1bca4eac19f178123215340c9cb14 | GDR! | 2014-12-13 17:24:10 |
Pipe mode working, yay! | 99a66836911b804dce1455580cbf75dc99f23538 | GDR! | 2014-12-11 22:27:26 |
Added MSG_NOSIGNAL to send() in client | c9f51df320380a537843145ebbf4ceff7ef1c561 | GDR! | 2014-12-11 21:33:27 |
Fixed a warning and printing garbage | 925a7c2bdf93c3a0209552285b77e2e585a799c4 | GDR! | 2014-12-11 21:31:49 |
Fixed a warning and printing garbage | f7f5170d00ee10affcacf569842207120a7ab16d | GDR! | 2014-12-11 21:30:51 |
Fixed server-side SIGPIPE | 946e3fa1907217a0717978ac98b32ce1ee7c23ac | GDR! | 2014-12-11 21:24:16 |
Added handle_server_tcp_fin_frame | 169a478762d6863782395acff8c9f53b733048f5 | GDR! | 2014-12-11 21:19:32 |
Added systemd and supervisord config files | ea3d59d854108f28c2d2d10a5af60fe3d66e1f6f | GDR! | 2014-12-11 20:33:54 |
Removed the const qualifier from frame->data | d81429c916e41958483256556dea861cb97487c4 | GDR! | 2014-12-11 19:57:32 |
Updated the IP of MVPS bootstrap node | fbe7d5d1b54b0c67d644ad68ca37088f529d150f | GDR! | 2014-12-11 19:56:04 |
Got rid of some dead code | a60a3712c46bcef7dbb9c56c84693d070230c91b | GDR! | 2014-12-11 19:47:19 |
Make localhost work even if regular name resolution fails | eee06b7d149e00a79897c1d17b0264af99e5149e | GDR! | 2014-12-11 19:38:38 |
Readme tweaks | 6bb15840b0bde8e5949e76873aec418f2b64951f | GDR! | 2014-12-11 18:41:19 |
License | 0974ae043fe15596554512560f72a0a08863e282 | GDR! | 2014-12-11 18:37:29 |
File | Lines added | Lines deleted |
---|---|---|
Makefile | 7 | 5 |
gitversion.c | 9 | 0 |
main.c | 4 | 0 |
main.h | 2 | 0 |
File Makefile changed (mode: 100644) (index 09a266a..366eeb5) | |||
... | ... | LDFLAGS += $(shell pkg-config --libs $(DEPS)) | |
8 | 8 | OBJECTS=$(SOURCES:.c=.o) | OBJECTS=$(SOURCES:.c=.o) |
9 | 9 | INCLUDES = $(wildcard *.h) | INCLUDES = $(wildcard *.h) |
10 | 10 | ||
11 | all: cscope.out tuntox | ||
12 | |||
13 | gitversion.h: .git/HEAD .git/index | ||
14 | echo "#define GITVERSION \"$(shell git rev-parse HEAD)\"" > $@ | ||
15 | |||
16 | gitversion.c: gitversion.h | ||
17 | |||
11 | 18 | .c.o: $(INCLUDES) | .c.o: $(INCLUDES) |
12 | 19 | $(CC) $(CFLAGS) $< -c -o $@ | $(CC) $(CFLAGS) $< -c -o $@ |
13 | 20 | ||
... | ... | tuntox: $(OBJECTS) $(INCLUDES) | |
16 | 23 | ||
17 | 24 | cscope.out: | cscope.out: |
18 | 25 | cscope -bv ./*.[ch] | cscope -bv ./*.[ch] |
19 | |||
20 | #gitversion.c: .git/HEAD .git/index | ||
21 | # echo "const char *gitversion = \"$(shell git rev-parse HEAD)\";" > $@ | ||
22 | |||
23 | all: cscope.out tuntox gitversion.c |
File gitversion.c added (mode: 100644) (index 0000000..4eb4c15) | |||
1 | #include "gitversion.h" | ||
2 | #include "log.h" | ||
3 | |||
4 | const char *gitversion = GITVERSION; | ||
5 | |||
6 | void print_version() | ||
7 | { | ||
8 | log_printf(L_INFO, "tuntox built from git commit %s", gitversion); | ||
9 | } |
File main.c changed (mode: 100644) (index f57603e..d7d97ed) | |||
... | ... | void help() | |
778 | 778 | fprintf(stderr, "-C <dir> - save private key in <dir> instead of /etc/tuntox in server mode\n"); | fprintf(stderr, "-C <dir> - save private key in <dir> instead of /etc/tuntox in server mode\n"); |
779 | 779 | fprintf(stderr, "-d - debug mode\n"); | fprintf(stderr, "-d - debug mode\n"); |
780 | 780 | fprintf(stderr, "-q - quiet mode\n"); | fprintf(stderr, "-q - quiet mode\n"); |
781 | fprintf(stderr, "-h - this help message\n"); | ||
781 | 782 | } | } |
782 | 783 | ||
783 | 784 | int main(int argc, char *argv[]) | int main(int argc, char *argv[]) |
... | ... | int main(int argc, char *argv[]) | |
852 | 853 | break; | break; |
853 | 854 | case '?': | case '?': |
854 | 855 | default: | default: |
856 | print_version(); | ||
855 | 857 | help(); | help(); |
856 | 858 | exit(1); | exit(1); |
857 | 859 | } | } |
... | ... | int main(int argc, char *argv[]) | |
859 | 861 | ||
860 | 862 | on_exit(cleanup, NULL); | on_exit(cleanup, NULL); |
861 | 863 | ||
864 | print_version(); | ||
865 | |||
862 | 866 | /* Bootstrap tox */ | /* Bootstrap tox */ |
863 | 867 | tox_options.ipv6enabled = TOX_ENABLE_IPV6_DEFAULT; | tox_options.ipv6enabled = TOX_ENABLE_IPV6_DEFAULT; |
864 | 868 | tox_options.udp_disabled = 0; | tox_options.udp_disabled = 0; |
File main.h changed (mode: 100644) (index a3890ca..01eaaea) | |||
... | ... | extern tunnel *by_id; | |
88 | 88 | int parse_lossless_packet(void *sender_uc, const uint8_t *data, uint32_t len); | int parse_lossless_packet(void *sender_uc, const uint8_t *data, uint32_t len); |
89 | 89 | tunnel *tunnel_create(int sockfd, int connid, uint32_t friendnumber); | tunnel *tunnel_create(int sockfd, int connid, uint32_t friendnumber); |
90 | 90 | void tunnel_delete(tunnel *t); | void tunnel_delete(tunnel *t); |
91 | |||
92 | void print_version(void); | ||
91 | 93 | #endif | #endif |