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 8a96dd7a101e67192535e2c8c3c204a7c77ca63f..a6c796241f15c276de0b7fd1d9b657f787a4616f 100644 (file)
--- 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 9b0e5146a4b9e63bee304fc6b7197cd25e4d7606..369178d51590f0cd581f4d53d9495949e201af4e 100644 (file)
--- 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 ffd9a6136b9a336182d93a16e64183172c67b776..76da19e5d12c684489ff6a417cb0f5d13a7e63c5 100644 (file)
--- 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 c93e483a30226b1b782040caa1d47af39059039d..7a618872f5a857a73259fc7b08e5df31b787c8c9 100644 (file)
--- 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 7c1c92d68231ce8267a45abc168b808937185730..95b395324d3283aebd9f433dbe825289b166a56d 100644 (file)
--- 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 e22ca1ff25f553c8e6b4674fb8086e4dbb56298b..832534e846cf57919e235b22b71b21178ca5463f 100644 (file)
--- 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 6485b0747bc2dec5a173efe7e204caa6d3e139f7..a72f6b8bbf3e6b1748cad274f547c533e730f3f9 100644 (file)
--- 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 170433572ced11882635542daea76d0d765888c0..2afbb3b1a548d8e48300597af4d2a0978694e045 100644 (file)
--- 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 a0493dc9fd8fd3410f4a8bf058714183a6ef1717..9fa1b82858739dab5961242d2e6fb770d95dc004 100644 (file)
--- 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 42018e13fea7319ad774138c4bc20d6f38a3ee18..a3408f5a5da28ad5b5fdd639243a92f94bf891a8 100644 (file)
--- 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 1fc18c36edd2fe4068a33e6b6c4e15637714db05..4a3de8fdf2525b392f6b2713b30ad09dea48e29d 100644 (file)
--- 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 2acdf986bf92206a9e95742ab1583cbf4f657861..29aa32355456f18621aab4ef8acb29a18af2ecf6 100644 (file)
--- 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 1a808ead89b9685ae7e331353e8e306b6184b5af..ace1e448f53ee6154c361d8177d0d704f1bd8ec5 100644 (file)
--- 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 feb0283205e2ec12ac82fbe3201a17c2a8663e0e..30245992871c084914424f880ff43516e21535c3 100644 (file)
--- 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 accd4a1f3742678414b8218a87360d35b56efbe7..37d6f3796a76edcb0ec244f3f74a7c672be821fd 100644 (file)
--- 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 543cfeea605a17bac04efb7cdc049cd37d8f5415..75a6dc9d4a90d53d2eb750882c4c2b849ba6b827 100644 (file)
--- 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 */