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

MINOR: rhttp: remove the unused outgoing connect() function

Browse Source 
A dummy connect() function previously had to be installed for the log
server so that a reverse-http address could be referenced on a "server"
line, but after the recent rework of the server line parsing, this is
no longer needed, and this is actually annoying as it makes one believe
there is a way to connect outside, which is not true. Let's now get rid
of this function.
This commit is contained in:
Willy Tarreau 2023-11-17 10:52:13 +01:00
parent d069825c5f
commit f592a0d5dd
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/proto_reverse_connect.h
View File

@ -14,8 +14,6 @@ struct connection *rev_accept_conn(struct listener *l, int *status);
void rev_unbind_receiver(struct listener *l); void rev_unbind_receiver(struct listener *l);
int rev_set_affinity(struct connection *conn, int new_tid); int rev_set_affinity(struct connection *conn, int new_tid);
int rev_connect(struct connection *conn, int flags);
int rev_accepting_conn(const struct receiver *rx); int rev_accepting_conn(const struct receiver *rx);
void rev_notify_preconn_err(struct listener *l); void rev_notify_preconn_err(struct listener *l);

10
src/proto_reverse_connect.c
View File

@ -28,7 +28,7 @@ struct proto_fam proto_fam_reverse_connect = {
struct protocol proto_reverse_connect = { struct protocol proto_reverse_connect = {
.name = "rev", .name = "rev",
/* connection layer */ /* connection layer (no outgoing connection) */
.listen = rev_bind_listener, .listen = rev_bind_listener,
.enable = rev_enable_listener, .enable = rev_enable_listener,
.disable = rev_disable_listener, .disable = rev_disable_listener,
@ -38,8 +38,6 @@ struct protocol proto_reverse_connect = {
.accept_conn = rev_accept_conn, .accept_conn = rev_accept_conn,
.set_affinity = rev_set_affinity, .set_affinity = rev_set_affinity,
.connect = rev_connect,
/* address family */ /* address family */
.fam = &proto_fam_reverse_connect, .fam = &proto_fam_reverse_connect,
@ -373,12 +371,6 @@ int rev_set_affinity(struct connection *conn, int new_tid)
return -1; return -1;
} }
/* Simple callback to enable definition of passive HTTP reverse servers. */
int rev_connect(struct connection *conn, int flags)
{
return SF_ERR_NONE;
}
int rev_accepting_conn(const struct receiver *rx) int rev_accepting_conn(const struct receiver *rx)
{ {
return 1; return 1;