1
0
mirror of https://github.com/moparisthebest/sslh synced 2024-11-24 01:52:24 -05:00
Commit Graph

119 Commits

Author SHA1 Message Date
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
Ruben van Staveren
e246536be2 FreeBSD way of doing transparent proxy: work in progress 2014-07-22 20:05:25 +02:00
Ruben van Staveren
7d23a55236 When transparent, make sure both connections use the same address family 2014-07-22 19:36:40 +02:00
Ruben van Staveren
dedb3672d7 Have USELIBWRAP redefineable 2014-07-22 19:36:29 +02:00
Guillaume Delacour
21a6d3c3ae Disable Can't bind to address test since IP_FREEBIND allow us to do that 2014-07-15 16:22:37 +02:00
Yves Rutschle
9a0a9b9492 Clarified that sslh uses LOG_AUTH facility for logging in manual page 2014-07-15 11:26:16 +02:00
Ruben van Staveren
b6de2904f0 FreeBSD way of doing transparent proxy: work in progress 2014-06-20 14:11:25 +02:00
Yves Rutschle
d10b539a5a fixed obsolete README reference to -o option 2014-04-19 13:10:12 +02:00
Yves Rutschle
48d4d81e0c minor corrections to usage string 2014-04-19 10:41:17 +02:00
Yves Rutschle
36e05640c0 added -F description to man page 2014-04-19 10:40:53 +02:00
Ondřej Kuzník
7876bddff3 Fix regex probes always matching (#19) 2014-04-09 19:18:52 +01:00
Yves Rutschle
6fb234f85e added fail2ban configuration examples 2014-03-30 18:51:21 +02:00
Yves Rutschle
7d6cac73d4 added transparent option to man page and help 2014-03-30 18:25:03 +02:00
Yves Rutschle
621f0718dd added license file 2014-03-30 18:09:16 +02:00
Yves Rutschle
426797f9c0 call setgroups before setgid 2014-03-30 17:28:00 +02:00
Yves Rutschle
53550ff21e fix errors in previous commit... 2014-02-24 17:52:58 +01:00
Yves Rutschle
9beacc63f9 use directory version when compiling from a tarball without git 2014-02-23 10:41:47 +01:00
Jason Cooper
62cbb55b8e genver.sh: use /bin/sh for portability
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-02-17 19:08:02 +01:00
yrutschle
27567c4804 Merge pull request #14 from belobrov-andrey/fd_leak_fix
Fixed possible file descriptor leak.
2014-02-16 13:11:19 +01:00
Belobrov Andrey
ff070a6b46 Fixed possible file descriptor leak. 2014-02-14 08:32:38 +04:00