structuring of protocol - 2

* 'transports/' and 'auth/' moved to xlators/protocol/
* transport.{c,h}, authenticate.{c,h}, protocol.h moved to
    xlators/protocol/lib/src/

Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 875 (Implement a new protocol to provide proper backward/forward compatibility)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=875

37 files changed, 77 insertions, 42 deletions

diff --git a/Makefile.am b/Makefile.am
index ad69e4470..0c5fc5582 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = autogen.sh COPYING INSTALL README AUTHORS THANKS NEWS glusterfs.spec
 
-SUBDIRS = argp-standalone libglusterfs xlators transport auth glusterfsd $(FUSERMOUNT_SUBDIR) doc extras
+SUBDIRS = argp-standalone libglusterfs xlators glusterfsd $(FUSERMOUNT_SUBDIR) doc extras
 
 CLEANFILES = 
 
diff --git a/configure.ac b/configure.ac
index b94e4307a..88b8ada46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,10 +65,22 @@ AC_CONFIG_FILES([Makefile
 		xlators/debug/io-stats/Makefile
 		xlators/debug/io-stats/src/Makefile
 		xlators/protocol/Makefile
+		xlators/protocol/lib/Makefile
+		xlators/protocol/lib/src/Makefile
+		xlators/protocol/transport/Makefile
+		xlators/protocol/transport/socket/Makefile
+		xlators/protocol/transport/socket/src/Makefile
+		xlators/protocol/transport/ib-verbs/Makefile
+		xlators/protocol/transport/ib-verbs/src/Makefile
 		xlators/protocol/client/Makefile
 		xlators/protocol/client/src/Makefile
 		xlators/protocol/server/Makefile
 		xlators/protocol/server/src/Makefile
+		xlators/protocol/auth/Makefile
+		xlators/protocol/auth/addr/Makefile
+		xlators/protocol/auth/addr/src/Makefile
+		xlators/protocol/auth/login/Makefile
+		xlators/protocol/auth/login/src/Makefile
 		xlators/features/Makefile
 		xlators/features/locks/Makefile
 		xlators/features/locks/src/Makefile
@@ -81,16 +93,6 @@ AC_CONFIG_FILES([Makefile
 		xlators/encryption/Makefile
 		xlators/encryption/rot-13/Makefile
 		xlators/encryption/rot-13/src/Makefile
-		transport/Makefile
-		transport/socket/Makefile
-		transport/socket/src/Makefile
-		transport/ib-verbs/Makefile
-		transport/ib-verbs/src/Makefile
-		auth/Makefile
-		auth/addr/Makefile
-		auth/addr/src/Makefile
-		auth/login/Makefile
-		auth/login/src/Makefile
 		doc/Makefile
 		doc/examples/Makefile
 		doc/hacker-guide/Makefile
diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am
index 82c634dea..7cd1876e2 100644
--- a/libglusterfs/src/Makefile.am
+++ b/libglusterfs/src/Makefile.am
@@ -1,14 +1,14 @@
 libglusterfs_la_CFLAGS = -fPIC  -Wall -g -shared -nostartfiles $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS)
 
-libglusterfs_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D_GNU_SOURCE -DXLATORDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator\" -DSCHEDULERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/scheduler\" -DTRANSPORTDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/transport\" -D$(GF_HOST_OS) -DLIBDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/auth\" -I$(CONTRIBDIR)/rbtree
+libglusterfs_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D_GNU_SOURCE -DXLATORDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator\" -D$(GF_HOST_OS) -DLIBDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/auth\" -I$(CONTRIBDIR)/rbtree  -DSCHEDULERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/scheduler\"
 
 libglusterfs_la_LIBADD = @LEXLIB@
 
 lib_LTLIBRARIES = libglusterfs.la
 
-libglusterfs_la_SOURCES = dict.c spec.lex.c y.tab.c xlator.c logging.c  hashfn.c defaults.c scheduler.c common-utils.c transport.c timer.c inode.c call-stub.c compat.c authenticate.c fd.c compat-errno.c event.c mem-pool.c gf-dirent.c syscall.c iobuf.c globals.c statedump.c stack.c checksum.c md5.c $(CONTRIBDIR)/rbtree/rb.c rbthash.c latency.c
+libglusterfs_la_SOURCES = dict.c spec.lex.c y.tab.c xlator.c logging.c  hashfn.c defaults.c scheduler.c common-utils.c timer.c inode.c call-stub.c compat.c fd.c compat-errno.c event.c mem-pool.c gf-dirent.c syscall.c iobuf.c globals.c statedump.c stack.c checksum.c md5.c $(CONTRIBDIR)/rbtree/rb.c rbthash.c latency.c
 
-noinst_HEADERS = common-utils.h defaults.h dict.h glusterfs.h hashfn.h logging.h protocol.h scheduler.h xlator.h transport.h stack.h timer.h list.h inode.h call-stub.h compat.h authenticate.h fd.h revision.h compat-errno.h event.h mem-pool.h byte-order.h gf-dirent.h locking.h syscall.h iobuf.h globals.h statedump.h checksum.h md5.h $(CONTRIBDIR)/rbtree/rb.h rbthash.h iatt.h latency.h
+noinst_HEADERS = common-utils.h defaults.h dict.h glusterfs.h hashfn.h logging.h  scheduler.h xlator.h  stack.h timer.h list.h inode.h call-stub.h compat.h fd.h revision.h compat-errno.h event.h mem-pool.h byte-order.h gf-dirent.h locking.h syscall.h iobuf.h globals.h statedump.h checksum.h md5.h $(CONTRIBDIR)/rbtree/rb.h rbthash.h iatt.h latency.h
 
 EXTRA_DIST = spec.l spec.y
 
diff --git a/transport/ib-verbs/src/Makefile.am b/transport/ib-verbs/src/Makefile.am
deleted file mode 100644
index 1baf080f2..000000000
--- a/transport/ib-verbs/src/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-noinst_HEADERS = ib-verbs.h name.h
-
-transport_LTLIBRARIES = ib-verbs.la
-transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/transport
-
-ib_verbs_la_LDFLAGS = -module -avoidversion
-
-ib_verbs_la_SOURCES = ib-verbs.c name.c
-ib_verbs_la_LIBADD = -libverbs $(top_builddir)/libglusterfs/src/libglusterfs.la 
-
-AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
-	-I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/transport/ib-verbs \
-	-shared -nostartfiles $(GF_CFLAGS)
-
-CLEANFILES = *~
diff --git a/xlators/nfs/lib/src/rpcsvc.h b/xlators/nfs/lib/src/rpcsvc.h
index 2746288f8..6e6dc9bc9 100644
--- a/xlators/nfs/lib/src/rpcsvc.h
+++ b/xlators/nfs/lib/src/rpcsvc.h
@@ -27,7 +27,6 @@
 #endif
 
 #include "event.h"
-#include "transport.h"
 #include "logging.h"
 #include "dict.h"
 #include "mem-pool.h"
diff --git a/xlators/protocol/Makefile.am b/xlators/protocol/Makefile.am
index 745e277c2..bef0c6624 100644
--- a/xlators/protocol/Makefile.am
+++ b/xlators/protocol/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = client server
+SUBDIRS = lib transport client server auth
 
 CLEANFILES = 
diff --git a/auth/Makefile.am b/xlators/protocol/auth/Makefile.am
index 6bd54eee3..6bd54eee3 100644
--- a/auth/Makefile.am
+++ b/xlators/protocol/auth/Makefile.am
diff --git a/auth/addr/Makefile.am b/xlators/protocol/auth/addr/Makefile.am
index d471a3f92..d471a3f92 100644
--- a/auth/addr/Makefile.am
+++ b/xlators/protocol/auth/addr/Makefile.am
diff --git a/auth/addr/src/Makefile.am b/xlators/protocol/auth/addr/src/Makefile.am
index cca406151..9b053a846 100644
--- a/auth/addr/src/Makefile.am
+++ b/xlators/protocol/auth/addr/src/Makefile.am
@@ -4,9 +4,11 @@ authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth
 addr_la_LDFLAGS = -module -avoidversion
 
 addr_la_SOURCES = addr.c
-addr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la 
+addr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
+	$(top_builddir)/xlators/protocol/lib/src/libgfproto.la
 
 AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
-	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)
+	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS) \
+	-I$(top_srcdir)/xlators/protocol/lib/src
 
 CLEANFILES = 
diff --git a/auth/addr/src/addr.c b/xlators/protocol/auth/addr/src/addr.c
index a8803a39f..a8803a39f 100644
--- a/auth/addr/src/addr.c
+++ b/xlators/protocol/auth/addr/src/addr.c
diff --git a/auth/login/Makefile.am b/xlators/protocol/auth/login/Makefile.am
index d471a3f92..d471a3f92 100644
--- a/auth/login/Makefile.am
+++ b/xlators/protocol/auth/login/Makefile.am
diff --git a/auth/login/src/Makefile.am b/xlators/protocol/auth/login/src/Makefile.am
index eb7b990c2..4a50e07d3 100644
--- a/auth/login/src/Makefile.am
+++ b/xlators/protocol/auth/login/src/Makefile.am
@@ -4,10 +4,12 @@ authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth
 login_la_LDFLAGS = -module -avoidversion
 
 login_la_SOURCES = login.c
-login_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+login_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
+	$(top_builddir)/xlators/protocol/lib/src/libgfproto.la
 
 
 AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
-	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)
+	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS) \
+	-I$(top_srcdir)/xlators/protocol/lib/src
 
 CLEANFILES = 
