diff options
| -rw-r--r-- | configure.ac | 21 | ||||
| -rw-r--r-- | xlators/protocol/Makefile.am | 2 | ||||
| -rw-r--r-- | xlators/protocol/auth/addr/src/Makefile.am | 2 | ||||
| -rw-r--r-- | xlators/protocol/auth/addr/src/addr.c | 7 | ||||
| -rw-r--r-- | xlators/protocol/auth/login/src/Makefile.am | 2 | ||||
| -rw-r--r-- | xlators/protocol/legacy/Makefile.am | 3 | ||||
| -rw-r--r-- | xlators/protocol/legacy/client/Makefile.am (renamed from xlators/protocol/client/Makefile.am) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/client/src/Makefile.am (renamed from xlators/protocol/client/src/Makefile.am) | 4 | ||||
| -rw-r--r-- | xlators/protocol/legacy/client/src/client-mem-types.h (renamed from xlators/protocol/client/src/client-mem-types.h) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/client/src/client-protocol.c (renamed from xlators/protocol/client/src/client-protocol.c) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/client/src/client-protocol.h (renamed from xlators/protocol/client/src/client-protocol.h) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/client/src/saved-frames.c (renamed from xlators/protocol/client/src/saved-frames.c) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/client/src/saved-frames.h (renamed from xlators/protocol/client/src/saved-frames.h) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/lib/Makefile.am (renamed from xlators/protocol/server/Makefile.am) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/lib/src/Makefile.am | 14 | ||||
| -rw-r--r-- | xlators/protocol/legacy/lib/src/protocol.c (renamed from xlators/protocol/lib/src/protocol.c) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/lib/src/protocol.h (renamed from xlators/protocol/lib/src/protocol.h) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/lib/src/transport.c (renamed from xlators/protocol/lib/src/transport.c) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/lib/src/transport.h (renamed from xlators/protocol/lib/src/transport.h) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/server/Makefile.am | 3 | ||||
| -rw-r--r-- | xlators/protocol/legacy/server/src/Makefile.am (renamed from xlators/protocol/server/src/Makefile.am) | 8 | ||||
| -rw-r--r-- | xlators/protocol/legacy/server/src/server-helpers.c (renamed from xlators/protocol/server/src/server-helpers.c) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/server/src/server-helpers.h (renamed from xlators/protocol/server/src/server-helpers.h) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/server/src/server-mem-types.h (renamed from xlators/protocol/server/src/server-mem-types.h) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/server/src/server-protocol.c (renamed from xlators/protocol/server/src/server-protocol.c) | 4 | ||||
| -rw-r--r-- | xlators/protocol/legacy/server/src/server-protocol.h (renamed from xlators/protocol/server/src/server-protocol.h) | 3 | ||||
| -rw-r--r-- | xlators/protocol/legacy/server/src/server-resolve.c (renamed from xlators/protocol/server/src/server-resolve.c) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/transport/Makefile.am (renamed from xlators/protocol/transport/Makefile.am) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/transport/ib-verbs/Makefile.am (renamed from xlators/protocol/transport/ib-verbs/Makefile.am) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/transport/ib-verbs/src/Makefile.am (renamed from xlators/protocol/transport/ib-verbs/src/Makefile.am) | 6 | ||||
| -rw-r--r-- | xlators/protocol/legacy/transport/ib-verbs/src/ib-verbs-mem-types.h (renamed from xlators/protocol/transport/ib-verbs/src/ib-verbs-mem-types.h) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/transport/ib-verbs/src/ib-verbs.c (renamed from xlators/protocol/transport/ib-verbs/src/ib-verbs.c) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/transport/ib-verbs/src/ib-verbs.h (renamed from xlators/protocol/transport/ib-verbs/src/ib-verbs.h) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/transport/ib-verbs/src/name.c (renamed from xlators/protocol/transport/ib-verbs/src/name.c) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/transport/ib-verbs/src/name.h (renamed from xlators/protocol/transport/ib-verbs/src/name.h) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/transport/socket/Makefile.am (renamed from xlators/protocol/transport/socket/Makefile.am) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/transport/socket/src/Makefile.am (renamed from xlators/protocol/transport/socket/src/Makefile.am) | 6 | ||||
| -rw-r--r-- | xlators/protocol/legacy/transport/socket/src/name.c (renamed from xlators/protocol/transport/socket/src/name.c) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/transport/socket/src/name.h (renamed from xlators/protocol/transport/socket/src/name.h) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/transport/socket/src/socket-mem-types.h (renamed from xlators/protocol/transport/socket/src/socket-mem-types.h) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/transport/socket/src/socket.c (renamed from xlators/protocol/transport/socket/src/socket.c) | 0 | ||||
| -rw-r--r-- | xlators/protocol/legacy/transport/socket/src/socket.h (renamed from xlators/protocol/transport/socket/src/socket.h) | 0 | ||||
| -rw-r--r-- | xlators/protocol/lib/src/Makefile.am | 15 | ||||
| -rw-r--r-- | xlators/protocol/lib/src/authenticate.c | 5 | ||||
| -rw-r--r-- | xlators/protocol/lib/src/authenticate.h | 1 |
45 files changed, 70 insertions, 36 deletions
diff --git a/configure.ac b/configure.ac index 9c1c32a01b0..6ef8188a621 100644 --- a/configure.ac +++ b/configure.ac @@ -67,15 +67,18 @@ AC_CONFIG_FILES([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/legacy/Makefile + xlators/protocol/legacy/lib/Makefile + xlators/protocol/legacy/lib/src/Makefile + xlators/protocol/legacy/transport/Makefile + xlators/protocol/legacy/transport/socket/Makefile + xlators/protocol/legacy/transport/socket/src/Makefile + xlators/protocol/legacy/transport/ib-verbs/Makefile + xlators/protocol/legacy/transport/ib-verbs/src/Makefile + xlators/protocol/legacy/client/Makefile + xlators/protocol/legacy/client/src/Makefile + xlators/protocol/legacy/server/Makefile + xlators/protocol/legacy/server/src/Makefile xlators/protocol/auth/Makefile xlators/protocol/auth/addr/Makefile xlators/protocol/auth/addr/src/Makefile diff --git a/xlators/protocol/Makefile.am b/xlators/protocol/Makefile.am index bef0c662426..0e1eca0c8e2 100644 --- a/xlators/protocol/Makefile.am +++ b/xlators/protocol/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = lib transport client server auth +SUBDIRS = lib auth legacy CLEANFILES = diff --git a/xlators/protocol/auth/addr/src/Makefile.am b/xlators/protocol/auth/addr/src/Makefile.am index 9b053a84683..2c94c94e4fb 100644 --- a/xlators/protocol/auth/addr/src/Makefile.am +++ b/xlators/protocol/auth/addr/src/Makefile.am @@ -5,7 +5,7 @@ addr_la_LDFLAGS = -module -avoidversion addr_la_SOURCES = addr.c addr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ - $(top_builddir)/xlators/protocol/lib/src/libgfproto.la + $(top_builddir)/xlators/protocol/lib/src/libgfproto1.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) \ diff --git a/xlators/protocol/auth/addr/src/addr.c b/xlators/protocol/auth/addr/src/addr.c index a8803a39fe2..729233fa182 100644 --- a/xlators/protocol/auth/addr/src/addr.c +++ b/xlators/protocol/auth/addr/src/addr.c @@ -36,6 +36,13 @@ #define AF_INET_SDP 27 #endif +/* TODO: duplicate declaration */ +typedef struct peer_info { + struct sockaddr_storage sockaddr; + socklen_t sockaddr_len; + char identifier[UNIX_PATH_MAX]; +}peer_info_t; + auth_result_t gf_auth (dict_t *input_params, dict_t *config_params) { diff --git a/xlators/protocol/auth/login/src/Makefile.am b/xlators/protocol/auth/login/src/Makefile.am index 4a50e07d309..ef99a965be6 100644 --- a/xlators/protocol/auth/login/src/Makefile.am +++ b/xlators/protocol/auth/login/src/Makefile.am @@ -5,7 +5,7 @@ login_la_LDFLAGS = -module -avoidversion login_la_SOURCES = login.c login_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ - $(top_builddir)/xlators/protocol/lib/src/libgfproto.la + $(top_builddir)/xlators/protocol/lib/src/libgfproto1.la AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ diff --git a/xlators/protocol/legacy/Makefile.am b/xlators/protocol/legacy/Makefile.am new file mode 100644 index 00000000000..9914863021c --- /dev/null +++ b/xlators/protocol/legacy/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = lib transport client server + +CLEANFILES = diff --git a/xlators/protocol/client/Makefile.am b/xlators/protocol/legacy/client/Makefile.am index d471a3f9243..d471a3f9243 100644 --- a/xlators/protocol/client/Makefile.am +++ b/xlators/protocol/legacy/client/Makefile.am diff --git a/xlators/protocol/client/src/Makefile.am b/xlators/protocol/legacy/client/src/Makefile.am index e3c6385c004..da00a5182b5 100644 --- a/xlators/protocol/client/src/Makefile.am +++ b/xlators/protocol/legacy/client/src/Makefile.am @@ -6,13 +6,13 @@ client_la_LDFLAGS = -module -avoidversion client_la_SOURCES = client-protocol.c saved-frames.c client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ - $(top_builddir)/xlators/protocol/lib/src/libgfproto.la + $(top_builddir)/xlators/protocol/legacy/lib/src/libgfproto.la noinst_HEADERS = client-protocol.h saved-frames.h client-mem-types.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/lib/src + -I$(top_srcdir)/xlators/protocol/legacy/lib/src CLEANFILES = diff --git a/xlators/protocol/client/src/client-mem-types.h b/xlators/protocol/legacy/client/src/client-mem-types.h index 1eee8d93159..1eee8d93159 100644 --- a/xlators/protocol/client/src/client-mem-types.h +++ b/xlators/protocol/legacy/client/src/client-mem-types.h diff --git a/xlators/protocol/client/src/client-protocol.c b/xlators/protocol/legacy/client/src/client-protocol.c index 50030f8cf78..50030f8cf78 100644 --- a/xlators/protocol/client/src/client-protocol.c +++ b/xlators/protocol/legacy/client/src/client-protocol.c diff --git a/xlators/protocol/client/src/client-protocol.h b/xlators/protocol/legacy/client/src/client-protocol.h index ae65fb5fe72..ae65fb5fe72 100644 --- a/xlators/protocol/client/src/client-protocol.h +++ b/xlators/protocol/legacy/client/src/client-protocol.h diff --git a/xlators/protocol/client/src/saved-frames.c b/xlators/protocol/legacy/client/src/saved-frames.c index 770de19ad72..770de19ad72 100644 --- a/xlators/protocol/client/src/saved-frames.c +++ b/xlators/protocol/legacy/client/src/saved-frames.c diff --git a/xlators/protocol/client/src/saved-frames.h b/xlators/protocol/legacy/client/src/saved-frames.h index 5c18abbcc9e..5c18abbcc9e 100644 --- a/xlators/protocol/client/src/saved-frames.h +++ b/xlators/protocol/legacy/client/src/saved-frames.h diff --git a/xlators/protocol/server/Makefile.am b/xlators/protocol/legacy/lib/Makefile.am index d471a3f9243..d471a3f9243 100644 --- a/xlators/protocol/server/Makefile.am +++ b/xlators/protocol/legacy/lib/Makefile.am diff --git a/xlators/protocol/legacy/lib/src/Makefile.am b/xlators/protocol/legacy/lib/src/Makefile.am new file mode 100644 index 00000000000..1f0e93e3047 --- /dev/null +++ b/xlators/protocol/legacy/lib/src/Makefile.am @@ -0,0 +1,14 @@ +lib_LTLIBRARIES = libgfproto.la + +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 + +libgfproto_la_SOURCES = transport.c protocol.c + +noinst_HEADERS = transport.h protocol.h diff --git a/xlators/protocol/lib/src/protocol.c b/xlators/protocol/legacy/lib/src/protocol.c index 63950f43dec..63950f43dec 100644 --- a/xlators/protocol/lib/src/protocol.c +++ b/xlators/protocol/legacy/lib/src/protocol.c diff --git a/xlators/protocol/lib/src/protocol.h b/xlators/protocol/legacy/lib/src/protocol.h index 254e36e661b..254e36e661b 100644 --- a/xlators/protocol/lib/src/protocol.h +++ b/xlators/protocol/legacy/lib/src/protocol.h diff --git a/xlators/protocol/lib/src/transport.c b/xlators/protocol/legacy/lib/src/transport.c index d460d02096e..d460d02096e 100644 --- a/xlators/protocol/lib/src/transport.c +++ b/xlators/protocol/legacy/lib/src/transport.c diff --git a/xlators/protocol/lib/src/transport.h b/xlators/protocol/legacy/lib/src/transport.h index f0623d5b417..f0623d5b417 100644 --- a/xlators/protocol/lib/src/transport.h +++ b/xlators/protocol/legacy/lib/src/transport.h diff --git a/xlators/protocol/legacy/server/Makefile.am b/xlators/protocol/legacy/server/Makefile.am new file mode 100644 index 00000000000..d471a3f9243 --- /dev/null +++ b/xlators/protocol/legacy/server/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = src + +CLEANFILES = diff --git a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/legacy/server/src/Makefile.am index ebe06eacf5c..87d3042c534 100644 --- a/xlators/protocol/server/src/Makefile.am +++ b/xlators/protocol/legacy/server/src/Makefile.am @@ -5,8 +5,9 @@ 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 \ - $(top_builddir)/xlators/protocol/lib/src/libgfproto.la +server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ + $(top_builddir)/xlators/protocol/legacy/lib/src/libgfproto.la \ + $(top_builddir)/xlators/protocol/lib/src/libgfproto1.la noinst_HEADERS = server-protocol.h server-helpers.h server-mem-types.h @@ -14,7 +15,8 @@ AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \ -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles \ -I$(top_srcdir)/contrib/md5/ \ -DDATADIR=\"$(localstatedir)\" -DCONFDIR=\"$(sysconfdir)/glusterfs\" \ - $(GF_CFLAGS) -I$(top_srcdir)/xlators/protocol/lib/src + $(GF_CFLAGS) -I$(top_srcdir)/xlators/protocol/legacy/lib/src \ + -I$(top_srcdir)/xlators/protocol/lib/src CLEANFILES = diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/legacy/server/src/server-helpers.c index d07e841f287..d07e841f287 100644 --- a/xlators/protocol/server/src/server-helpers.c +++ b/xlators/protocol/legacy/server/src/server-helpers.c diff --git a/xlators/protocol/server/src/server-helpers.h b/xlators/protocol/legacy/server/src/server-helpers.h index cbf57ae44d1..cbf57ae44d1 100644 --- a/xlators/protocol/server/src/server-helpers.h +++ b/xlators/protocol/legacy/server/src/server-helpers.h diff --git a/xlators/protocol/server/src/server-mem-types.h b/xlators/protocol/legacy/server/src/server-mem-types.h index 86877d79dac..86877d79dac 100644 --- a/xlators/protocol/server/src/server-mem-types.h +++ b/xlators/protocol/legacy/server/src/server-mem-types.h diff --git a/xlators/protocol/server/src/server-protocol.c b/xlators/protocol/legacy/server/src/server-protocol.c index 31f3e7aca3c..de7d2ac0b5a 100644 --- a/xlators/protocol/server/src/server-protocol.c +++ b/xlators/protocol/legacy/server/src/server-protocol.c @@ -5479,6 +5479,10 @@ mop_setvolume (call_frame_t *frame, xlator_t *bound_xl, if (ret < 0) gf_log (trans->xl->name, GF_LOG_DEBUG, "failed to set peer-info"); + ret = dict_set_str (params, "peer-info-name", peerinfo->identifier); + if (ret < 0) + gf_log (trans->xl->name, GF_LOG_DEBUG, + "failed to set peer-info-name"); if (conf->auth_modules == NULL) { gf_log (trans->xl->name, GF_LOG_ERROR, diff --git a/xlators/protocol/server/src/server-protocol.h b/xlators/protocol/legacy/server/src/server-protocol.h index 3d432614c27..0c21000596f 100644 --- a/xlators/protocol/server/src/server-protocol.h +++ b/xlators/protocol/legacy/server/src/server-protocol.h @@ -31,10 +31,11 @@ #include "xlator.h" #include "logging.h" #include "call-stub.h" -#include "authenticate.h" #include "fd.h" #include "byte-order.h" #include "server-mem-types.h" +#include "authenticate.h" +#include "transport.h" #define DEFAULT_BLOCK_SIZE 4194304 /* 4MB */ #define DEFAULT_VOLUME_FILE_PATH CONFDIR "/glusterfs.vol" diff --git a/xlators/protocol/server/src/server-resolve.c b/xlators/protocol/legacy/server/src/server-resolve.c index f0da94384eb..f0da94384eb 100644 --- a/xlators/protocol/server/src/server-resolve.c +++ b/xlators/protocol/legacy/server/src/server-resolve.c diff --git a/xlators/protocol/transport/Makefile.am b/xlators/protocol/legacy/transport/Makefile.am index e2f97437c12..e2f97437c12 100644 --- a/xlators/protocol/transport/Makefile.am +++ b/xlators/protocol/legacy/transport/Makefile.am diff --git a/xlators/protocol/transport/ib-verbs/Makefile.am b/xlators/protocol/legacy/transport/ib-verbs/Makefile.am index f963effea22..f963effea22 100644 --- a/xlators/protocol/transport/ib-verbs/Makefile.am +++ b/xlators/protocol/legacy/transport/ib-verbs/Makefile.am diff --git a/xlators/protocol/transport/ib-verbs/src/Makefile.am b/xlators/protocol/legacy/transport/ib-verbs/src/Makefile.am index 63f7fabb81e..3db7aff9871 100644 --- a/xlators/protocol/transport/ib-verbs/src/Makefile.am +++ b/xlators/protocol/legacy/transport/ib-verbs/src/Makefile.am @@ -7,13 +7,13 @@ 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 + -libverbs $(top_builddir)/xlators/protocol/legacy/lib/src/libgfproto.la noinst_HEADERS = ib-verbs.h name.h ib-verbs-mem-types.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 + -I$(top_srcdir)/xlators/protocol/legacy/transport/ib-verbs \ + -I$(top_srcdir)/xlators/protocol/legacy/lib/src CLEANFILES = *~ diff --git a/xlators/protocol/transport/ib-verbs/src/ib-verbs-mem-types.h b/xlators/protocol/legacy/transport/ib-verbs/src/ib-verbs-mem-types.h index bac559646fc..bac559646fc 100644 --- a/xlators/protocol/transport/ib-verbs/src/ib-verbs-mem-types.h +++ b/xlators/protocol/legacy/transport/ib-verbs/src/ib-verbs-mem-types.h diff --git a/xlators/protocol/transport/ib-verbs/src/ib-verbs.c b/xlators/protocol/legacy/transport/ib-verbs/src/ib-verbs.c index c14be17e6e8..c14be17e6e8 100644 --- a/xlators/protocol/transport/ib-verbs/src/ib-verbs.c +++ b/xlators/protocol/legacy/transport/ib-verbs/src/ib-verbs.c diff --git a/xlators/protocol/transport/ib-verbs/src/ib-verbs.h b/xlators/protocol/legacy/transport/ib-verbs/src/ib-verbs.h index c385b62e5cb..c385b62e5cb 100644 --- a/xlators/protocol/transport/ib-verbs/src/ib-verbs.h +++ b/xlators/protocol/legacy/transport/ib-verbs/src/ib-verbs.h diff --git a/xlators/protocol/transport/ib-verbs/src/name.c b/xlators/protocol/legacy/transport/ib-verbs/src/name.c index a3e18481458..a3e18481458 100644 --- a/xlators/protocol/transport/ib-verbs/src/name.c +++ b/xlators/protocol/legacy/transport/ib-verbs/src/name.c diff --git a/xlators/protocol/transport/ib-verbs/src/name.h b/xlators/protocol/legacy/transport/ib-verbs/src/name.h index 4f0f47711d2..4f0f47711d2 100644 --- a/xlators/protocol/transport/ib-verbs/src/name.h +++ b/xlators/protocol/legacy/transport/ib-verbs/src/name.h diff --git a/xlators/protocol/transport/socket/Makefile.am b/xlators/protocol/legacy/transport/socket/Makefile.am index f963effea22..f963effea22 100644 --- a/xlators/protocol/transport/socket/Makefile.am +++ b/xlators/protocol/legacy/transport/socket/Makefile.am diff --git a/xlators/protocol/transport/socket/src/Makefile.am b/xlators/protocol/legacy/transport/socket/src/Makefile.am index 9788c7a2c82..5952e18e97b 100644 --- a/xlators/protocol/transport/socket/src/Makefile.am +++ b/xlators/protocol/legacy/transport/socket/src/Makefile.am @@ -7,13 +7,13 @@ socket_la_LDFLAGS = -module -avoidversion socket_la_SOURCES = socket.c name.c socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ - $(top_builddir)/xlators/protocol/lib/src/libgfproto.la + $(top_builddir)/xlators/protocol/legacy/lib/src/libgfproto.la noinst_HEADERS = socket.h name.h socket-mem-types.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/socket/src \ - -I$(top_srcdir)/xlators/protocol/lib/src + -I$(top_srcdir)/xlators/protocol/legacy/transport/socket/src \ + -I$(top_srcdir)/xlators/protocol/legacy/lib/src CLEANFILES = *~ diff --git a/xlators/protocol/transport/socket/src/name.c b/xlators/protocol/legacy/transport/socket/src/name.c index 74abe4480a2..74abe4480a2 100644 --- a/xlators/protocol/transport/socket/src/name.c +++ b/xlators/protocol/legacy/transport/socket/src/name.c diff --git a/xlators/protocol/transport/socket/src/name.h b/xlators/protocol/legacy/transport/socket/src/name.h index f50a7b7f4dd..f50a7b7f4dd 100644 --- a/xlators/protocol/transport/socket/src/name.h +++ b/xlators/protocol/legacy/transport/socket/src/name.h diff --git a/xlators/protocol/transport/socket/src/socket-mem-types.h b/xlators/protocol/legacy/transport/socket/src/socket-mem-types.h index f50f4a75de8..f50f4a75de8 100644 --- a/xlators/protocol/transport/socket/src/socket-mem-types.h +++ b/xlators/protocol/legacy/transport/socket/src/socket-mem-types.h diff --git a/xlators/protocol/transport/socket/src/socket.c b/xlators/protocol/legacy/transport/socket/src/socket.c index fd3815d83fe..fd3815d83fe 100644 --- a/xlators/protocol/transport/socket/src/socket.c +++ b/xlators/protocol/legacy/transport/socket/src/socket.c diff --git a/xlators/protocol/transport/socket/src/socket.h b/xlators/protocol/legacy/transport/socket/src/socket.h index e02801a5b1c..e02801a5b1c 100644 --- a/xlators/protocol/transport/socket/src/socket.h +++ b/xlators/protocol/legacy/transport/socket/src/socket.h diff --git a/xlators/protocol/lib/src/Makefile.am b/xlators/protocol/lib/src/Makefile.am index 53131f6d041..6e0b5c4e0c4 100644 --- a/xlators/protocol/lib/src/Makefile.am +++ b/xlators/protocol/lib/src/Makefile.am @@ -1,15 +1,14 @@ -libgfproto_la_CFLAGS = -fPIC -Wall -g -shared -nostartfiles $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) +lib_LTLIBRARIES = libgfproto1.la -libgfproto_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D_GNU_SOURCE \ +libgfproto1_la_CFLAGS = -fPIC -Wall -g -shared -nostartfiles $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) + +libgfproto1_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 - +libgfproto1_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -libgfproto_la_SOURCES = transport.c authenticate.c protocol.c +libgfproto1_la_SOURCES = authenticate.c -noinst_HEADERS = transport.h protocol.h authenticate.h +noinst_HEADERS = authenticate.h diff --git a/xlators/protocol/lib/src/authenticate.c b/xlators/protocol/lib/src/authenticate.c index eb0e2464cf6..ff2b58162b7 100644 --- a/xlators/protocol/lib/src/authenticate.c +++ b/xlators/protocol/lib/src/authenticate.c @@ -223,12 +223,11 @@ gf_authenticate (dict_t *input_params, dict_foreach (results, reduce, &result); if (AUTH_DONT_CARE == result) { - data_t *peerinfo_data = dict_get (input_params, "peer-info"); + data_t *peerinfo_data = dict_get (input_params, "peer-info-name"); char *name = NULL; if (peerinfo_data) { - peer_info_t *peerinfo = data_to_ptr (peerinfo_data); - name = peerinfo->identifier; + name = peerinfo_data->data; } gf_log ("auth", GF_LOG_ERROR, diff --git a/xlators/protocol/lib/src/authenticate.h b/xlators/protocol/lib/src/authenticate.h index 8931f62e686..e777146524c 100644 --- a/xlators/protocol/lib/src/authenticate.h +++ b/xlators/protocol/lib/src/authenticate.h @@ -34,7 +34,6 @@ #include "dict.h" #include "compat.h" #include "list.h" -#include "transport.h" #include "xlator.h" typedef enum { |