mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2025-08-07 15:47:01 +02:00
87b09668be
With HTTP/2, we'll have to support multiplexed streams. A stream is in
fact the largest part of what we currently call a session, it has buffers,
logs, etc.
In order to catch any error, this commit removes any reference to the
struct session and tries to rename most "session" occurrences in function
names to "stream" and "sess" to "strm" when that's related to a session.
The files stream.{c,h} were added and session.{c,h} removed.
The session will be reintroduced later and a few parts of the stream
will progressively be moved overthere. It will more or less contain
only what we need in an embryonic session.
Sample fetch functions and converters will have to change a bit so
that they'll use an L5 (session) instead of what's currently called
"L4" which is in fact L6 for now.
Once all changes are completed, we should see approximately this :
L7 - http_txn
L6 - stream
L5 - session
L4 - connection | applet
There will be at most one http_txn per stream, and a same session will
possibly be referenced by multiple streams. A connection will point to
a session and to a stream. The session will hold all the information
we need to keep even when we don't yet have a stream.
Some more cleanup is needed because some code was already far from
being clean. The server queue management still refers to sessions at
many places while comments talk about connections. This will have to
be cleaned up once we have a server-side connection pool manager.
Stream flags "SN_*" still need to be renamed, it doesn't seem like
any of them will need to move to the session.
108 lines
3.7 KiB
C
108 lines
3.7 KiB
C
/*
|
|
* include/proto/proto_tcp.h
|
|
* This file contains TCP socket protocol definitions.
|
|
*
|
|
* Copyright (C) 2000-2013 Willy Tarreau - w@1wt.eu
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation, version 2.1
|
|
* exclusively.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef _PROTO_PROTO_TCP_H
|
|
#define _PROTO_PROTO_TCP_H
|
|
|
|
#include <common/config.h>
|
|
#include <types/proto_tcp.h>
|
|
#include <types/task.h>
|
|
#include <proto/stick_table.h>
|
|
|
|
int tcp_bind_socket(int fd, int flags, struct sockaddr_storage *local, struct sockaddr_storage *remote);
|
|
void tcpv4_add_listener(struct listener *listener);
|
|
void tcpv6_add_listener(struct listener *listener);
|
|
int tcp_pause_listener(struct listener *l);
|
|
int tcp_connect_server(struct connection *conn, int data, int delack);
|
|
int tcp_connect_probe(struct connection *conn);
|
|
int tcp_get_src(int fd, struct sockaddr *sa, socklen_t salen, int dir);
|
|
int tcp_get_dst(int fd, struct sockaddr *sa, socklen_t salen, int dir);
|
|
int tcp_drain(int fd);
|
|
int tcp_inspect_request(struct stream *s, struct channel *req, int an_bit);
|
|
int tcp_inspect_response(struct stream *s, struct channel *rep, int an_bit);
|
|
int tcp_exec_req_rules(struct stream *s);
|
|
|
|
/* TCP keywords. */
|
|
void tcp_req_conn_keywords_register(struct tcp_action_kw_list *kw_list);
|
|
void tcp_req_cont_keywords_register(struct tcp_action_kw_list *kw_list);
|
|
void tcp_res_cont_keywords_register(struct tcp_action_kw_list *kw_list);
|
|
|
|
/* Converts the INET/INET6 source address to a stick_table key usable for table
|
|
* lookups. <type> can be STKTABLE_TYPE_IP or STKTABLE_TYPE_IPV6. The function
|
|
* try to convert the incoming IP to the type expected by the sticktable.
|
|
* Returns either NULL if the source cannot be converted (eg: not IPv4) or a
|
|
* pointer to the converted result in static_table_key in the appropriate format
|
|
* (IP).
|
|
*/
|
|
static inline struct stktable_key *addr_to_stktable_key(struct sockaddr_storage *addr, long type)
|
|
{
|
|
switch (addr->ss_family) {
|
|
case AF_INET:
|
|
/* Convert IPv4 to IPv4 key. */
|
|
if (type == STKTABLE_TYPE_IP) {
|
|
static_table_key->key = (void *)&((struct sockaddr_in *)addr)->sin_addr;
|
|
break;
|
|
}
|
|
/* Convert IPv4 to IPv6 key. */
|
|
if (type == STKTABLE_TYPE_IPV6) {
|
|
v4tov6(&static_table_key->data.ipv6, &((struct sockaddr_in *)addr)->sin_addr);
|
|
static_table_key->key = &static_table_key->data.ipv6;
|
|
break;
|
|
}
|
|
return NULL;
|
|
|
|
case AF_INET6:
|
|
/* Convert IPv6 to IPv4 key. This conversion can be failed. */
|
|
if (type == STKTABLE_TYPE_IP) {
|
|
if (!v6tov4(&static_table_key->data.ip, &((struct sockaddr_in6 *)addr)->sin6_addr))
|
|
return NULL;
|
|
static_table_key->key = &static_table_key->data.ip;
|
|
break;
|
|
}
|
|
/* Convert IPv6 to IPv6 key. */
|
|
if (type == STKTABLE_TYPE_IPV6) {
|
|
static_table_key->key = (void *)&((struct sockaddr_in6 *)addr)->sin6_addr;
|
|
break;
|
|
}
|
|
return NULL;
|
|
default:
|
|
return NULL;
|
|
}
|
|
return static_table_key;
|
|
}
|
|
|
|
/* for a tcp-request action TCP_ACT_TRK_*, return a tracking index starting at
|
|
* zero for SC0. Unknown actions also return zero.
|
|
*/
|
|
static inline int tcp_trk_idx(int trk_action)
|
|
{
|
|
return trk_action - TCP_ACT_TRK_SC0;
|
|
}
|
|
|
|
#endif /* _PROTO_PROTO_TCP_H */
|
|
|
|
/*
|
|
* Local variables:
|
|
* c-indent-level: 8
|
|
* c-basic-offset: 8
|
|
* End:
|
|
*/
|