diff --git a/auth/login/src/login.c b/xlators/protocol/auth/login/src/login.c
index 0c85292f7..0c85292f7 100644
--- a/auth/login/src/login.c
+++ b/xlators/protocol/auth/login/src/login.c
diff --git a/xlators/protocol/client/src/Makefile.am b/xlators/protocol/client/src/Makefile.am
index fb720942c..722d62e3a 100644
--- a/xlators/protocol/client/src/Makefile.am
+++ b/xlators/protocol/client/src/Makefile.am
@@ -5,12 +5,14 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
 client_la_LDFLAGS = -module -avoidversion
 
 client_la_SOURCES = client-protocol.c saved-frames.c
-client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
+	$(top_builddir)/xlators/protocol/lib/src/libgfproto.la
 
 noinst_HEADERS = client-protocol.h saved-frames.h
 
 AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \
-	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)
+	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)  \
+	-I$(top_srcdir)/xlators/protocol/lib/src
 
 CLEANFILES = 
 
diff --git a/xlators/protocol/lib/Makefile.am b/xlators/protocol/lib/Makefile.am
new file mode 100644
index 000000000..d471a3f92
--- /dev/null
+++ b/xlators/protocol/lib/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = src
+
+CLEANFILES = 
diff --git a/xlators/protocol/lib/src/Makefile.am b/xlators/protocol/lib/src/Makefile.am
new file mode 100644
index 000000000..d3d1aafe1
--- /dev/null
+++ b/xlators/protocol/lib/src/Makefile.am
@@ -0,0 +1,15 @@
+libgfproto_la_CFLAGS = -fPIC  -Wall -g -shared -nostartfiles $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS)
+
+libgfproto_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D_GNU_SOURCE  \
+	-D$(GF_HOST_OS) -DLIBDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/auth\"     \
+	-DTRANSPORTDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/transport\"          \
+	-I$(CONTRIBDIR)/rbtree -I$(top_srcdir)/libglusterfs/src/
+
+libgfproto_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+
+lib_LTLIBRARIES = libgfproto.la 
+
+
+libgfproto_la_SOURCES = transport.c authenticate.c
+
+noinst_HEADERS =  transport.h  protocol.h authenticate.h
diff --git a/libglusterfs/src/authenticate.c b/xlators/protocol/lib/src/authenticate.c
index eb0e2464c..eb0e2464c 100644
--- a/libglusterfs/src/authenticate.c
+++ b/xlators/protocol/lib/src/authenticate.c
diff --git a/libglusterfs/src/authenticate.h b/xlators/protocol/lib/src/authenticate.h
index 8931f62e6..8931f62e6 100644
--- a/libglusterfs/src/authenticate.h
+++ b/xlators/protocol/lib/src/authenticate.h
diff --git a/libglusterfs/src/protocol.h b/xlators/protocol/lib/src/protocol.h
index 6fd291bbe..6fd291bbe 100644
--- a/libglusterfs/src/protocol.h
+++ b/xlators/protocol/lib/src/protocol.h
diff --git a/libglusterfs/src/transport.c b/xlators/protocol/lib/src/transport.c
index d460d0209..d460d0209 100644
--- a/libglusterfs/src/transport.c
+++ b/xlators/protocol/lib/src/transport.c
diff --git a/libglusterfs/src/transport.h b/xlators/protocol/lib/src/transport.h
index f0623d5b4..f0623d5b4 100644
--- a/libglusterfs/src/transport.h
+++ b/xlators/protocol/lib/src/transport.h
diff --git a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/server/src/Makefile.am
index ae93912fc..faf82ee21 100644
--- a/xlators/protocol/server/src/Makefile.am
+++ b/xlators/protocol/server/src/Makefile.am
@@ -5,14 +5,15 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
 server_la_LDFLAGS = -module -avoidversion
 
 server_la_SOURCES = server-protocol.c server-resolve.c server-helpers.c
