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
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
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
Yves Rutschle
fecfb170c8
added reference to Tinc documentation
2015-07-15 13:34:53 +02:00
b988540105
Add SNI hostname based probe
2015-07-12 23:10:53 -04:00
Yves Rutschle
3aefaf3004
Added Makefile option to build without libpcre
2015-07-09 15:31:42 +02:00
yrutschle
ba945f1a8f
Merge pull request #52 from Somasis/master
...
Makefile: use more variables for install directories
2015-06-22 11:59:52 +02:00
Kylie McClain
eb3d3be3ab
Makefile: use more variables for install directories
2015-06-22 01:51:36 -04:00
yrutschle
66f85dc608
Merge pull request #51 from cernekee/adb
...
Add builtin handler for Android Debug Bridge (ADB) protocol
2015-06-10 09:26:55 +02:00
Kevin Cernekee
3469f56012
Add builtin handler for Android Debug Bridge (ADB) protocol
...
This allows Android devices to run multiple services on one port. A
common use case involves muxing SSH for SCP / SFTP, and ADB for
sideloading packages or running CTS.
Signed-off-by: Kevin Cernekee <cernekee@chromium.org>
2015-06-09 15:30:27 -07:00
yrutschle
7c35ef8528
Merge pull request #49 from dunn/master
...
Makefile: fix `install` for Mac OS
2015-05-18 11:12:45 +02:00
Alex Dunn
3bad96865d
Makefile: fix install for Mac OS
2015-05-14 23:14:40 -07:00
yrutschle
728181109c
Merge pull request #47 from hogarthj/master
...
Build fails in CentOS6 - this fixes it
2015-04-18 10:35:02 +02:00
James Hogarth
2192b28303
Check line number of error so that this works with libconfig-1.3.2 in CentOS6
2015-04-17 23:40:57 +01:00
yrutschle
77a74f0c52
Merge pull request #45 from muxator/patch-1
...
typo: "transparent proying" -> "transparent proxying"
2015-03-15 12:01:58 +01:00
muxator
48164c4d77
typo: "transparent proying" -> "transparent proxying"
2015-03-15 00:44:39 +01:00
Yves Rutschle
3550cbe77c
Finalised v1.17
2015-03-09 21:51:39 +01:00
yrutschle
130348ed48
Merge pull request #44 from antisocialdalek/antisocialdalek-fix-xmpp
...
add longer check for xmpp preamble
2015-03-09 21:46:18 +01:00
Justin Matlock
bdeccfd9ff
add longer check for xmpp preamble
...
original wasn't catching the preamble from Adium or Pidgin XMPP clients, because of a newline after the initial <xml> line. Grew the length of the check string so it'd see the word 'jabber' faster.
2015-03-06 02:58:52 -05:00
yrutschle
ce7c5b1ba2
Merge pull request #41 from gapato/patch-1
...
Fix typo for CentOS install instructions in README
2015-02-04 14:00:12 +01:00
gapato
21552fc176
Fix typo for CentOS install instructions in README
2015-02-04 12:53:32 +01:00
Yves Rutschle
88af6ebaee
Updated configuration info and startup scripts to use the configuration file rather than command line parameters
2015-01-01 18:59:05 +01:00
Yves Rutschle
43d2db9123
Fix libconfig issue with integer parameters on x64
2015-01-01 18:35:26 +01:00
Yves Rutschle
d91cd59bba
Documented configuration trick to have both transparent proxying while still retaining the ability to connect to ssh directly
2015-01-01 18:31:10 +01:00
Yves Rutschle
c03168042f
Added IPv6 transparent proxying instructions
2014-12-31 14:53:59 +01:00
Yves Rutschle
2705426f63
Attribute previous commit
2014-12-27 19:51:20 +01:00
Yves Rutschle
0458c9840b
Use portable way of getting modified time
2014-12-27 19:49:51 +01:00
Yves Rutschle
bb4aeb446a
Use default configuration filename
2014-12-27 11:57:27 +01:00
Yves Rutschle
74de4f4fd2
Transparent proxy support for FreeBSD (attribution)
2014-12-25 20:15:52 +01:00
Yves Rutschle
56fdc6b4af
Transparant proxy support for FreeBSD
2014-12-25 20:08:24 +01:00
yrutschle
b6f4c04c36
Merge pull request #25 from guikcd/remove_cant_bind_address_test
...
Disable Can't bind to address test since IP_FREEBIND allow us to do that
2014-12-25 19:57:47 +01:00
Yves Rutschle
b9ddfb4c7a
Support RFC5952-style IPv6 addresses
2014-12-22 18:19:02 +01:00
Aaron Madlon-Kay
8c3362e9ce
Use portable way of getting modified time
2014-11-22 23:46:50 +09:00
Ruben van Staveren
ece6e28e45
#ifdef IP_BINDANY/IPV6_BINDANY cases
2014-07-24 17:29:53 +02:00
Ruben van Staveren
0d8e2438de
Correct markdown
2014-07-22 21:43:03 +02:00
Ruben van Staveren
36cf99697b
Add instruction for FreeBSD
2014-07-22 20:30:52 +02:00
Ruben van Staveren
ddc1efed89
Merge branch 'freebsd_transparent' of https://github.com/rvstaveren/sslh into freebsd_transparent
2014-07-22 20:06:32 +02:00
Ruben van Staveren
e2fc091482
When transparent, make sure both connections use the same address family
2014-07-22 20:05:25 +02:00
Ruben van Staveren
42425a8373
Have USELIBWRAP redefineable
2014-07-22 20:05:25 +02:00
