MINOR: rhttp: rename proto_reverse_connect

This commit is renaming of module proto_reverse_connect to proto_rhttp.
This name is selected as it is shorter and more precise.

diff --git a/Makefile b/Makefile
index efdd10297ac4becc7b69b30b3316de91455f89fc..03f7e7165bb3235e3dc0b840fea37a22aa69bbc9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -960,8 +960,7 @@ OBJS += src/mux_h2.o src/mux_fcgi.o src/mux_h1.o src/tcpcheck.o               \
         src/base64.o src/auth.o src/uri_auth.o src/time.o src/ebistree.o      \
         src/dynbuf.o src/wdt.o src/pipe.o src/init.o src/http_acl.o           \
         src/hpack-huff.o src/hpack-enc.o src/dict.o src/freq_ctr.o            \
-        src/ebtree.o src/hash.o src/dgram.o src/version.o                     \
-        src/proto_reverse_connect.o
+        src/ebtree.o src/hash.o src/dgram.o src/version.o src/proto_rhttp.o
 
 ifneq ($(TRACE),)
   OBJS += src/calltrace.o

diff --git a/include/haproxy/proto_reverse_connect-t.h b/include/haproxy/proto_rhttp-t.h
similarity index 73%
rename from include/haproxy/proto_reverse_connect-t.h
rename to include/haproxy/proto_rhttp-t.h
index 4e7a579de964551b13c0e4fa575fd27972a4df3b..28e2ff952ec44cefa1445857bf1a9fd42a8768e2 100644 (file)
--- a/include/haproxy/proto_reverse_connect-t.h
+++ b/include/haproxy/proto_rhttp-t.h
@@ -1,5 +1,5 @@
-#ifndef _HAPROXY_PROTO_REVERSE_CONNECT_H_T
-#define _HAPROXY_PROTO_REVERSE_CONNECT_H_T
+#ifndef _HAPROXY_PROTO_RHTTP_H_T
+#define _HAPROXY_PROTO_RHTTP_H_T
 
 /* State for reverse preconnect listener state machine.
  * Used to limit log reporting only on state changes.
@@ -11,4 +11,4 @@ enum li_preconn_state {
        LI_PRECONN_ST_FULL, /* pre-connect maxconn reached */
 };
 
-#endif /* _HAPROXY_PROTO_REVERSE_CONNECT_H_T */
+#endif /* _HAPROXY_PROTO_RHTTP_H_T */

diff --git a/include/haproxy/proto_reverse_connect.h b/include/haproxy/proto_rhttp.h
similarity index 82%
rename from include/haproxy/proto_reverse_connect.h
rename to include/haproxy/proto_rhttp.h
index 0c07356e090408312df8aa3a550a24c316411403..8ce90f778bb86507eb4369c30601ff54f5bb3b5d 100644 (file)
--- a/include/haproxy/proto_reverse_connect.h
+++ b/include/haproxy/proto_rhttp.h
@@ -1,5 +1,5 @@
-#ifndef _HAPROXY_PROTO_REVERSE_CONNECT_H
-#define _HAPROXY_PROTO_REVERSE_CONNECT_H
+#ifndef _HAPROXY_PROTO_RHTTP_H
+#define _HAPROXY_PROTO_RHTTP_H
 
 #include <haproxy/connection-t.h>
 #include <haproxy/listener-t.h>
@@ -18,4 +18,4 @@ int rev_accepting_conn(const struct receiver *rx);
 
 void rev_notify_preconn_err(struct listener *l);
 
-#endif /* _HAPROXY_PROTO_REVERSE_CONNECT_H */
+#endif /* _HAPROXY_PROTO_RHTTP_H */

diff --git a/include/haproxy/receiver-t.h b/include/haproxy/receiver-t.h
index d9f280e46f094a2a26c328540be29b122a04aedc..17bb5691540785babd47ef2cf812fe56b680832e 100644 (file)
--- a/include/haproxy/receiver-t.h
+++ b/include/haproxy/receiver-t.h
@@ -27,7 +27,7 @@
 
 #include <haproxy/api-t.h>
 #include <haproxy/namespace-t.h>
-#include <haproxy/proto_reverse_connect-t.h>
+#include <haproxy/proto_rhttp-t.h>
 #include <haproxy/quic_sock-t.h>
 #include <haproxy/thread.h>
 

diff --git a/src/connection.c b/src/connection.c
index 547fff1b45a0cb27b57c3234cf4ee550ed1836cf..f07113abd2ce479db01a6e3a2fe91d2e54ce6b60 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -25,7 +25,7 @@
 #include <haproxy/log.h>
 #include <haproxy/namespace.h>
 #include <haproxy/net_helper.h>
-#include <haproxy/proto_reverse_connect.h>
+#include <haproxy/proto_rhttp.h>
 #include <haproxy/proto_tcp.h>
 #include <haproxy/sample.h>
 #include <haproxy/sc_strm.h>

diff --git a/src/proto_reverse_connect.c b/src/proto_rhttp.c
similarity index 99%
rename from src/proto_reverse_connect.c
rename to src/proto_rhttp.c
index 3d100d5947df6a14258379a8f6f7d45948ea4713..c2b3f9dad79890e39d06a926dfff2e988008ded8 100644 (file)
--- a/src/proto_reverse_connect.c
+++ b/src/proto_rhttp.c
@@ -16,7 +16,7 @@
 #include <haproxy/ssl_sock.h>
 #include <haproxy/task.h>
 
-#include <haproxy/proto_reverse_connect.h>
+#include <haproxy/proto_rhttp.h>
 
 struct proto_fam proto_fam_reverse_connect = {
        .name = "reverse_connect",