Yves Rutschle
5def70dff5
fix dependencies so conf2struct gets called before sslh-conf.h is used
2022-04-01 19:34:25 +02:00
yrutschle
478e1fc92f
abstract hash indexes
2022-03-31 22:08:56 +02:00
Yves Rutschle
96b1aa86d8
Merge pull request #325 from g1franc/patch-1
...
Update README.MacOSX
2022-03-31 15:27:00 +02:00
g1franc
b1517f27a8
Update README.MacOSX
...
Should be *tls* as argument here instead of old *ssl*
2022-03-31 00:06:48 +02:00
yrutschle
454a261c95
initial hash object with testing framework
2022-03-30 22:56:41 +02:00
yrutschle
9c3274359a
document resolve_on_forward
2022-03-23 21:33:45 +01:00
Yves Rutschle
a71de786d6
Merge pull request #323 from milkpirate/feat/resolve-on-connect
...
Feat/resolve on connect
2022-03-23 21:26:25 +01:00
Yves Rutschle
dd167d13a3
Merge pull request #324 from beango1/patch-1
...
typo correction
2022-03-23 21:23:05 +01:00
beango1
759e68c8d2
typo correction
2022-03-23 10:22:44 -04:00
Paul Schroeder
78bc954769
review
...
Signed-off-by: Paul Schroeder <milkpirate@users.noreply.github.com>
2022-03-19 23:18:29 +01:00
Paul Schroeder
3f5c81d2f6
be more clearly
...
Signed-off-by: Paul Schroeder <milkpirate@users.noreply.github.com>
2022-03-18 18:03:58 +01:00
yrutschle
ff810d41b0
Merge branch 'master' of https://github.com/yrutschle/sslh
2022-03-18 18:03:29 +01:00
yrutschle
d922086f53
handle accept failure properly ( fix #322 )
2022-03-18 18:03:18 +01:00
yrutschle
1e0578c082
don't log to syslog when testing
2022-03-18 18:02:32 +01:00
Paul Schroeder
87577ae5f6
add functionality
...
Signed-off-by: Paul Schroeder <milkpirate@users.noreply.github.com>
2022-03-18 17:59:54 +01:00
Paul Schroeder
875fa488c9
add option and description
...
Signed-off-by: Paul Schroeder <milkpirate@users.noreply.github.com>
2022-03-18 17:59:29 +01:00
yrutschle
91d148f66c
removed obsolete resolve_name function
2022-03-17 21:51:54 +01:00
yrutschle
66f4b18121
ensure conf2struct is called early in the make
2022-03-17 21:51:01 +01:00
Yves Rutschle
bccb78e1a3
Merge pull request #317 from jeffre/master
...
docs: corrections to docker usage
2022-01-23 16:26:55 +01:00
jeffre
6f497b6c8b
docs: corrections to docker usage
2022-01-20 20:21:12 -07:00
yrutschle
4e6145576e
warn systemd that sslh will fork ( fix #314 )
2021-12-23 21:56:31 +01:00
yrutschle
58ed185316
missing header dependency
2021-12-19 19:30:21 +01:00
yrutschle
122649ce3c
fix log level for unknown ALPN ( fix #313 )
2021-12-12 09:30:07 +01:00
yrutschle
31b096a0f4
Merge branch 'master' of https://github.com/yrutschle/sslh
2021-12-09 21:33:37 +01:00
yrutschle
adaf407b8a
added sslh-ev to install docs
2021-12-09 21:29:48 +01:00
Yves Rutschle
4e72800f2e
Merge pull request #311 from Belisarith/master
...
Correct wrong version of pcre in Dockerfile
2021-11-25 11:02:40 +01:00
Belisarith
18eeaa579a
additional fix dockerfile, otherwise docker is not runnable
2021-11-23 12:57:16 +00:00
Belisarith
80f2d758a4
Correct wrong version of pcre in Dockerfile
2021-11-23 12:40:17 +00:00
yrutschle
9798bdcaa0
Merge branch 'master' of https://github.com/yrutschle/sslh
2021-11-20 17:00:34 +01:00
yrutschle
93df6975ed
set appropriate log level for SNI matching
2021-11-20 17:00:24 +01:00
Yves Rutschle
44a78bc515
document dependency on libev
2021-11-14 18:58:59 +00:00
yrutschle
711c11c820
New sslh-ev: this is functionaly equivalent to sslh-select (mono-process, only forks for specified protocols), but based on libev, which should make it scalable to large numbers of connections.
2021-11-12 09:05:18 +01:00
yrutschle
ae117097ea
sslh-ev in ChangeLog
2021-11-12 09:03:30 +01:00
yrutschle
0a23ca133e
finalise UDP support for sslh-ev
2021-11-11 21:16:37 +01:00
yrutschle
207d482189
refactor: move udp timeout management to udp module
2021-11-09 18:27:52 +01:00
yrutschle
d4d9dbb8e7
remove dependancy to watcher type in UDP timeout
2021-11-09 18:12:02 +01:00
yrutschle
8ddff5e388
sslh-ev working for TCP
2021-11-07 16:13:44 +01:00
yrutschle
a80e2ceb27
remove obsolete declaration
2021-11-07 13:13:41 +01:00
yrutschle
e28fa91b0f
reap children properly
2021-11-07 13:13:05 +01:00
yrutschle
17313100b5
print cnx type when dumping it
2021-11-01 18:48:26 +01:00
yrutschle
4cd3ab8958
moved watcher add to watcher init
2021-10-28 15:41:09 +02:00
yrutschle
5ec1f7eb98
added missing header
2021-10-28 15:40:40 +02:00
Yves Rutschle
5b21375087
Merge pull request #310 from bket/fix_tests
...
Fix (some) failing tests
2021-10-28 15:07:51 +02:00
Björn Ketelaars
d57a155bf4
Fix (some) failing tests
...
Found a couple of failing tests on Alpine Linux and OpenBSD. For the
tests to even run `ip4-localhost` has to be changed to an IP-address
(127.0.0.1). `ip4-localhost` is typically not part of `/etc/hosts`.
Output failing tests:
```
not ok 5
udp: 0
prefix: tls:
listen [1]:
host: localhost
port: 9025
flushing deferred data to fd 9
selecting... max_fd=11 num_probing=0
activity on fd8
closing fd 8
closing fd 9
selecting... max_fd=11 num_probing=0
# Failed test at ./t line 59.
# got: '1'
# expected: 'sslh-select: Connect and write nothing'
```
```
not ok 22 - sslh-select:ssh: probe connected correctly
# Failed test 'sslh-select:ssh: probe connected correctly'
# at ./t line 59.
# got: 'regex'
# expected: 'ssh'
```
```
not ok 68 - sslh-select:ssh: probe connected correctly
# Failed test 'sslh-select:ssh: probe connected correctly'
# at ./t line 59.
# got: 'regex'
# expected: 'ssh'
```
Diff works around issues causing tests 22 and 68 to fail. As of yet, no
workaround for test 5 has been found.
2021-10-27 19:52:06 +02:00
yrutschle
ec033efbbc
refactor more code from sslh-select to processes.c
2021-10-26 21:45:44 +02:00
yrutschle
3389000ff3
move action processing to its own file
2021-10-17 16:02:49 +02:00
yrutschle
25abd765cb
refactor: abstract watchers from loop data
2021-10-11 22:40:46 +02:00
yrutschle
2cdd60dd18
make systemd-sslh-generator work again ( fix #308 again)
2021-10-04 21:34:22 +02:00
yrutschle
b0aeeff465
Include log header before defining macros that depend on log levels. ( fix #308 )
2021-10-04 09:11:41 +02:00
yrutschle
c9eff6e38d
removed obsolete declarations
2021-10-03 17:25:31 +02:00
