Yves Rutschle
00d5872aa1
ignore brackets in hostname in config files
2017-04-21 22:33:02 +02:00
Yves Rutschle
7d561af423
allocate listen[] before writing to it...
2017-04-18 21:04:30 +02:00
Yves Rutschle
cce42c6882
re-indent
2017-04-18 20:53:19 +02:00
Yves Rutschle
b0f4e24ce0
IP_FREEBIND: real fix, ignore catastrophic previous checkin
2017-04-06 17:13:11 +02:00
Yves Rutschle
078827ad3f
Some systems define IP_FREEBIND but don't implement it which result in setsockopt() failing. No need to die in that case, just ignore the error.
2017-04-06 16:26:27 +02:00
yrutschle
4413284420
Merge pull request #120 from yann-morin-1998/yem/parallel-make
...
Makefile: fix parallel build
2017-02-23 22:54:55 +01:00
Yann E. MORIN
70a2ea926e
Makefile: fix parallel build
...
version.h is included by some .o files, but it is generated. As such, it
must be a dependency of those .o files.
Rather than filter exactly which .o file needs it, just add a generic
dependency for all .o files on version.h.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
2017-02-23 22:49:31 +01:00
Yves Rutschle
e4a4e04bf8
Clarify no space after -F (Issue 108, take 2)
2017-01-08 13:00:19 +01:00
Yves Rutschle
067f5d7646
Revert "clarify no space after -F (issue 108)"
...
This reverts commit f02ce3821c018719536971dbb1bc1ed1517530a2.
That commit accidently imported code that broke transparent
proxying.
2017-01-08 12:54:34 +01:00
yrutschle
718fe0e2e9
Merge pull request #106 from nckx/man-trivialities
...
Fix a few typos in the man page
2016-12-19 21:55:03 +01:00
yrutschle
864b7badd2
Merge pull request #115 from jimt/patch-1
...
Fix README typos.
2016-12-19 21:39:09 +01:00
Jim Tittsler
234c088324
Fix README typos.
2016-12-19 10:24:31 +09:00
Yves Rutschlé
f02ce3821c
clarify no space after -F (issue 108)
2016-11-06 19:44:47 +00:00
Tobias Geerinckx-Rice
e492c2808c
Fix a few typos in the man page
2016-10-19 02:41:12 +02:00
Craig Andrews
a4d2a53a47
Build systemd-sslh-generator if USESYSTEMD is set
2016-06-24 20:30:15 -04:00
Craig Andrews
efba558967
make sure the files using version.h depend on it being generated first
2016-06-24 20:11:13 -04:00
yrutschle
b4cb910438
Merge pull request #92 from mscherer/complete_man
...
Add more options in the synopsis
2016-06-05 18:37:22 +02:00
Michael Scherer
975560aa4a
Add more options in the synopsis
2016-06-04 11:57:08 +02:00
Yves Rutschlé
63a83cf041
fix SNI/ALPN option parsing (issue 90)
2016-05-20 07:52:24 +00:00
Yves Rutschlé
245fd26459
fix compiler warnings
2016-05-03 08:37:23 +00:00
yrutschle
9cc47a157d
Merge pull request #69 from ViKingIX/fix_local_conn
...
Fix the connection problem in transparent mode.
2016-04-28 11:55:56 +02:00
yrutschle
09b5c84d34
Merge pull request #86 from hogarthj/fix_readme
...
Merge error in README.md mixing sections
2016-03-31 16:28:32 +02:00
James Hogarth
e6cb3596d1
Merge error in README.md mixing sections
2016-03-30 11:48:45 +01:00
Yves Rutschle
38447c8158
v1.18
2016-03-29 21:19:05 +02:00
yrutschle
8f39c106e1
Merge pull request #56 from hogarthj/master
...
Initial addition of systemd socket based activiation
2016-02-05 16:46:47 +01:00
Yves Rutschle
414ed7de11
Support keepalive for connections on the connecting side
2016-02-04 09:19:54 +01:00
Yves Rutschle
1b9937b293
Support keepalive for connections on the listening side
2016-02-02 21:07:47 +01:00
Yves Rutschle
1814bcb43c
Fixed typo in example configuration files
2016-02-02 20:53:10 +01:00
James Hogarth
b3f48d9876
Add systemd capabilities to sslh, rebased on current master
2016-01-29 16:20:54 +00:00
Yves Rutschle
555005f455
Complies to DCL37-C (Issue 59)
2016-01-26 18:49:57 +01:00
Yves Rutschle
e511534b57
Make USELIBPCRE not the default
2016-01-22 17:09:02 +01:00
Yves Rutschle
e5cb33fcb7
Add PCRE support for musl
2016-01-22 16:41:36 +01:00
yrutschle
e7d3133ba5
Merge pull request #74 from moparisthebest/master
...
Add ALPN protocol based probe
2016-01-22 16:21:32 +01:00
Yves Rutschle
0b6cc0d909
Added a note on configuring transparent proxying for both IPv4 and IPv6
2016-01-22 11:25:53 +01:00
moparisthebest
8af039d3eb
Add ALPN protocol based probe
2016-01-05 00:32:10 -05:00
Yves Rutschle
8758a298ba
Changed connection log to include the name of the probe that triggered.
2015-12-15 16:06:14 +01:00
Yves Rutschle
2cb424c646
Added log_level option to configuration file, which switches off log at each connection
2015-12-15 15:51:18 +01:00
yrutschle
24612835c3
Merge pull request #70 from taligentx/master
...
Fix daemon start syntax
2015-10-20 10:58:58 +02:00
Nikhil Choudhary
b09c3aab31
Fix daemon start syntax
...
Per the changelog for 1.17: argument to -F can no longer be separated from the option by a space, e.g. must be -Ffoo.cfg). This fixes the `/etc/sslh/sslh.cfg:file I/O error` message if the config file is stored in `/etc/sslh.cfg` as given by Readme.md.
2015-10-19 13:40:51 -05:00
ViKing
b108809a78
Fix the connection problem in transparent mode.
...
When the source and destination are the same, the bind_peer() will
fail, thus end the connection. Therefore a check of all the interface
IPs are checked to skip bind() if they are the same.
2015-10-07 00:10:03 +08:00
yrutschle
389ab9fbff
Merge pull request #67 from eehakkin/master
...
Fix access rights checking to work with IPv6.
2015-09-28 14:59:16 +02:00
Eero Häkkinen
717c285b31
Fix access rights checking to work with IPv6.
2015-09-27 22:14:00 +03:00
John Regan
ab3324be47
Enable PCRE as RegEx Library
2015-08-13 14:28:17 -04:00
Yves Rutschle
4cbaf447b5
Print error message upon non-existent configuration file
2015-07-28 15:14:21 +02:00
Yves Rutschle
ca461ea077
Added support for RFC4366 SNI (Server Name Indication). Changed configuration file format accordingly.
2015-07-17 15:05:06 +02:00
Yves Rutschle
8fdaf6eb08
changed configuration file to accomodate SNI in a cleaner way
2015-07-17 15:04:04 +02:00
Yves Rutschle
5886bd2d43
Print error message upon non-existent configuration file
2015-07-16 17:43:05 +02:00
Yves Rutschle
77ef29358d
make code C-compliant
2015-07-15 15:09:39 +02:00
Yves Rutschle
9475d9689b
Comment for SNI inclusion
2015-07-15 15:02:37 +02:00
Yves Rutschle
fbebdaf66c
Add support for Server Name Indication (SNI, RFC4366)
2015-07-15 14:07:16 +02:00
