third-party-mirrors/sslh
1
0
Fork 0
mirror of https://github.com/yrutschle/sslh.git synced 2025-04-14 16:17:14 +03:00
Code Issues Packages Projects Releases Wiki Activity
602 Commits 3 Branches 42 Tags
Commit Graph

602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yrutschle
9d1d9f850a added config parser generated by conf2struct, so sslh builds without conf2struct after cloning 2019-12-30 20:44:16 +01:00
yrutschle
588883eb42 Fix on-timeout setting so it is no longer ignored (issue #253) 2019-12-27 18:26:16 +01:00
yrutschle
bae16ab29e Merge branch 'master' of https://github.com/yrutschle/sslh 2019-11-15 22:20:48 +01:00
yrutschle
32851d2041 minor doc clarification for dependencies 2019-11-15 22:20:31 +01:00
yrutschle
49e8bff01b
Merge pull request #248 from muellerj/master 
Fix warnings
 2019-11-14 23:16:24 +01:00
Jonas Mueller
87aaa156e0 Add explicit casts to remove warnings 
for incompatible-pointer-types-discards-qualifiers
 2019-11-05 20:28:58 +01:00
Jonas Mueller
ef8233a839 Fix warnings for format-string-security 2019-11-05 20:11:44 +01:00
Jonas Mueller
125458df51 Fix warnings for return-type 2019-11-05 20:06:23 +01:00
yrutschle
d2cfa3c603
Merge pull request #242 from ideal/master 
Fix remaining available size of buffer
 2019-09-08 20:56:25 +02:00
yrutschle
891bcf9966 fix error message upon regex syntax error 2019-09-06 21:05:46 +02:00
yrutschle
544c2b6d2f
Merge pull request #240 from niobos/feature/descriptive-ps-name 
Change process name to indicate task of process
 2019-09-05 21:49:32 +02:00
Niobos
0380a4309f Change process name to indicate task of process 2019-09-05 16:40:59 +02:00
yrutschle
3aa245efa5 separate connection information creationg from log emission 2019-09-05 15:48:33 +02:00
ideal
bc28d6ce19 the remaining size of buffer should minus prefix_len 2019-09-04 23:02:13 +08:00
yrutschle
d78c810d84 specify conf2struct version 2019-08-30 22:25:38 +02:00
yrutschle
ed3cd40e23 adapt config format to conf2struct v1.0 2019-08-29 22:21:00 +02:00
yrutschle
12edc3dbca merged master 2019-08-16 10:06:31 +02:00
yrutschle
0931dfdf0b specify c2s commit to be used for building 2019-08-16 08:13:34 +02:00
yrutschle
0d5a2f6922
Merge pull request #236 from Jason-Cooke/patch-1 
docs: fix typo
 2019-07-09 21:50:49 +02:00
Jason Cooke
49e59734cb
docs: fix typo 2019-07-09 09:12:39 +12:00
Yves Rutschle
914dc98fb3 added transparent proxy figure 2019-07-08 20:18:57 +00:00
yrutschle
1dc0088b74
Merge pull request #235 from FlexMcMurphy/patch-3 
Delete tproxy.svg
 2019-07-08 22:12:31 +02:00
FlexMcMurphy
9416617456
Delete tproxy.svg 
Delete this svg file and replace with fixed svg diagram with text boxes displaying correctly.
 2019-07-05 23:52:24 +01:00
yrutschle
7e047e35b3 updated architecture figure to SVG 2019-07-03 22:45:04 +02:00
yrutschle
8ffcf5ab03
Merge pull request #233 from FlexMcMurphy/patch-1 
Delete tproxy.jpg
 2019-07-03 22:26:59 +02:00
yrutschle
a917149e14
Merge pull request #234 from FlexMcMurphy/patch-2 
Update tproxy.md
 2019-07-03 22:26:43 +02:00
FlexMcMurphy
08a64e99b4
Update tproxy.md 
Minor formatting changes. Could also update tproxy.jpg to the svg version.
 2019-06-30 12:28:53 +01:00
FlexMcMurphy
0ef57f1500
Delete tproxy.jpg 2019-06-30 11:47:42 +01:00
yrutschle
fde86a778d remove contents from README that was added in doc/ 2019-06-29 21:51:02 +02:00
yrutschle
5bd0235d38 split documentation into separate files in doc/ 2019-06-29 21:50:05 +02:00
yrutschle
177d337ac9 added new tproxy doc 2019-06-29 19:23:56 +02:00
yrutschle
8e203c897e added SOCKS5 to README 2019-06-24 21:39:18 +02:00
yrutschle
6e9f24153f
Merge pull request #232 from jmccrohan/master 
Update Let's Encrypt entry in example.cfg
 2019-06-17 20:57:06 +02:00
Jonathan McCrohan
f029b4098b Update Let's Encrypt entry in example.cfg 
Update Let's Encrypt entry in example.cfg for tls-alpn-01 challenge.
Previous entry was based on tls-sni-01 challenge which is deprecated and
was disabled in March 2019.

Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com>
 2019-06-16 23:26:33 +01:00
yrutschle
c1369910c9
Merge pull request #229 from rugbylug/evening_of_docs 
Fix a typo
 2019-05-20 21:28:53 +02:00
Ondřej Kuzník
d756f7d504 Fix a typo 2019-05-16 20:52:04 +01:00
yrutschle
6d99f780ef Merge branch 'master' of https://github.com/yrutschle/sslh 2019-05-13 15:21:36 +02:00
yrutschle
d5baed3f18 Fix fd2fd return value which should not be -1 on error 2019-05-13 15:21:22 +02:00
yrutschle
5684959dd6
Merge pull request #225 from ffontaine/master 
fix version extraction when building in a larger git tree
 2019-04-06 22:12:30 +02:00
Taras Inzyk
95a6577cda add Dockerfile 2019-04-06 17:26:08 +05:00
Fabrice Fontaine
b5d8b2d199 fix version extraction when building in a larger git tree 
sslh uses host git to extract its own version number. In buildroot, this
is an issue since extracted information is conflicting with buildroot git
status if we use git as VCS for buildroot.

Since these git calls are legitimate only if git is used for the sslh
subtree only, this patch adds a check : a .git directory has to exist at
the root of the project to enable git-extracted version string.

Signed-off-by: David Bachelart <david.bachelart@bbright.com>
[yann.morin.1998@free.fr: fix troll character U+c2a0]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[Retrieved from:
https://git.buildroot.net/buildroot/tree/package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 2019-04-05 23:05:25 +02:00
yrutschle
e528f519bc relax address matching rule so it matches more than just 'localhost' 2019-03-11 22:21:56 +01:00
yrutschle
b529069029 print a synthetic test report 2019-03-11 21:31:24 +01:00
yrutschle
67eb471c6f Merge branch 'tfo' 2019-03-10 10:12:33 +01:00
yrutschle
2705face30 TCP_FASTOPEN changelog 2019-03-10 10:11:28 +01:00
yrutschle
4e725e1520 added TFO for listening socket 2019-03-10 10:11:06 +01:00
yrutschle
b0c3c8fdbc manage TFO already done in connect call 2019-03-10 09:53:52 +01:00
yrutschle
15f733e572 add tfo_ok configuration setting 2019-03-10 09:46:06 +01:00
yrutschle
ff91f94315 Merge client TFO setting 2019-03-10 09:39:48 +01:00
Craig Andrews
0a880ea607
Use TCP Fast Open for client sockets 
Set the TCP_FASTOPEN_CONNECT option on client sockets to signal desire to use TCP Fast Open.

See https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=19f6d3f3c8422d65b5e3d2162e30ef07c6e21ea2
 2019-03-09 21:18:36 -05:00