diff -ur xrootd-3.0.2.orig/configure.ac xrootd-3.0.2/configure.ac
--- xrootd-3.0.2.orig/configure.ac 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/configure.ac 2011-01-29 08:58:59.333934025 +0100
@@ -1121,6 +1121,7 @@
src/Makefile
src/Makefile_include
src/XrdSys/Makefile
+ src/XrdNetUtil/Makefile
src/XrdOuc/Makefile
src/XrdNet/Makefile
src/XrdSec/Makefile
@@ -1144,6 +1145,7 @@
src/XrdRootd/Makefile
src/XrdXrootd/Makefile
src/XrdFrm/Makefile
+ src/XrdFrmUtil/Makefile
src/XrdClient/Makefile
src/XrdPosix/Makefile
src/XrdPss/Makefile
diff -ur xrootd-3.0.2.orig/src/Makefile.am xrootd-3.0.2/src/Makefile.am
--- xrootd-3.0.2.orig/src/Makefile.am 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/Makefile.am 2011-01-29 08:58:59.333934025 +0100
@@ -69,6 +69,7 @@
#######################################################################
SUBDIRS = XrdSys \
+ XrdNetUtil \
XrdOuc \
XrdNet \
XrdSec \
@@ -83,9 +84,10 @@
XrdSfs \
XrdAcc \
XrdBwm \
+ XrdFrm \
XrdOss \
Xrd \
- XrdFrm \
+ XrdFrmUtil \
XrdCms \
XrdOfs \
XrdRootd \
diff -ur xrootd-3.0.2.orig/src/XrdFrm/Makefile.am xrootd-3.0.2/src/XrdFrm/Makefile.am
--- xrootd-3.0.2.orig/src/XrdFrm/Makefile.am 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrm/Makefile.am 2011-01-29 09:00:22.359811392 +0100
@@ -16,7 +16,7 @@
#
-AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(READLINE_INCDIR)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src
#############################################################################
## extra directory definitions
@@ -25,121 +25,34 @@
#############################################################################
## deliverables
-bin_PROGRAMS = frm_admin frm_purged frm_xfragent frm_xfrd
-
-xrootdfrminc_HEADERS = XrdFrmAdmin.hh \
- XrdFrmCID.hh \
- XrdFrmConfig.hh \
- XrdFrmFiles.hh \
- XrdFrmMigrate.hh \
- XrdFrmMonitor.hh \
+xrootdfrminc_HEADERS = XrdFrmCID.hh \
XrdFrmProxy.hh \
- XrdFrmPurge.hh \
XrdFrmReqAgent.hh \
- XrdFrmReqBoss.hh \
XrdFrmReqFile.hh \
XrdFrmRequest.hh \
XrdFrmTrace.hh \
- XrdFrmTSort.hh \
- XrdFrmTransfer.hh\
- XrdFrmUtils.hh \
- XrdFrmXfrAgent.hh\
- XrdFrmXfrDaemon.hh\
- XrdFrmXfrJob.hh \
- XrdFrmXfrQueue.hh
+ XrdFrmUtils.hh
lib_LTLIBRARIES = libXrdFrm.la
-# Convenience libs to use for objs common to multiple binaries in this dir
-noinst_LTLIBRARIES = libXrdFrmConv.la libXrdFrmConvAgent.la
-
#############################################################################
## Build rules
-libXrdFrmConv_la_SOURCES = XrdFrmConfig.cc
-
-libXrdFrmConvAgent_la_SOURCES = XrdFrmReqBoss.cc \
- XrdFrmTransfer.cc \
- XrdFrmXfrAgent.cc \
- XrdFrmXfrDaemon.cc \
- XrdFrmMigrate.cc \
- XrdFrmXfrQueue.cc
-
-
libXrdFrm_la_SOURCES = \
XrdFrmCID.cc \
- XrdFrmFiles.cc \
- XrdFrmMonitor.cc\
XrdFrmProxy.cc \
XrdFrmReqAgent.cc \
XrdFrmReqFile.cc \
XrdFrmTrace.cc \
- XrdFrmTSort.cc \
XrdFrmUtils.cc
libXrdFrm_la_LIBADD = \
../XrdNet/libXrdNet.la \
../XrdOuc/libXrdOuc.la \
- ../XrdSys/libXrdSys.la \
- ../XrdNet/libXrdNetUtil.la \
- ../XrdOss/libXrdOss.la \
- ../Xrd/libXrd.la $(READLINE_LIBDIR) $(READLINE_LIBS)
+ ../XrdNetUtil/libXrdNetUtil.la \
+ ../XrdSys/libXrdSys.la
libXrdFrm_la_LDFLAGS = -static
-
-
-# $(ECHO)$(LD) $(LDOP) $(OBJADMIN) $(OBJADDS) $(LIBREADLINE) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINADMIN)
-frm_admin_SOURCES = \
- XrdFrmAdminMain.cc \
- XrdFrmAdmin.cc \
- XrdFrmAdminAudit.cc \
- XrdFrmAdminFiles.cc \
- XrdFrmAdminFind.cc \
- XrdFrmAdminQuery.cc \
- XrdFrmAdminUnlink.cc
-
-
-frm_admin_LDADD = ../XrdOss/libXrdOss.la \
- libXrdFrmConv.la \
- libXrdFrm.la
-
-frm_admin_LDFLAGS = -static -export-dynamic -ldl
-
-
-# $(ECHO)$(LD) $(LDOP) $(OBJPURG) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINPURGD)
-frm_purged_SOURCES = \
- XrdFrmPurgMain.cc \
- XrdFrmPurge.cc
-
-frm_purged_LDADD = libXrdFrmConv.la \
- libXrdFrm.la \
- ../XrdOuc/libXrdOuc.la XrdFrmProxy.o
-
-frm_purged_LDFLAGS = -static -export-dynamic -ldl
-
-# Note: The build rules for xfragent and xfrd are identical. The programs
-# behave differently based on their invocation name
-
-#$(ECHO)$(LD) $(LDOP) $(OBJXFR) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINXFRD)
-frm_xfragent_SOURCES = XrdFrmXfrMain.cc
-
-frm_xfragent_LDADD = libXrdFrmConv.la \
- libXrdFrmConvAgent.la \
- libXrdFrm.la \
- ../XrdOuc/libXrdOuc.la XrdFrmProxy.o
-
-frm_xfragent_LDFLAGS = -static -export-dynamic -ldl
-
-
-frm_xfrd_SOURCES = XrdFrmXfrMain.cc
-
-frm_xfrd_LDADD = libXrdFrmConv.la \
- libXrdFrmConvAgent.la \
- libXrdFrm.la \
- ../XrdOuc/libXrdOuc.la XrdFrmProxy.o
-
-frm_xfrd_LDFLAGS = -static -export-dynamic -ldl
-
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/Makefile.am xrootd-3.0.2/src/XrdFrmUtil/Makefile.am
--- xrootd-3.0.2.orig/src/XrdFrmUtil/Makefile.am 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/Makefile.am 2011-01-29 09:00:20.995829836 +0100
@@ -19,38 +19,10 @@
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(READLINE_INCDIR)
#############################################################################
-## extra directory definitions
-xrootdfrmincdir = $(includedir)/xrootd/XrdFrm
-
-#############################################################################
## deliverables
bin_PROGRAMS = frm_admin frm_purged frm_xfragent frm_xfrd
-xrootdfrminc_HEADERS = XrdFrmAdmin.hh \
- XrdFrmCID.hh \
- XrdFrmConfig.hh \
- XrdFrmFiles.hh \
- XrdFrmMigrate.hh \
- XrdFrmMonitor.hh \
- XrdFrmProxy.hh \
- XrdFrmPurge.hh \
- XrdFrmReqAgent.hh \
- XrdFrmReqBoss.hh \
- XrdFrmReqFile.hh \
- XrdFrmRequest.hh \
- XrdFrmTrace.hh \
- XrdFrmTSort.hh \
- XrdFrmTransfer.hh\
- XrdFrmUtils.hh \
- XrdFrmXfrAgent.hh\
- XrdFrmXfrDaemon.hh\
- XrdFrmXfrJob.hh \
- XrdFrmXfrQueue.hh
-
-
-lib_LTLIBRARIES = libXrdFrm.la
-
# Convenience libs to use for objs common to multiple binaries in this dir
noinst_LTLIBRARIES = libXrdFrmConv.la libXrdFrmConvAgent.la
@@ -59,7 +31,10 @@
## Build rules
-libXrdFrmConv_la_SOURCES = XrdFrmConfig.cc
+libXrdFrmConv_la_SOURCES = XrdFrmConfig.cc \
+ XrdFrmFiles.cc \
+ XrdFrmMonitor.cc \
+ XrdFrmTSort.cc
libXrdFrmConvAgent_la_SOURCES = XrdFrmReqBoss.cc \
XrdFrmTransfer.cc \
@@ -69,29 +44,6 @@
XrdFrmXfrQueue.cc
-libXrdFrm_la_SOURCES = \
- XrdFrmCID.cc \
- XrdFrmFiles.cc \
- XrdFrmMonitor.cc\
- XrdFrmProxy.cc \
- XrdFrmReqAgent.cc \
- XrdFrmReqFile.cc \
- XrdFrmTrace.cc \
- XrdFrmTSort.cc \
- XrdFrmUtils.cc
-
-libXrdFrm_la_LIBADD = \
- ../XrdNet/libXrdNet.la \
- ../XrdOuc/libXrdOuc.la \
- ../XrdSys/libXrdSys.la \
- ../XrdNet/libXrdNetUtil.la \
- ../XrdOss/libXrdOss.la \
- ../Xrd/libXrd.la $(READLINE_LIBDIR) $(READLINE_LIBS)
-
-libXrdFrm_la_LDFLAGS = -static
-
-
-# $(ECHO)$(LD) $(LDOP) $(OBJADMIN) $(OBJADDS) $(LIBREADLINE) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINADMIN)
frm_admin_SOURCES = \
XrdFrmAdminMain.cc \
XrdFrmAdmin.cc \
@@ -101,45 +53,46 @@
XrdFrmAdminQuery.cc \
XrdFrmAdminUnlink.cc
+frm_admin_LDADD = libXrdFrmConv.la \
+ ../XrdOss/libXrdOss.la \
+ ../XrdFrm/libXrdFrm.la \
+ $(READLINE_LIBDIR) $(READLINE_LIBS)
-frm_admin_LDADD = ../XrdOss/libXrdOss.la \
- libXrdFrmConv.la \
- libXrdFrm.la
-
-frm_admin_LDFLAGS = -static -export-dynamic -ldl
+frm_admin_LDFLAGS = -static -export-dynamic
-# $(ECHO)$(LD) $(LDOP) $(OBJPURG) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINPURGD)
frm_purged_SOURCES = \
XrdFrmPurgMain.cc \
XrdFrmPurge.cc
frm_purged_LDADD = libXrdFrmConv.la \
- libXrdFrm.la \
- ../XrdOuc/libXrdOuc.la XrdFrmProxy.o
+ ../XrdOss/libXrdOss.la \
+ ../XrdFrm/libXrdFrm.la \
+ ../XrdOuc/libXrdOuc.la
-frm_purged_LDFLAGS = -static -export-dynamic -ldl
+frm_purged_LDFLAGS = -static -export-dynamic
# Note: The build rules for xfragent and xfrd are identical. The programs
# behave differently based on their invocation name
-#$(ECHO)$(LD) $(LDOP) $(OBJXFR) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINXFRD)
frm_xfragent_SOURCES = XrdFrmXfrMain.cc
-frm_xfragent_LDADD = libXrdFrmConv.la \
- libXrdFrmConvAgent.la \
- libXrdFrm.la \
- ../XrdOuc/libXrdOuc.la XrdFrmProxy.o
+frm_xfragent_LDADD = libXrdFrmConvAgent.la \
+ ../XrdOss/libXrdOss.la \
+ libXrdFrmConv.la \
+ ../XrdFrm/libXrdFrm.la \
+ ../XrdOuc/libXrdOuc.la
-frm_xfragent_LDFLAGS = -static -export-dynamic -ldl
+frm_xfragent_LDFLAGS = -static -export-dynamic
frm_xfrd_SOURCES = XrdFrmXfrMain.cc
-frm_xfrd_LDADD = libXrdFrmConv.la \
- libXrdFrmConvAgent.la \
- libXrdFrm.la \
- ../XrdOuc/libXrdOuc.la XrdFrmProxy.o
+frm_xfrd_LDADD = libXrdFrmConvAgent.la \
+ ../XrdOss/libXrdOss.la \
+ libXrdFrmConv.la \
+ ../XrdFrm/libXrdFrm.la \
+ ../XrdOuc/libXrdOuc.la
-frm_xfrd_LDFLAGS = -static -export-dynamic -ldl
+frm_xfrd_LDFLAGS = -static -export-dynamic
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminAudit.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminAudit.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminAudit.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminAudit.cc 2011-01-29 08:58:59.434932659 +0100
@@ -14,9 +14,9 @@
#include <string.h>
#include <sys/param.h>
-#include "XrdFrm/XrdFrmAdmin.hh"
-#include "XrdFrm/XrdFrmConfig.hh"
-#include "XrdFrm/XrdFrmFiles.hh"
+#include "XrdFrmUtil/XrdFrmAdmin.hh"
+#include "XrdFrmUtil/XrdFrmConfig.hh"
+#include "XrdFrmUtil/XrdFrmFiles.hh"
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdFrm/XrdFrmUtils.hh"
#include "XrdOss/XrdOssPath.hh"
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdmin.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdmin.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdmin.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdmin.cc 2011-01-29 08:58:59.436932633 +0100
@@ -21,8 +21,8 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include "XrdFrm/XrdFrmAdmin.hh"
-#include "XrdFrm/XrdFrmConfig.hh"
+#include "XrdFrmUtil/XrdFrmAdmin.hh"
+#include "XrdFrmUtil/XrdFrmConfig.hh"
#include "XrdFrm/XrdFrmProxy.hh"
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdFrm/XrdFrmUtils.hh"
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminFiles.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminFiles.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminFiles.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminFiles.cc 2011-01-29 08:58:59.465932241 +0100
@@ -22,9 +22,9 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include "XrdFrm/XrdFrmAdmin.hh"
-#include "XrdFrm/XrdFrmConfig.hh"
-#include "XrdFrm/XrdFrmFiles.hh"
+#include "XrdFrmUtil/XrdFrmAdmin.hh"
+#include "XrdFrmUtil/XrdFrmConfig.hh"
+#include "XrdFrmUtil/XrdFrmFiles.hh"
#include "XrdFrm/XrdFrmUtils.hh"
using namespace XrdFrm;
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminFind.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminFind.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminFind.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminFind.cc 2011-01-29 08:58:59.466932228 +0100
@@ -15,9 +15,9 @@
#include <strings.h>
#include <sys/param.h>
-#include "XrdFrm/XrdFrmAdmin.hh"
-#include "XrdFrm/XrdFrmConfig.hh"
-#include "XrdFrm/XrdFrmFiles.hh"
+#include "XrdFrmUtil/XrdFrmAdmin.hh"
+#include "XrdFrmUtil/XrdFrmConfig.hh"
+#include "XrdFrmUtil/XrdFrmFiles.hh"
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdOuc/XrdOucArgs.hh"
#include "XrdOuc/XrdOucNSWalk.hh"
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminMain.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminMain.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminMain.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminMain.cc 2011-01-29 08:58:59.490931903 +0100
@@ -53,8 +53,8 @@
#include <readline/history.h>
#endif
-#include "XrdFrm/XrdFrmAdmin.hh"
-#include "XrdFrm/XrdFrmConfig.hh"
+#include "XrdFrmUtil/XrdFrmAdmin.hh"
+#include "XrdFrmUtil/XrdFrmConfig.hh"
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdNet/XrdNetOpts.hh"
#include "XrdNet/XrdNetSocket.hh"
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminQuery.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminQuery.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminQuery.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminQuery.cc 2011-01-29 08:58:59.491931889 +0100
@@ -18,9 +18,9 @@
#include <sys/stat.h>
#include <sys/types.h>
-#include "XrdFrm/XrdFrmAdmin.hh"
-#include "XrdFrm/XrdFrmConfig.hh"
-#include "XrdFrm/XrdFrmFiles.hh"
+#include "XrdFrmUtil/XrdFrmAdmin.hh"
+#include "XrdFrmUtil/XrdFrmConfig.hh"
+#include "XrdFrmUtil/XrdFrmFiles.hh"
#include "XrdFrm/XrdFrmProxy.hh"
#include "XrdFrm/XrdFrmRequest.hh"
#include "XrdFrm/XrdFrmTrace.hh"
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminReloc.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminReloc.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminReloc.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminReloc.cc 2011-01-29 08:58:59.491931889 +0100
@@ -23,8 +23,8 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include "XrdFrm/XrdFrmAdmin.hh"
-#include "XrdFrm/XrdFrmConfig.hh"
+#include "XrdFrmUtil/XrdFrmAdmin.hh"
+#include "XrdFrmUtil/XrdFrmConfig.hh"
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdOss/XrdOss.hh"
#include "XrdOss/XrdOssOpaque.hh"
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminUnlink.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminUnlink.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminUnlink.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminUnlink.cc 2011-01-29 08:58:59.492931875 +0100
@@ -18,8 +18,8 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include "XrdFrm/XrdFrmAdmin.hh"
-#include "XrdFrm/XrdFrmConfig.hh"
+#include "XrdFrmUtil/XrdFrmAdmin.hh"
+#include "XrdFrmUtil/XrdFrmConfig.hh"
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdFrm/XrdFrmUtils.hh"
#include "XrdNet/XrdNetCmsNotify.hh"
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmConfig.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmConfig.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmConfig.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmConfig.cc 2011-01-29 09:14:32.637302174 +0100
@@ -24,8 +24,8 @@
#include <sys/stat.h>
#include "Xrd/XrdInfo.hh"
-#include "XrdFrm/XrdFrmConfig.hh"
-#include "XrdFrm/XrdFrmMonitor.hh"
+#include "XrdFrmUtil/XrdFrmConfig.hh"
+#include "XrdFrmUtil/XrdFrmMonitor.hh"
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdFrm/XrdFrmUtils.hh"
#include "XrdNet/XrdNetCmsNotify.hh"
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmFiles.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmFiles.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmFiles.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmFiles.cc 2011-01-29 08:58:59.493931862 +0100
@@ -19,8 +19,8 @@
#include <sys/stat.h>
#include <sys/types.h>
-#include "XrdFrm/XrdFrmConfig.hh"
-#include "XrdFrm/XrdFrmFiles.hh"
+#include "XrdFrmUtil/XrdFrmConfig.hh"
+#include "XrdFrmUtil/XrdFrmFiles.hh"
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdOuc/XrdOucTList.hh"
#include "XrdSys/XrdSysPlatform.hh"
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmMigrate.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmMigrate.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmMigrate.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmMigrate.cc 2011-01-29 08:58:59.494931849 +0100
@@ -23,13 +23,13 @@
#include "XrdOss/XrdOssPath.hh"
#include "XrdOuc/XrdOucNSWalk.hh"
#include "XrdOuc/XrdOucTList.hh"
-#include "XrdFrm/XrdFrmFiles.hh"
-#include "XrdFrm/XrdFrmConfig.hh"
-#include "XrdFrm/XrdFrmMigrate.hh"
+#include "XrdFrmUtil/XrdFrmFiles.hh"
+#include "XrdFrmUtil/XrdFrmConfig.hh"
+#include "XrdFrmUtil/XrdFrmMigrate.hh"
#include "XrdFrm/XrdFrmRequest.hh"
#include "XrdFrm/XrdFrmTrace.hh"
-#include "XrdFrm/XrdFrmTransfer.hh"
-#include "XrdFrm/XrdFrmXfrQueue.hh"
+#include "XrdFrmUtil/XrdFrmTransfer.hh"
+#include "XrdFrmUtil/XrdFrmXfrQueue.hh"
#include "XrdSys/XrdSysPthread.hh"
#include "XrdSys/XrdSysPlatform.hh"
#include "XrdSys/XrdSysTimer.hh"
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmMonitor.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmMonitor.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmMonitor.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmMonitor.cc 2011-01-29 09:14:32.629302283 +0100
@@ -20,7 +20,7 @@
#include <sys/types.h>
#include "XrdFrm/XrdFrmTrace.hh"
-#include "XrdFrm/XrdFrmMonitor.hh"
+#include "XrdFrmUtil/XrdFrmMonitor.hh"
#include "XrdNet/XrdNet.hh"
#include "XrdNet/XrdNetDNS.hh"
#include "XrdNet/XrdNetPeer.hh"
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmPurge.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmPurge.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmPurge.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmPurge.cc 2011-01-29 08:58:59.494931849 +0100
@@ -27,9 +27,9 @@
#include "XrdOuc/XrdOucProg.hh"
#include "XrdOuc/XrdOucStream.hh"
#include "XrdOuc/XrdOucUtils.hh"
-#include "XrdFrm/XrdFrmFiles.hh"
-#include "XrdFrm/XrdFrmConfig.hh"
-#include "XrdFrm/XrdFrmPurge.hh"
+#include "XrdFrmUtil/XrdFrmFiles.hh"
+#include "XrdFrmUtil/XrdFrmConfig.hh"
+#include "XrdFrmUtil/XrdFrmPurge.hh"
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdSys/XrdSysPlatform.hh"
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmPurge.hh xrootd-3.0.2/src/XrdFrmUtil/XrdFrmPurge.hh
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmPurge.hh 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmPurge.hh 2011-01-29 08:58:59.495931836 +0100
@@ -15,7 +15,7 @@
#include <time.h>
#include <sys/types.h>
-#include "XrdFrm/XrdFrmTSort.hh"
+#include "XrdFrmUtil/XrdFrmTSort.hh"
#include "XrdOss/XrdOssSpace.hh"
#include "XrdOuc/XrdOucHash.hh"
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmPurgMain.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmPurgMain.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmPurgMain.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmPurgMain.cc 2011-01-29 08:58:59.496931822 +0100
@@ -65,8 +65,8 @@
#include <stdio.h>
#include <sys/param.h>
-#include "XrdFrm/XrdFrmConfig.hh"
-#include "XrdFrm/XrdFrmPurge.hh"
+#include "XrdFrmUtil/XrdFrmConfig.hh"
+#include "XrdFrmUtil/XrdFrmPurge.hh"
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdNet/XrdNetOpts.hh"
#include "XrdNet/XrdNetSocket.hh"
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmReqBoss.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmReqBoss.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmReqBoss.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmReqBoss.cc 2011-01-29 08:58:59.496931822 +0100
@@ -22,10 +22,10 @@
#include <sys/stat.h>
#include "XrdFrm/XrdFrmCID.hh"
-#include "XrdFrm/XrdFrmReqBoss.hh"
+#include "XrdFrmUtil/XrdFrmReqBoss.hh"
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdFrm/XrdFrmUtils.hh"
-#include "XrdFrm/XrdFrmXfrQueue.hh"
+#include "XrdFrmUtil/XrdFrmXfrQueue.hh"
#include "XrdNet/XrdNetMsg.hh"
#include "XrdOuc/XrdOucUtils.hh"
#include "XrdSys/XrdSysHeaders.hh"
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmTransfer.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmTransfer.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmTransfer.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmTransfer.cc 2011-01-29 09:14:32.628302296 +0100
@@ -24,14 +24,14 @@
#include <sys/stat.h>
#include "XrdFrm/XrdFrmCID.hh"
-#include "XrdFrm/XrdFrmConfig.hh"
-#include "XrdFrm/XrdFrmMonitor.hh"
+#include "XrdFrmUtil/XrdFrmConfig.hh"
+#include "XrdFrmUtil/XrdFrmMonitor.hh"
#include "XrdFrm/XrdFrmReqFile.hh"
#include "XrdFrm/XrdFrmRequest.hh"
#include "XrdFrm/XrdFrmTrace.hh"
-#include "XrdFrm/XrdFrmTransfer.hh"
-#include "XrdFrm/XrdFrmXfrJob.hh"
-#include "XrdFrm/XrdFrmXfrQueue.hh"
+#include "XrdFrmUtil/XrdFrmTransfer.hh"
+#include "XrdFrmUtil/XrdFrmXfrJob.hh"
+#include "XrdFrmUtil/XrdFrmXfrQueue.hh"
#include "XrdNet/XrdNetCmsNotify.hh"
#include "XrdOss/XrdOss.hh"
#include "XrdOss/XrdOssLock.hh"
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmTSort.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmTSort.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmTSort.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmTSort.cc 2011-01-29 08:58:59.498931794 +0100
@@ -12,8 +12,8 @@
const char *XrdFrmTSortCVSID = "$Id$";
-#include "XrdFrm/XrdFrmFiles.hh"
-#include "XrdFrm/XrdFrmTSort.hh"
+#include "XrdFrmUtil/XrdFrmFiles.hh"
+#include "XrdFrmUtil/XrdFrmTSort.hh"
//#include "iostream.h"
/******************************************************************************/
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrAgent.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrAgent.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrAgent.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrAgent.cc 2011-01-29 08:58:59.498931794 +0100
@@ -20,11 +20,11 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include "XrdFrm/XrdFrmConfig.hh"
+#include "XrdFrmUtil/XrdFrmConfig.hh"
#include "XrdFrm/XrdFrmRequest.hh"
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdFrm/XrdFrmUtils.hh"
-#include "XrdFrm/XrdFrmXfrAgent.hh"
+#include "XrdFrmUtil/XrdFrmXfrAgent.hh"
#include "XrdOuc/XrdOucStream.hh"
#include "XrdSys/XrdSysPlatform.hh"
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrDaemon.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrDaemon.cc 2011-01-29 08:58:59.499931781 +0100
@@ -21,14 +21,14 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include "XrdFrm/XrdFrmConfig.hh"
-#include "XrdFrm/XrdFrmMigrate.hh"
+#include "XrdFrmUtil/XrdFrmConfig.hh"
+#include "XrdFrmUtil/XrdFrmMigrate.hh"
#include "XrdFrm/XrdFrmRequest.hh"
#include "XrdFrm/XrdFrmTrace.hh"
-#include "XrdFrm/XrdFrmTransfer.hh"
+#include "XrdFrmUtil/XrdFrmTransfer.hh"
#include "XrdFrm/XrdFrmUtils.hh"
-#include "XrdFrm/XrdFrmXfrAgent.hh"
-#include "XrdFrm/XrdFrmXfrDaemon.hh"
+#include "XrdFrmUtil/XrdFrmXfrAgent.hh"
+#include "XrdFrmUtil/XrdFrmXfrDaemon.hh"
#include "XrdNet/XrdNetOpts.hh"
#include "XrdNet/XrdNetSocket.hh"
#include "XrdOuc/XrdOucStream.hh"
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.hh xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrDaemon.hh
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.hh 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrDaemon.hh 2011-01-29 08:58:59.499931781 +0100
@@ -12,7 +12,7 @@
// $Id$
-#include "XrdFrm/XrdFrmReqBoss.hh"
+#include "XrdFrmUtil/XrdFrmReqBoss.hh"
class XrdFrmXfrDaemon
{
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrMain.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrMain.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrMain.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrMain.cc 2011-01-29 08:58:59.500931768 +0100
@@ -59,10 +59,10 @@
#include <stdio.h>
#include <sys/param.h>
-#include "XrdFrm/XrdFrmConfig.hh"
+#include "XrdFrmUtil/XrdFrmConfig.hh"
#include "XrdFrm/XrdFrmTrace.hh"
-#include "XrdFrm/XrdFrmXfrAgent.hh"
-#include "XrdFrm/XrdFrmXfrDaemon.hh"
+#include "XrdFrmUtil/XrdFrmXfrAgent.hh"
+#include "XrdFrmUtil/XrdFrmXfrDaemon.hh"
#include "XrdSys/XrdSysError.hh"
#include "XrdSys/XrdSysHeaders.hh"
#include "XrdSys/XrdSysLogger.hh"
diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrQueue.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrQueue.cc
--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrQueue.cc 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrQueue.cc 2011-01-29 08:58:59.500931768 +0100
@@ -22,11 +22,11 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include "XrdFrm/XrdFrmConfig.hh"
+#include "XrdFrmUtil/XrdFrmConfig.hh"
#include "XrdFrm/XrdFrmReqFile.hh"
#include "XrdFrm/XrdFrmTrace.hh"
-#include "XrdFrm/XrdFrmXfrJob.hh"
-#include "XrdFrm/XrdFrmXfrQueue.hh"
+#include "XrdFrmUtil/XrdFrmXfrJob.hh"
+#include "XrdFrmUtil/XrdFrmXfrQueue.hh"
#include "XrdNet/XrdNetMsg.hh"
#include "XrdOuc/XrdOucTList.hh"
#include "XrdSys/XrdSysError.hh"
diff -ur xrootd-3.0.2.orig/src/XrdNet/Makefile.am xrootd-3.0.2/src/XrdNet/Makefile.am
--- xrootd-3.0.2.orig/src/XrdNet/Makefile.am 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdNet/Makefile.am 2011-01-29 08:58:59.501931754 +0100
@@ -18,7 +18,7 @@
#############################################################################
## deliverables (to be built / installed)
-lib_LTLIBRARIES = libXrdNet.la libXrdNetUtil.la
+lib_LTLIBRARIES = libXrdNet.la
xrootdnetinc_HEADERS = XrdNet.hh XrdNetOpts.hh XrdNetPeer.hh \
@@ -40,15 +40,7 @@
XrdNetSocket.cc XrdNetSocket.hh \
XrdNetWork.cc XrdNetWork.hh
-libXrdNet_la_LIBADD = $(LIBSOCKET) $(LIBNSL)
-
-
-libXrdNetUtil_la_SOURCES = \
- XrdNetDNS.cc XrdNetDNS.hh
-
-libXrdNetUtil_la_LIBADD = $(LIBSOCKET) $(LIBNSL)
-
-
-#REFAC libXrdNet_la_CXXFLAGS = -prefer-pic
-#REFAC libXrdNet_la_LDFLAGS = -static
-
+libXrdNet_la_LIBADD = ../XrdOuc/libXrdOuc.la \
+ ../XrdNetUtil/libXrdNetUtil.la \
+ ../XrdSys/libXrdSys.la \
+ $(LIBSOCKET) $(LIBNSL)
diff -ur xrootd-3.0.2.orig/src/XrdNetUtil/Makefile.am xrootd-3.0.2/src/XrdNetUtil/Makefile.am
--- xrootd-3.0.2.orig/src/XrdNetUtil/Makefile.am 2011-01-26 17:44:32.000000000 +0100
+++ xrootd-3.0.2/src/XrdNetUtil/Makefile.am 2011-01-29 08:58:59.501931754 +0100
@@ -11,44 +11,13 @@
AM_CPPFLAGS = -I$(top_srcdir)/src
#############################################################################
-## extra installation directory definitions
-
-xrootdnetincdir = $(includedir)/xrootd/XrdNet
-
-#############################################################################
## deliverables (to be built / installed)
-lib_LTLIBRARIES = libXrdNet.la libXrdNetUtil.la
-
-
-xrootdnetinc_HEADERS = XrdNet.hh XrdNetOpts.hh XrdNetPeer.hh \
- XrdNetBuffer.hh XrdNetConnect.hh XrdNetDNS.hh \
- XrdNetLink.hh XrdNetSecurity.hh XrdNetSocket.hh \
- XrdNetWork.hh XrdNetCmsNotify.hh
+lib_LTLIBRARIES = libXrdNetUtil.la
#############################################################################
# Build rules
-libXrdNet_la_SOURCES = \
- XrdNet.cc XrdNet.hh XrdNetOpts.hh XrdNetPeer.hh \
- XrdNetBuffer.cc XrdNetBuffer.hh \
- XrdNetCmsNotify.cc XrdNetCmsNotify.hh \
- XrdNetConnect.cc XrdNetConnect.hh \
- XrdNetLink.cc XrdNetLink.hh \
- XrdNetMsg.cc XrdNetMsg.hh \
- XrdNetSecurity.cc XrdNetSecurity.hh \
- XrdNetSocket.cc XrdNetSocket.hh \
- XrdNetWork.cc XrdNetWork.hh
-
-libXrdNet_la_LIBADD = $(LIBSOCKET) $(LIBNSL)
-
-
-libXrdNetUtil_la_SOURCES = \
- XrdNetDNS.cc XrdNetDNS.hh
-
-libXrdNetUtil_la_LIBADD = $(LIBSOCKET) $(LIBNSL)
-
-
-#REFAC libXrdNet_la_CXXFLAGS = -prefer-pic
-#REFAC libXrdNet_la_LDFLAGS = -static
+libXrdNetUtil_la_SOURCES = XrdNetDNS.cc
+libXrdNetUtil_la_LIBADD = ../XrdSys/libXrdSys.la $(LIBSOCKET) $(LIBNSL)