mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-26 21:31:01 +01:00
Code Issues Projects Releases Wiki Activity

REORG: include: move session.h to haproxy/session{,-t}.h

Browse Source 
Almost no change was needed beyond a little bit of reordering of the
types file and adjustments to use session-t instead of session at a
few places.
This commit is contained in:
Willy Tarreau 2020-06-04 18:58:52 +02:00
parent 872f2ea209
commit 48d25b3bc9
20 changed files with 42 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/connection.h
View File

@ -30,9 +30,9 @@
#include <haproxy/listener-t.h>
#include <haproxy/obj_type.h>
#include <haproxy/pool.h>
#include <haproxy/session.h>
#include <haproxy/task-t.h>
#include <proto/session.h>
extern struct pool_head *pool_head_connection;
extern struct pool_head *pool_head_connstream;

30
include/types/session.h → include/haproxy/session-t.h
View File

@ -1,8 +1,8 @@
/*
* include/types/session.h
* include/haproxy/session-t.h
* This file defines everything related to sessions.
*
* Copyright (C) 2000-2015 Willy Tarreau - w@1wt.eu
* Copyright (C) 2000-2020 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
@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _TYPES_SESSION_H
#define _TYPES_SESSION_H
#ifndef _HAPROXY_SESSION_T_H
#define _HAPROXY_SESSION_T_H
#include <sys/time.h>
@ -31,18 +31,10 @@
#include <haproxy/api-t.h>
#include <haproxy/list-t.h>
#include <haproxy/obj_type-t.h>
#include <haproxy/vars-t.h>
#include <haproxy/stick_table-t.h>
#include <haproxy/task-t.h>
#include <haproxy/vars-t.h>
struct sess_srv_list {
void *target;
struct list conn_list; /* Head of the connections list */
struct list srv_list; /* Next element of the server list */
};
#define MAX_SRV_LIST 5
/* session flags */
enum {
@ -50,7 +42,9 @@ enum {
SESS_FL_PREFER_LAST = 0x00000001, /* NTML authent, we should reuse last conn */
};
struct proxy;
/* max number of idle server connections kept attached to a session */
#define MAX_SRV_LIST 5
struct session {
struct proxy *fe; /* the proxy this session depends on for the client side */
struct listener *listener; /* the listener by which the request arrived */
@ -66,7 +60,13 @@ struct session {
unsigned int flags; /* session flags, SESS_FL_* */
};
#endif /* _TYPES_SESSION_H */
struct sess_srv_list {
void *target;
struct list conn_list; /* Head of the connections list */
struct list srv_list; /* Next element of the server list */
};
#endif /* _HAPROXY_SESSION_T_H */
/*
* Local variables:

20
include/proto/session.h → include/haproxy/session.h
View File

@ -1,8 +1,8 @@
/*
* include/proto/session.h
* This file defines everything related to sessions.
* include/haproxy/session.h
* This file contains functions used to manage sessions.
*
* Copyright (C) 2000-2015 Willy Tarreau - w@1wt.eu
* Copyright (C) 2000-2020 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
@ -19,16 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _PROTO_SESSION_H
#define _PROTO_SESSION_H
#ifndef _HAPROXY_SESSION_H
#define _HAPROXY_SESSION_H
#include <haproxy/api.h>
#include <haproxy/obj_type.h>
#include <haproxy/pool.h>
#include <haproxy/global-t.h>
#include <types/session.h>
#include <haproxy/obj_type-t.h>
#include <haproxy/pool.h>
#include <haproxy/session-t.h>
#include <haproxy/stick_table.h>
#include <proto/server.h>
@ -133,7 +131,7 @@ static inline int session_check_idle_conn(struct session *sess, struct connectio
return 0;
}
#endif /* _PROTO_SESSION_H */
#endif /* _HAPROXY_SESSION_H */
/*
* Local variables:

2
include/haproxy/tcp_rules.h
View File

@ -24,8 +24,8 @@
#include <haproxy/action-t.h>
#include <haproxy/api.h>
#include <haproxy/session-t.h>
#include <types/stream.h>
#include <types/session.h>
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);

2
include/haproxy/vars.h
View File

@ -22,8 +22,8 @@
#ifndef _HAPROXY_VARS_H
#define _HAPROXY_VARS_H
#include <types/session.h>
#include <types/stream.h>
#include <haproxy/session-t.h>
#include <haproxy/api-t.h>
#include <haproxy/vars-t.h>

2
include/types/stream.h
View File

@ -33,6 +33,7 @@
#include <haproxy/hlua-t.h>
#include <haproxy/list-t.h>
#include <haproxy/obj_type-t.h>
#include <haproxy/session-t.h>
#include <haproxy/vars-t.h>
#include <types/channel.h>
@ -41,7 +42,6 @@
#include <types/proxy.h>
#include <types/queue.h>
#include <types/server.h>
#include <types/session.h>
#include <types/stream_interface.h>
#include <haproxy/task-t.h>
#include <haproxy/stick_table-t.h>

2
src/backend.c
View File

@ -32,6 +32,7 @@
#include <haproxy/lb_fwrr.h>
#include <haproxy/obj_type.h>
#include <haproxy/payload.h>
#include <haproxy/session.h>
#include <haproxy/task.h>
#include <haproxy/ticks.h>
#include <haproxy/time.h>
@ -52,7 +53,6 @@
#include <proto/queue.h>
#include <haproxy/sample.h>
#include <proto/server.h>
#include <proto/session.h>
#include <proto/stream.h>
#include <proto/stream_interface.h>
#include <proto/ssl_sock.h>

2
src/cfgparse.c
View File

@ -54,6 +54,7 @@
#include <haproxy/obj_type-t.h>
#include <haproxy/peers-t.h>
#include <haproxy/pool.h>
#include <haproxy/session.h>
#include <haproxy/tools.h>
#include <haproxy/time.h>
#include <common/uri_auth.h>
@ -77,7 +78,6 @@
#include <proto/proxy.h>
#include <haproxy/peers.h>
#include <haproxy/sample.h>
#include <proto/session.h>
#include <proto/server.h>
#include <proto/stream.h>
#include <haproxy/stick_table.h>

2
src/cli.c
View File

@ -37,6 +37,7 @@
#include <haproxy/pattern-t.h>
#include <haproxy/peers.h>
#include <haproxy/sample-t.h>
#include <haproxy/session.h>
#include <haproxy/task.h>
#include <haproxy/tools.h>
#include <haproxy/ticks.h>
@ -61,7 +62,6 @@
#include <haproxy/pipe.h>
#include <haproxy/protocol.h>
#include <proto/proxy.h>
#include <proto/session.h>
#include <proto/stream.h>
#include <proto/server.h>
#include <proto/stream_interface.h>

2
src/fcgi-app.c
View File

@ -18,6 +18,7 @@
#include <haproxy/http_htx.h>
#include <haproxy/regex.h>
#include <haproxy/sample.h>
#include <haproxy/session.h>
#include <haproxy/tools.h>
#include <haproxy/global.h>
@ -28,7 +29,6 @@
#include <proto/log.h>
#include <proto/proxy.h>
#include <proto/server.h>
#include <proto/session.h>
/* Global list of all FCGI applications */
static struct fcgi_app *fcgi_apps = NULL;

2
src/flt_spoe.c
View File

@ -21,6 +21,7 @@
#include <haproxy/signal.h>
#include <haproxy/thread.h>
#include <haproxy/pool.h>
#include <haproxy/session.h>
#include <haproxy/task.h>
#include <haproxy/tcp_rules.h>
#include <haproxy/time.h>
@ -38,7 +39,6 @@
#include <proto/log.h>
#include <proto/http_ana.h>
#include <proto/proxy.h>
#include <proto/session.h>
#include <proto/spoe.h>
#include <proto/stream.h>
#include <proto/stream_interface.h>

2
src/haproxy.c
View File

@ -102,6 +102,7 @@
#include <haproxy/peers.h>
#include <haproxy/sample.h>
#include <haproxy/regex.h>
#include <haproxy/session.h>
#include <haproxy/signal.h>
#include <haproxy/tools.h>
#include <haproxy/time.h>
@ -131,7 +132,6 @@
#include <proto/proxy.h>
#include <proto/queue.h>
#include <proto/server.h>
#include <proto/session.h>
#include <proto/stream.h>
#include <proto/ssl_sock.h>

2
src/hlua.c
View File

@ -40,6 +40,7 @@
#include <haproxy/pattern.h>
#include <haproxy/payload.h>
#include <haproxy/sample.h>
#include <haproxy/session.h>
#include <haproxy/task.h>
#include <haproxy/tcp_rules.h>
#include <haproxy/tools.h>
@ -57,7 +58,6 @@
#include <proto/queue.h>
#include <proto/http_ana.h>
#include <proto/server.h>
#include <proto/session.h>
#include <proto/stream.h>
#include <proto/stream_interface.h>

3
src/mux_fcgi.c
View File

@ -22,13 +22,12 @@
#include <haproxy/list.h>
#include <haproxy/net_helper.h>
#include <haproxy/regex.h>
#include <haproxy/session-t.h>
#include <types/proxy.h>
#include <types/session.h>
#include <proto/fcgi-app.h>
#include <proto/log.h>
#include <proto/session.h>
#include <proto/ssl_sock.h>
#include <proto/stream.h>
#include <proto/stream_interface.h>

3
src/mux_h1.c
View File

@ -22,11 +22,10 @@
#include <haproxy/pipe-t.h>
#include <types/proxy.h>
#include <types/session.h>
#include <haproxy/http_htx.h>
#include <proto/log.h>
#include <proto/session.h>
#include <haproxy/session-t.h>
#include <proto/stream.h>
#include <proto/stream_interface.h>
#include <proto/trace.h>

3
src/mux_h2.c
View File

@ -22,11 +22,10 @@
#include <haproxy/http_htx.h>
#include <haproxy/htx.h>
#include <haproxy/net_helper.h>
#include <haproxy/session-t.h>
#include <proto/trace.h>
#include <proto/session.h>
#include <proto/stream.h>
#include <proto/stream_interface.h>
#include <types/session.h>
#include <import/eb32tree.h>

2
src/peers.c
View File

@ -27,6 +27,7 @@
#include <haproxy/obj_type-t.h>
#include <haproxy/peers.h>
#include <haproxy/task.h>
#include <haproxy/session-t.h>
#include <haproxy/signal.h>
#include <haproxy/time.h>
#include <haproxy/tools.h>
@ -41,7 +42,6 @@
#include <haproxy/fd.h>
#include <proto/log.h>
#include <proto/proxy.h>
#include <proto/session.h>
#include <proto/stream.h>
#include <haproxy/stick_table.h>
#include <proto/stream_interface.h>

4
src/session.c
View File

@ -16,14 +16,12 @@
#include <haproxy/http.h>
#include <haproxy/listener.h>
#include <haproxy/pool.h>
#include <haproxy/session.h>
#include <haproxy/tcp_rules.h>
#include <haproxy/vars.h>
#include <types/session.h>
#include <proto/log.h>
#include <proto/proxy.h>
#include <proto/session.h>
#include <proto/stream.h>
DECLARE_POOL(pool_head_session, "session", sizeof(struct session));

2
src/stats.c
View File

@ -40,6 +40,7 @@
#include <haproxy/listener.h>
#include <haproxy/map-t.h>
#include <haproxy/pattern-t.h>
#include <haproxy/session.h>
#include <haproxy/task.h>
#include <haproxy/tools.h>
#include <haproxy/ticks.h>
@ -61,7 +62,6 @@
#include <proto/log.h>
#include <haproxy/pipe.h>
#include <proto/proxy.h>
#include <proto/session.h>
#include <proto/ssl_sock.h>
#include <proto/stream.h>
#include <proto/server.h>

2
src/stream.c
View File

@ -31,6 +31,7 @@
#include <haproxy/thread.h>
#include <haproxy/htx.h>
#include <haproxy/pool.h>
#include <haproxy/session.h>
#include <haproxy/task.h>
#include <haproxy/tcp_rules.h>
#include <haproxy/vars.h>
@ -51,7 +52,6 @@
#include <proto/filters.h>
#include <haproxy/freq_ctr.h>
#include <proto/log.h>
#include <proto/session.h>
#include <proto/stream.h>
#include <haproxy/pipe.h>
#include <proto/http_ana.h>