-server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
+	$(top_builddir)/xlators/protocol/lib/src/libgfproto.la
 
 noinst_HEADERS = server-protocol.h server-helpers.h
 
 AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \
 	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles \
 	-DDATADIR=\"$(localstatedir)\" -DCONFDIR=\"$(sysconfdir)/glusterfs\"  \
-	$(GF_CFLAGS)
+	$(GF_CFLAGS) -I$(top_srcdir)/xlators/protocol/lib/src
 
 CLEANFILES = 
 
diff --git a/transport/Makefile.am b/xlators/protocol/transport/Makefile.am
index e2f97437c..e2f97437c 100644
--- a/transport/Makefile.am
+++ b/xlators/protocol/transport/Makefile.am
diff --git a/transport/ib-verbs/Makefile.am b/xlators/protocol/transport/ib-verbs/Makefile.am
index f963effea..f963effea 100644
--- a/transport/ib-verbs/Makefile.am
+++ b/xlators/protocol/transport/ib-verbs/Makefile.am
diff --git a/xlators/protocol/transport/ib-verbs/src/Makefile.am b/xlators/protocol/transport/ib-verbs/src/Makefile.am
new file mode 100644
index 000000000..8f6e6a35b
--- /dev/null
+++ b/xlators/protocol/transport/ib-verbs/src/Makefile.am
@@ -0,0 +1,19 @@
+# TODO : need to change transportdir
+
+transport_LTLIBRARIES = ib-verbs.la
+transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/transport
+
+ib_verbs_la_LDFLAGS = -module -avoidversion
+
+ib_verbs_la_SOURCES = ib-verbs.c name.c
+ib_verbs_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la     \
+	-libverbs $(top_builddir)/xlators/protocol/lib/src/libgfproto.la
+
+noinst_HEADERS = ib-verbs.h name.h
+
+AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)  \
+	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)   \
+	-I$(top_srcdir)/xlators/protocol/transport/ib-verbs                    \
+	-I$(top_srcdir)/xlators/protocol/lib/src
+
+CLEANFILES = *~
diff --git a/transport/ib-verbs/src/ib-verbs-mem-types.h b/xlators/protocol/transport/ib-verbs/src/ib-verbs-mem-types.h
index bac559646..bac559646 100644
--- a/transport/ib-verbs/src/ib-verbs-mem-types.h
+++ b/xlators/protocol/transport/ib-verbs/src/ib-verbs-mem-types.h
diff --git a/transport/ib-verbs/src/ib-verbs.c b/xlators/protocol/transport/ib-verbs/src/ib-verbs.c
index a252a13d8..a252a13d8 100644
--- a/transport/ib-verbs/src/ib-verbs.c
+++ b/xlators/protocol/transport/ib-verbs/src/ib-verbs.c
diff --git a/transport/ib-verbs/src/ib-verbs.h b/xlators/protocol/transport/ib-verbs/src/ib-verbs.h
index c385b62e5..c385b62e5 100644
--- a/transport/ib-verbs/src/ib-verbs.h
+++ b/xlators/protocol/transport/ib-verbs/src/ib-verbs.h
diff --git a/transport/ib-verbs/src/name.c b/xlators/protocol/transport/ib-verbs/src/name.c
index a3e184814..a3e184814 100644
--- a/transport/ib-verbs/src/name.c
+++ b/xlators/protocol/transport/ib-verbs/src/name.c
diff --git a/transport/ib-verbs/src/name.h b/xlators/protocol/transport/ib-verbs/src/name.h
index 4f0f47711..4f0f47711 100644
--- a/transport/ib-verbs/src/name.h
+++ b/xlators/protocol/transport/ib-verbs/src/name.h
diff --git a/transport/socket/Makefile.am b/xlators/protocol/transport/socket/Makefile.am
index f963effea..f963effea 100644
--- a/transport/socket/Makefile.am
+++ b/xlators/protocol/transport/socket/Makefile.am
diff --git a/transport/socket/src/Makefile.am b/xlators/protocol/transport/socket/src/Makefile.am
index 1832587a6..f5c46f1ac 100644
--- a/transport/socket/src/Makefile.am
+++ b/xlators/protocol/transport/socket/src/Makefile.am
@@ -1,4 +1,4 @@
-noinst_HEADERS = socket.h name.h
+# TODO : change to proper transport dir
 
 transport_LTLIBRARIES = socket.la
 transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/transport
