[Nscldaq-cvscommits] SF.net SVN: nscldaq:[3131] branches/nscldaq-10.2-001-development

[<ro...@us...>]

Revision: 3131
          http://sourceforge.net/p/nscldaq/code/3131
Author:   ron-fox
Date:     2013-08-15 14:42:38 +0000 (Thu, 15 Aug 2013)
Log Message:
-----------
Wheezification

Modified Paths:
--------------
    branches/nscldaq-10.2-001-development/ChangeLog
    branches/nscldaq-10.2-001-development/base/os/os.cpp
    branches/nscldaq-10.2-001-development/configure.ac
    branches/nscldaq-10.2-001-development/daq/eventbuilder/Makefile.am
    branches/nscldaq-10.2-001-development/daq/eventbuilder/Makefile.in
    branches/nscldaq-10.2-001-development/daq/eventbuilder/OrdererPackage.cpp
    branches/nscldaq-10.2-001-development/daq/eventbuilder/fragment.h
    branches/nscldaq-10.2-001-development/daq/eventbuilder/ringsource/Makefile.am

Modified: branches/nscldaq-10.2-001-development/ChangeLog
===================================================================
--- branches/nscldaq-10.2-001-development/ChangeLog	2013-08-02 20:12:55 UTC (rev 3130)
+++ branches/nscldaq-10.2-001-development/ChangeLog	2013-08-15 14:42:38 UTC (rev 3131)
@@ -393,3 +393,8 @@
 	  among other things tries to prevent this).
 
 	
+10.2-005
+	- Added __align__((__packed__)) to fragment header which is
+	  vulnerable to padding in 64 bit or larger architectures.
+        - Fix up headers in base/os/os.cpp for crypt and getuid.
+	

Modified: branches/nscldaq-10.2-001-development/base/os/os.cpp
===================================================================
--- branches/nscldaq-10.2-001-development/base/os/os.cpp	2013-08-02 20:12:55 UTC (rev 3130)
+++ branches/nscldaq-10.2-001-development/base/os/os.cpp	2013-08-15 14:42:38 UTC (rev 3131)
@@ -17,6 +17,10 @@
 #include <pwd.h>
 #include <errno.h>
 #include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+
