From: Willy Tarreau <w@1wt.eu>
Date: Fri, 11 May 2012 12:23:52 +0000 (+0200)
Subject: REORG: use the name sock_raw instead of stream_sock
X-Git-Tag: v1.5-dev10~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c63190d4290d40e0fd45a022643af30e87268dd3;p=thirdparty%2Fhaproxy.git

REORG: use the name sock_raw instead of stream_sock

We'll soon have an SSL socket layer, and in order to ease the difference
between the two, we use the name "sock_raw" to designate the one which
directly talks to the sockets without any conversion.
---

diff --git a/Makefile b/Makefile
index 8a96dd7a10..a6c796241f 100644
--- a/Makefile
+++ b/Makefile
@@ -512,7 +512,7 @@ OBJS = src/haproxy.o src/sessionhash.o src/base64.o src/protocols.o \
        src/time.o src/fd.o src/pipe.o src/regex.o src/cfgparse.o src/server.o \
        src/checks.o src/queue.o src/frontend.o src/proxy.o src/peers.o \
        src/arg.o src/stick_table.o src/proto_uxst.o \
-       src/proto_http.o src/stream_sock.o src/appsession.o src/backend.o \
+       src/proto_http.o src/sock_raw.o src/appsession.o src/backend.o \
        src/lb_chash.o src/lb_fwlc.o src/lb_fwrr.o src/lb_map.o src/lb_fas.o \
        src/stream_interface.o src/dumpstats.o src/proto_tcp.o \
        src/session.o src/hdr_idx.o src/ev_select.o src/signal.o \
diff --git a/Makefile.bsd b/Makefile.bsd
index 9b0e5146a4..369178d515 100644
--- a/Makefile.bsd
+++ b/Makefile.bsd
@@ -109,7 +109,7 @@ OBJS = src/haproxy.o src/sessionhash.o src/base64.o src/protocols.o \
        src/uri_auth.o src/standard.o src/buffers.o src/log.o src/task.o \
        src/time.o src/fd.o src/pipe.o src/regex.o src/cfgparse.o src/server.o \
        src/checks.o src/queue.o src/frontend.o src/proxy.o src/proto_uxst.o \
-       src/proto_http.o src/stream_sock.o src/appsession.o src/backend.o \
+       src/proto_http.o src/sock_raw.o src/appsession.o src/backend.o \
        src/peers.o src/stream_interface.o src/dumpstats.o src/proto_tcp.o \
        src/session.o src/hdr_idx.o src/ev_select.o src/signal.o \
        src/lb_chash.o src/lb_fwlc.o src/lb_fwrr.o src/lb_map.o src/lb_fas.o \
diff --git a/Makefile.osx b/Makefile.osx
index ffd9a6136b..76da19e5d1 100644
--- a/Makefile.osx
+++ b/Makefile.osx
@@ -106,7 +106,7 @@ OBJS = src/haproxy.o src/sessionhash.o src/base64.o src/protocols.o \
        src/uri_auth.o src/standard.o src/buffers.o src/log.o src/task.o \
        src/time.o src/fd.o src/pipe.o src/regex.o src/cfgparse.o src/server.o \
        src/checks.o src/queue.o src/frontend.o src/proxy.o src/proto_uxst.o \
-       src/proto_http.o src/stream_sock.o src/appsession.o src/backend.o \
+       src/proto_http.o src/sock_raw.o src/appsession.o src/backend.o \
        src/peers.o src/stream_interface.o src/dumpstats.o src/proto_tcp.o \
        src/session.o src/hdr_idx.o src/ev_select.o src/signal.o \
        src/lb_chash.o src/lb_fwlc.o src/lb_fwrr.o src/lb_map.o src/lb_fas.o \