@@ -6,9 +6,14 @@ transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/transport
 socket_la_LDFLAGS = -module -avoidversion
 
 socket_la_SOURCES = socket.c name.c
-socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la 
+socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
+	$(top_builddir)/xlators/protocol/lib/src/libgfproto.la
+
+noinst_HEADERS = socket.h name.h
 
 AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
-	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)
+	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS) \
+	-I$(top_srcdir)/xlators/protocol/transport/socket/src   \
+	-I$(top_srcdir)/xlators/protocol/lib/src
 
 CLEANFILES = *~
diff --git a/transport/socket/src/name.c b/xlators/protocol/transport/socket/src/name.c
index 120a669c8..120a669c8 100644
--- a/transport/socket/src/name.c
+++ b/xlators/protocol/transport/socket/src/name.c
diff --git a/transport/socket/src/name.h b/xlators/protocol/transport/socket/src/name.h
index f50a7b7f4..f50a7b7f4 100644
--- a/transport/socket/src/name.h
+++ b/xlators/protocol/transport/socket/src/name.h
diff --git a/transport/socket/src/socket-mem-types.h b/xlators/protocol/transport/socket/src/socket-mem-types.h
index f50f4a75d..f50f4a75d 100644
--- a/transport/socket/src/socket-mem-types.h
+++ b/xlators/protocol/transport/socket/src/socket-mem-types.h
diff --git a/transport/socket/src/socket.c b/xlators/protocol/transport/socket/src/socket.c
index 7f7f8093a..7f7f8093a 100644
--- a/transport/socket/src/socket.c
+++ b/xlators/protocol/transport/socket/src/socket.c
diff --git a/transport/socket/src/socket.h b/xlators/protocol/transport/socket/src/socket.h
index bc6d3b27c..bc6d3b27c 100644
--- a/transport/socket/src/socket.h
+++ b/xlators/protocol/transport/socket/src/socket.h