mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 13:51:26 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: connection: unexport raw_sock and ssl_sock

Browse Source 
This way we're sure not to reuse them by accident.
This commit is contained in:
Willy Tarreau 2016-12-22 21:08:52 +01:00
parent a261e9b094
commit d9f5cca3d5
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/proto/raw_sock.h
View File

@ -24,8 +24,6 @@
#include <types/stream_interface.h> #include <types/stream_interface.h>
extern struct xprt_ops raw_sock;
#endif /* _PROTO_RAW_SOCK_H */ #endif /* _PROTO_RAW_SOCK_H */
/* /*

3
include/proto/ssl_sock.h
View File

@ -28,7 +28,6 @@
#include <types/proxy.h> #include <types/proxy.h>
#include <types/stream_interface.h> #include <types/stream_interface.h>
extern struct xprt_ops ssl_sock;
extern int sslconns; extern int sslconns;
extern int totalsslconns; extern int totalsslconns;
@ -36,7 +35,7 @@ extern int totalsslconns;
static inline static inline
int ssl_sock_is_ssl(struct connection *conn) int ssl_sock_is_ssl(struct connection *conn)
{ {
if (!conn || conn->xprt != &ssl_sock || !conn->xprt_ctx) if (!conn || conn->xprt != xprt_get(XPRT_SSL) || !conn->xprt_ctx)
return 0; return 0;
else else
return 1; return 1;

2
src/raw_sock.c
View File

@ -406,7 +406,7 @@ static int raw_sock_from_buf(struct connection *conn, struct buffer *buf, int fl
/* transport-layer operations for RAW sockets */ /* transport-layer operations for RAW sockets */
struct xprt_ops raw_sock = { static struct xprt_ops raw_sock = {
.snd_buf = raw_sock_from_buf, .snd_buf = raw_sock_from_buf,
.rcv_buf = raw_sock_to_buf, .rcv_buf = raw_sock_to_buf,
#if defined(CONFIG_HAP_LINUX_SPLICE) #if defined(CONFIG_HAP_LINUX_SPLICE)

3
src/ssl_sock.c
View File

@ -130,6 +130,7 @@ enum {
int sslconns = 0; int sslconns = 0;
int totalsslconns = 0; int totalsslconns = 0;
static struct xprt_ops ssl_sock;
#if (defined SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB && TLS_TICKETS_NO > 0) #if (defined SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB && TLS_TICKETS_NO > 0)
struct list tlskeys_reference = LIST_HEAD_INIT(tlskeys_reference); struct list tlskeys_reference = LIST_HEAD_INIT(tlskeys_reference);
@ -6648,7 +6649,7 @@ static struct cfg_kw_list cfg_kws = {ILH, {
}}; }};
/* transport-layer operations for SSL sockets */ /* transport-layer operations for SSL sockets */
struct xprt_ops ssl_sock = { static struct xprt_ops ssl_sock = {
.snd_buf = ssl_sock_from_buf, .snd_buf = ssl_sock_from_buf,
.rcv_buf = ssl_sock_to_buf, .rcv_buf = ssl_sock_to_buf,
.rcv_pipe = NULL, .rcv_pipe = NULL,