+
 /**
  * Get name of current user.
  * @return std::string

Modified: branches/nscldaq-10.2-001-development/configure.ac
===================================================================
--- branches/nscldaq-10.2-001-development/configure.ac	2013-08-02 20:12:55 UTC (rev 3130)
+++ branches/nscldaq-10.2-001-development/configure.ac	2013-08-15 14:42:38 UTC (rev 3131)
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.61)
 
-AC_INIT(nscldaq, 10.2-004, fo...@ns...)
+AC_INIT(nscldaq, 10.2-005, fo...@ns...)
 
 AC_CONFIG_SRCDIR([/utilities/StringsToIntegers.h])
 AC_CONFIG_HEADER([config.h])

Modified: branches/nscldaq-10.2-001-development/daq/eventbuilder/Makefile.am
===================================================================
--- branches/nscldaq-10.2-001-development/daq/eventbuilder/Makefile.am	2013-08-02 20:12:55 UTC (rev 3130)
+++ branches/nscldaq-10.2-001-development/daq/eventbuilder/Makefile.am	2013-08-15 14:42:38 UTC (rev 3131)
@@ -81,7 +81,7 @@
 TCL_TEST_FILES=tclTests.tcl cbmanagerTests.test cmanagerCallbacks.test
 
 EXTRA_DIST=protocol.xml api.xml orderer.xml frag2ring.xml Asserts.h \
-	$(TCL_PACKAGE_FILE) \
+	$(TCL_PACKAGE_FILES) \
 	$(TCL_TEST_FILES) options.ggo \
         $(TCL_EVB_PACKAGE_FILES)       \
 	$(FRAMEWORK_SOURCEFILES) \

Modified: branches/nscldaq-10.2-001-development/daq/eventbuilder/Makefile.in
===================================================================
--- branches/nscldaq-10.2-001-development/daq/eventbuilder/Makefile.in	2013-08-02 20:12:55 UTC (rev 3130)
+++ branches/nscldaq-10.2-001-development/daq/eventbuilder/Makefile.in	2013-08-15 14:42:38 UTC (rev 3131)
@@ -80,6 +80,9 @@
 libEventBuilder_la_DEPENDENCIES =  \
 	@top_builddir@/base/tclplus/libtclPlus.la \
 	@top_builddir@/base/exception/libException.la \
+	@top_builddir@/base/os/libdaqshm.la \
+	@top_builddir@/servers/portmanager/libPortManager.la \
+	@top_builddir@/base/tcpip/libTcp.la \
 	@top_builddir@/base/os/libdaqshm.la
 am_libEventBuilder_la_OBJECTS = OrdererPackage.lo \
 	CFragmentHandlerCommand.lo CFragmentHandler.lo \
@@ -117,6 +120,9 @@
 unittests_OBJECTS = $(am_unittests_OBJECTS)
 am__DEPENDENCIES_2 = @top_builddir@/base/tclplus/libtclPlus.la \
 	@top_builddir@/base/exception/libException.la \
+	@top_builddir@/base/os/libdaqshm.la \
+	@top_builddir@/servers/portmanager/libPortManager.la \
+	@top_builddir@/base/tcpip/libTcp.la \
 	@top_builddir@/base/os/libdaqshm.la
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -339,6 +345,9 @@
 libEventBuilder_la_LIBADD = @top_builddir@/base/tclplus/libtclPlus.la \
 	@top_builddir@/base/exception/libException.la \
 	@top_builddir@/base/os/libdaqshm.la    \
+	@top_builddir@/servers/portmanager/libPortManager.la \
+	@top_builddir@/base/tcpip/libTcp.la \
+	@top_builddir@/base/os/libdaqshm.la \
 	@TCL_LDFLAGS@ @THREADLD_FLAGS@
 
 TCL_PACKAGE_FILES = ConnectionManager.tcl callbackManager.tcl eventOrderer.tcl \
@@ -348,7 +357,7 @@
 TCL_EVB_PACKAGE_FILES = evbRdoCallouts.tcl
 TCL_TEST_FILES = tclTests.tcl cbmanagerTests.test cmanagerCallbacks.test
 EXTRA_DIST = protocol.xml api.xml orderer.xml frag2ring.xml Asserts.h \
-	$(TCL_PACKAGE_FILE) \
+	$(TCL_PACKAGE_FILES) \
 	$(TCL_TEST_FILES) options.ggo \
         $(TCL_EVB_PACKAGE_FILES)       \
 	$(FRAMEWORK_SOURCEFILES) \

Modified: branches/nscldaq-10.2-001-development/daq/eventbuilder/OrdererPackage.cpp
===================================================================
--- branches/nscldaq-10.2-001-development/daq/eventbuilder/OrdererPackage.cpp	2013-08-02 20:12:55 UTC (rev 3130)
+++ branches/nscldaq-10.2-001-development/daq/eventbuilder/OrdererPackage.cpp	2013-08-15 14:42:38 UTC (rev 3131)
@@ -22,6 +22,7 @@
 
 #include <tcl.h>
 #include <TCLInterpreter.h>
+#inculde <unistd.h>
 #include "CFragmentHandlerCommand.h"
 #include "CInputStatsCommand.h"
 #include "COrdererOutput.h"

Modified: branches/nscldaq-10.2-001-development/daq/eventbuilder/fragment.h
===================================================================
--- branches/nscldaq-10.2-001-development/daq/eventbuilder/fragment.h	2013-08-02 20:12:55 UTC (rev 3130)
+++ branches/nscldaq-10.2-001-development/daq/eventbuilder/fragment.h	2013-08-15 14:42:38 UTC (rev 3131)
@@ -73,7 +73,7 @@
    *  The typedef below defines a fragment header.
    */ 
   
-  typedef struct _FragmentHeader {
+  typedef struct __attribute__((__packed__)) _FragmentHeader {
     uint64_t       s_timestamp;	//< Fragment time relative to globally synchronized clock.
     uint32_t       s_sourceId ;	//< Unique source identifier.
     uint32_t       s_size;	// Bytes in fragment payload.

Modified: branches/nscldaq-10.2-001-development/daq/eventbuilder/ringsource/Makefile.am
===================================================================
--- branches/nscldaq-10.2-001-development/daq/eventbuilder/ringsource/Makefile.am	2013-08-02 20:12:55 UTC (rev 3130)
+++ branches/nscldaq-10.2-001-development/daq/eventbuilder/ringsource/Makefile.am	2013-08-15 14:42:38 UTC (rev 3131)
@@ -44,7 +44,7 @@
 	@top_builddir@/base/exception/libException.la \
 	-ldl 
 
-.PHONY: 
+.FIRST: 
 	rm -rf $(BUILT_SOURCES)
 
 clean-local:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.