diff options
author | Reyk Floeter <reyk@cvs.openbsd.org> | 2019-05-08 23:22:20 +0000 |
---|---|---|
committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2019-05-08 23:22:20 +0000 |
commit | cc1037c514e36abc8abb09bd484a68786d96567b (patch) | |
tree | b211209b55794fc4bc00ea863b01b323a76c0258 /usr.sbin/relayd/relayd.h | |
parent | 8cb9985dfed2bc225590478d19e767611cd53b48 (diff) |
Fix and tweak websocket upgrade handling.
- Don't expect the Connection header to equal Upgrade, it may include Upgrade
- Reshuffle the code to check the Upgrade/Connection headers in one place
Reported and tested by Rivo Nurges
OK and input from benno@
Cvs: ----------------------------------------------------------------------
Diffstat (limited to 'usr.sbin/relayd/relayd.h')
-rw-r--r-- | usr.sbin/relayd/relayd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/relayd/relayd.h b/usr.sbin/relayd/relayd.h index b05b2ad7603..65ffe714aba 100644 --- a/usr.sbin/relayd/relayd.h +++ b/usr.sbin/relayd/relayd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: relayd.h,v 1.252 2019/03/04 21:25:03 benno Exp $ */ +/* $OpenBSD: relayd.h,v 1.253 2019/05/08 23:22:19 reyk Exp $ */ /* * Copyright (c) 2006 - 2016 Reyk Floeter <reyk@openbsd.org> @@ -1324,6 +1324,8 @@ void relay_log(struct rsession *, char *); int kv_log(struct rsession *, struct kv *, u_int16_t, enum direction); struct kv *kv_find(struct kvtree *, struct kv *); +struct kv *kv_find_value(struct kvtree *, char *, const char *, + const char *); int kv_cmp(struct kv *, struct kv *); int rule_add(struct protocol *, struct relay_rule *, const char *); |