summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog5
-rw-r--r--LICENSE2
-rw-r--r--doc/Makefile2
-rw-r--r--doc/tcpproxy.88
-rw-r--r--doc/tcpproxy.8.txt2
-rw-r--r--src/Makefile2
-rw-r--r--src/cfg_parser.h2
-rw-r--r--src/cfg_parser.rl2
-rw-r--r--src/clients.c2
-rw-r--r--src/clients.h2
-rwxr-xr-xsrc/configure2
-rw-r--r--src/daemon.h2
-rw-r--r--src/datatypes.h2
-rw-r--r--src/listener.c2
-rw-r--r--src/listener.h2
-rw-r--r--src/log.c2
-rw-r--r--src/log.h2
-rw-r--r--src/log_targets.h2
-rw-r--r--src/options.c2
-rw-r--r--src/options.h2
-rw-r--r--src/sig_handler.c2
-rw-r--r--src/sig_handler.h2
-rw-r--r--src/slist.c2
-rw-r--r--src/slist.h2
-rw-r--r--src/string_list.c2
-rw-r--r--src/string_list.h2
-rw-r--r--src/tcp.c2
-rw-r--r--src/tcp.h2
-rw-r--r--src/tcpproxy.c2
29 files changed, 36 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index 891a501..ee2ca02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015.??.?? -- Version 1.2
+
+* added support for systemd
+* fixed exit code after signal
+
2013.10.07 -- Version 1.1
* fixed build for clang
diff --git a/LICENSE b/LICENSE
index b3f95c6..3f4ecdc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/doc/Makefile b/doc/Makefile
index 404da2d..f56c5a2 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -7,7 +7,7 @@
## endpoints and vice versa.
##
##
-## Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+## Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
##
## This file is part of tcpproxy.
##
diff --git a/doc/tcpproxy.8 b/doc/tcpproxy.8
index 090d818..7a587c9 100644
--- a/doc/tcpproxy.8
+++ b/doc/tcpproxy.8
@@ -1,13 +1,13 @@
'\" t
.\" Title: tcpproxy
.\" Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 10/07/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\" Date: 05/13/2015
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "TCPPROXY" "8" "10/07/2013" "\ \&" "\ \&"
+.TH "TCPPROXY" "8" "05/13/2015" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -222,4 +222,4 @@ Christian Pointner <equinox@spreadspace\&.org>
Main web site: http://www\&.spreadspace\&.org/tcpproxy/
.SH "COPYING"
.sp
-Copyright (C) 2010\-2013 Christian Pointner\&. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or any later version\&.
+Copyright (C) 2010\-2015 Christian Pointner\&. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or any later version\&.
diff --git a/doc/tcpproxy.8.txt b/doc/tcpproxy.8.txt
index 85bb7f6..e751da7 100644
--- a/doc/tcpproxy.8.txt
+++ b/doc/tcpproxy.8.txt
@@ -182,7 +182,7 @@ Main web site: http://www.spreadspace.org/tcpproxy/
COPYING
-------
-Copyright \(C) 2010-2013 Christian Pointner. This program is free
+Copyright \(C) 2010-2015 Christian Pointner. This program is free
software: you can redistribute it and/or modify it under the terms
of the GNU General Public License as published by the Free Software
Foundation, either version 3 of the License, or any later version.
diff --git a/src/Makefile b/src/Makefile
index b86007f..5bcc68a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -7,7 +7,7 @@
## endpoints and vice versa.
##
##
-## Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+## Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
##
## This file is part of tcpproxy.
##
diff --git a/src/cfg_parser.h b/src/cfg_parser.h
index a373154..c24c2ed 100644
--- a/src/cfg_parser.h
+++ b/src/cfg_parser.h
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/cfg_parser.rl b/src/cfg_parser.rl
index 918501c..3ff2a4a 100644
--- a/src/cfg_parser.rl
+++ b/src/cfg_parser.rl
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/clients.c b/src/clients.c
index 7dd6a85..31a61bf 100644
--- a/src/clients.c
+++ b/src/clients.c
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/clients.h b/src/clients.h
index febc91c..0c3206a 100644
--- a/src/clients.h
+++ b/src/clients.h
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/configure b/src/configure
index d651903..4d3a930 100755
--- a/src/configure
+++ b/src/configure
@@ -8,7 +8,7 @@
# endpoints and vice versa.
#
#
-# Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+# Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
#
# This file is part of tcpproxy.
#
diff --git a/src/daemon.h b/src/daemon.h
index 42f59a6..3f892eb 100644
--- a/src/daemon.h
+++ b/src/daemon.h
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/datatypes.h b/src/datatypes.h
index 328829b..6c51eb6 100644
--- a/src/datatypes.h
+++ b/src/datatypes.h
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/listener.c b/src/listener.c
index 02dd149..35b61cd 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/listener.h b/src/listener.h
index d7319c2..bf413f0 100644
--- a/src/listener.h
+++ b/src/listener.h
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/log.c b/src/log.c
index 9354ffa..13b861b 100644
--- a/src/log.c
+++ b/src/log.c
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/log.h b/src/log.h
index e7f2e75..2e6c29a 100644
--- a/src/log.h
+++ b/src/log.h
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/log_targets.h b/src/log_targets.h
index 8257a2d..b83e0d8 100644
--- a/src/log_targets.h
+++ b/src/log_targets.h
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/options.c b/src/options.c
index 698cb8c..ed22a19 100644
--- a/src/options.c
+++ b/src/options.c
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/options.h b/src/options.h
index 8d17bba..234125f 100644
--- a/src/options.h
+++ b/src/options.h
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/sig_handler.c b/src/sig_handler.c
index fb50000..2bfbb5b 100644
--- a/src/sig_handler.c
+++ b/src/sig_handler.c
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/sig_handler.h b/src/sig_handler.h
index efcdf66..9e4802b 100644
--- a/src/sig_handler.h
+++ b/src/sig_handler.h
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/slist.c b/src/slist.c
index 3195833..f4b7b0e 100644
--- a/src/slist.c
+++ b/src/slist.c
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/slist.h b/src/slist.h
index bf6b394..5e7d5c3 100644
--- a/src/slist.h
+++ b/src/slist.h
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/string_list.c b/src/string_list.c
index 8715f65..29af918 100644
--- a/src/string_list.c
+++ b/src/string_list.c
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/string_list.h b/src/string_list.h
index b60e7db..20873e8 100644
--- a/src/string_list.h
+++ b/src/string_list.h
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/tcp.c b/src/tcp.c
index 77dbf26..f8b32a4 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/tcp.h b/src/tcp.h
index 677d1c2..b3146b6 100644
--- a/src/tcp.h
+++ b/src/tcp.h
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
diff --git a/src/tcpproxy.c b/src/tcpproxy.c
index a328f26..a779cbe 100644
--- a/src/tcpproxy.c
+++ b/src/tcpproxy.c
@@ -7,7 +7,7 @@
* endpoints and vice versa.
*
*
- * Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2010-2015 Christian Pointner <equinox@spreadspace.org>
*
* This file is part of tcpproxy.
*
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 12:22:51 +0000