666 Commits

Author SHA1 Message Date
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
yrutschle
0cde3d794a check return values (fix #61) 2021-10-02 21:27:31 +02:00
yrutschle
ed48d3964f removed obsolete prototye 2021-10-02 21:23:39 +02:00
yrutschle
7b0d486d3d removed obsolete check to verbose 2021-10-02 21:23:17 +02:00
yrutschle
0e118a109c Overhaul of the logging system: logs all have classes, and
each class can be configured independently to write to
stderr or syslog.
2021-10-02 15:40:32 +02:00
yrutschle
9955cc6560 describe verbose options 2021-10-02 15:38:22 +02:00
yrutschle
caa62875c1 remove --verbose option 2021-09-27 13:28:21 +02:00
yrutschle
c8fce0a02f make sure no error will go to stderr if in inetd (fix #303) 2021-09-27 13:21:16 +02:00
yrutschle
4277d27063 migrate last messages to new log system 2021-09-27 13:16:30 +02:00
yrutschle
16bf1a6aca make echosrv independant from common macros 2021-09-27 13:01:20 +02:00
yrutschle
4f0f5017bc remove obsolete prototype 2021-09-27 12:55:57 +02:00
yrutschle
70b31a48d9 migrate generic system call failure checks to new log system 2021-09-27 12:53:41 +02:00
yrutschle
66caf8a31b remove log_message 2021-09-27 12:51:37 +02:00
yrutschle
4d3cc9c925 migrate some more common.c to new log system 2021-09-27 12:46:51 +02:00
yrutschle
2e11001087 migrate UDP to new log system 2021-09-27 12:43:03 +02:00
yrutschle
6ea7d48f86 migrate tls.c and probe.c to new log system 2021-09-26 16:55:31 +02:00
yrutschle
3fb1201b3f merged transparent proxy setups together, clarifying what is not known to work 2021-09-26 16:28:06 +02:00
yrutschle
e9e7ada069 convert to hash-based titles 2021-09-26 16:13:23 +02:00
yrutschle
e6cbbe9511 migrate common.c to new logging system 2021-09-26 15:53:21 +02:00
yrutschle
e5f16b93ce hexdump writes to parametrable msg_info 2021-09-19 21:54:47 +02:00
yrutschle
673c40954e migrate sslh-fork to new log system 2021-09-19 20:29:43 +02:00
yrutschle
f7b6f669a4 sslh-select to use new log system 2021-09-19 20:24:46 +02:00
yrutschle
dbad46a358 remove obsolete debug code 2021-09-19 15:19:37 +02:00
yrutschle
098a55fd1d new logging system: now with message classes 2021-09-19 15:14:38 +02:00