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.

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 \

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 \

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 \

include/proto/sock_raw.h

@@ -1,6 +1,6 @@
 /*
- * include/proto/stream_sock.h
+ * include/proto/sock_raw.h
- * This file contains client-side definitions.
+ * This file contains definition for raw stream socket operations
  *
  * Copyright (C) 2000-2010 Willy Tarreau - w@1wt.eu
  *

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>
 
 /*

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);

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

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

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",

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>

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[] =

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>
 

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);

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;

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>

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 */