diff --git a/include/proto/stream_sock.h b/include/proto/sock_raw.h
similarity index 97%
rename from include/proto/stream_sock.h
rename to include/proto/sock_raw.h
index c93e483a30..7a618872f5 100644
--- a/include/proto/stream_sock.h
+++ b/include/proto/sock_raw.h
@@ -1,6 +1,6 @@
 /*
- * include/proto/stream_sock.h
- * This file contains client-side definitions.
+ * include/proto/sock_raw.h
+ * This file contains definition for raw stream socket operations
  *
  * Copyright (C) 2000-2010 Willy Tarreau - w@1wt.eu
  *
diff --git a/src/backend.c b/src/backend.c
index 7c1c92d682..95b395324d 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -42,8 +42,8 @@
 #include <proto/queue.h>
 #include <proto/server.h>
 #include <proto/session.h>
+#include <proto/sock_raw.h>
 #include <proto/stream_interface.h>
-#include <proto/stream_sock.h>
 #include <proto/task.h>
 
 /*
diff --git a/src/dumpstats.c b/src/dumpstats.c
index e22ca1ff25..832534e846 100644
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -52,8 +52,8 @@
 #include <proto/proxy.h>
 #include <proto/session.h>
 #include <proto/server.h>
+#include <proto/sock_raw.h>
 #include <proto/stream_interface.h>
-#include <proto/stream_sock.h>
 #include <proto/task.h>
 
 static int stats_dump_raw_to_buffer(struct stream_interface *si);
diff --git a/src/frontend.c b/src/frontend.c
index 6485b0747b..a72f6b8bbf 100644
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -41,8 +41,8 @@
 #include <proto/proto_http.h>
 #include <proto/proxy.h>
 #include <proto/session.h>
+#include <proto/sock_raw.h>
 #include <proto/stream_interface.h>
-#include <proto/stream_sock.h>
 #include <proto/task.h>
 
 /* Finish a session accept() for a proxy (TCP or HTTP). It returns a negative
diff --git a/src/haproxy.c b/src/haproxy.c
index 170433572c..2afbb3b1a5 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -85,7 +85,7 @@
 #include <proto/server.h>
 #include <proto/session.h>
 #include <proto/signal.h>
-#include <proto/stream_sock.h>
+#include <proto/sock_raw.h>
 #include <proto/task.h>
 
 #ifdef CONFIG_HAP_CTTPROXY
diff --git a/src/log.c b/src/log.c
index a0493dc9fd..9fa1b82858 100644
--- a/src/log.c
+++ b/src/log.c
@@ -32,8 +32,8 @@
 
 #include <proto/frontend.h>
 #include <proto/log.h>
+#include <proto/sock_raw.h>
 #include <proto/stream_interface.h>
-#include <proto/stream_sock.h>
 
 const char *log_facilities[NB_LOG_FACILITIES] = {
 	"kern", "user", "mail", "daemon",
diff --git a/src/peers.c b/src/peers.c
index 42018e13fe..a3408f5a5d 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -37,8 +37,8 @@
 #include <proto/proto_http.h>
 #include <proto/proxy.h>
 #include <proto/session.h>
+#include <proto/sock_raw.h>
 #include <proto/stream_interface.h>
-#include <proto/stream_sock.h>
 #include <proto/task.h>
 #include <proto/stick_table.h>
 #include <proto/signal.h>
diff --git a/src/proto_http.c b/src/proto_http.c
index 1fc18c36ed..4a3de8fdf2 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -59,8 +59,8 @@
 #include <proto/sample.h>
 #include <proto/server.h>
 #include <proto/session.h>
+#include <proto/sock_raw.h>
 #include <proto/stream_interface.h>
-#include <proto/stream_sock.h>
 #include <proto/task.h>
 
 const char HTTP_100[] =
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 2acdf986bf..29aa323554 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -48,8 +48,8 @@
 #include <proto/proxy.h>
 #include <proto/sample.h>
 #include <proto/session.h>
+#include <proto/sock_raw.h>
 #include <proto/stick_table.h>
-#include <proto/stream_sock.h>
 #include <proto/task.h>
 #include <proto/buffers.h>
 
diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index 1a808ead89..ace1e448f5 100644
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -39,7 +39,7 @@
 #include <proto/log.h>
 #include <proto/protocols.h>
 #include <proto/proto_uxst.h>
-#include <proto/stream_sock.h>
+#include <proto/sock_raw.h>
 #include <proto/task.h>
 
 static int uxst_bind_listener(struct listener *listener, char *errmsg, int errlen);
diff --git a/src/session.c b/src/session.c
index feb0283205..3024599287 100644
--- a/src/session.c
+++ b/src/session.c
@@ -40,9 +40,9 @@
 #include <proto/queue.h>
 #include <proto/server.h>
 #include <proto/sample.h>
+#include <proto/sock_raw.h>
 #include <proto/stick_table.h>
 #include <proto/stream_interface.h>
-#include <proto/stream_sock.h>
 #include <proto/task.h>
 
 struct pool_head *pool2_session;
diff --git a/src/stream_sock.c b/src/sock_raw.c
similarity index 99%
rename from src/stream_sock.c
rename to src/sock_raw.c
index accd4a1f37..37d6f3796a 100644
--- a/src/stream_sock.c
+++ b/src/sock_raw.c
@@ -36,7 +36,7 @@
 #include <proto/log.h>
 #include <proto/pipe.h>
 #include <proto/protocols.h>
-#include <proto/stream_sock.h>
+#include <proto/sock_raw.h>
 #include <proto/task.h>
 
 #include <types/global.h>
diff --git a/src/stream_interface.c b/src/stream_interface.c
index 543cfeea60..75a6dc9d4a 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -28,8 +28,8 @@
 
 #include <proto/buffers.h>
 #include <proto/fd.h>
+#include <proto/sock_raw.h>
 #include <proto/stream_interface.h>
-#include <proto/stream_sock.h>
 #include <proto/task.h>
 
 /* socket operations for embedded tasks */