Added 2.3.1-rc2 tag

COPYRIGHT

@@ -1,7 +1,8 @@
 /*-
- * Copyright (c) 2013	   Harlan Stenn,
+ * Copyright (c) 2013-2014 Harlan Stenn,
  *                         George N. Neville-Neil,
- *                         Wojciech Owczarek
+ *                         Wojciech Owczarek,
+ *                         Jan Breuer.
  * Copyright (c) 2011-2012 George V. Neville-Neil,
  *                         Steven Kreuzer, 
  *                         Martin Burnicki, 

ChangeLog

@@ -1,3 +1,48 @@
+2013-09-01  Wojciech Owczarek <[email protected]>
+
+	* 2.3.1 release
+
+	* New features since 2.3.0: 
+
+	- simple failover mechanism - ptpengine:backup_interface
+	- ptpengine:max_delay_max_rejected setting to unblock ptpd
+	  rejecting all messages when max_delay set
+	- ptpengine:max_delay_stable to only use max_dely when clock
+	  is stable
+	- selectable log timestamp format (unix or datetime)
+	- ptpd now compiles and runs out of he box on NetBSD, OpenBSD, FreeBSD,
+	  OSX and Solaris and its derivatives (OpenIndiana, OmniOS etc.)
+	- major rework of the ACL code
+	- outlier filter auto-tune to improve operation in noisy environments(high PDV)
+	- added ptpengine:clock_update_timeout setting to reset slave
+	  if no clock updates for a period of time
+	- when running slave-only in unicast mode, unicast address
+	  does not have to be specified   
+
+	* Bug fixes / improvements since 2.3.0:
+
+	- ptpd now usable on systems with no adjtimex() call like OSX,
+	  OpenBSD and LynxOS ()
+	- moving standard deviation algorithm fix improving the outlier
+	  filters
+	- network code cleanup
+	- fixed bug #66 - Ethernet interfaces no longer need IP addresses
+	  to run PTP Ethernet transport
+	- fixed bug / feature request #21: timestamping initialisation on
+	  PHC kernels (like RHEL6.5 - likely fixed 100% CPU usage issue)
+	- fixed bug / feature request #22: prevent FMR from overwriting
+	   best master
+	- improved servo stability detection: servo no longer reporting
+	  stable when discarding most samples or heavily slewing
+	- ptpd will now join and leave multicast groups only when running
+	  multicast or hybrid: allows running unicast and multicast
+	  independently
+	- ptpd will now ignore unicast packets in multicast-only mode
+	  and vice versa. In hybrid mode, only unicast Delay Request /
+	  response is accepted; multicast management messages are always
+	  accepted
+	- other minor bugs fixed
+
 2013-11-22  George Neville-Neil  <[email protected]>, Wojciech Owczarek <[email protected]>
 
 	* 2.3.0 release

m4/version.m4

@@ -1,4 +1,4 @@
 m4_define([PTPD_URL],[http://ptpd.sourceforge.net])
-m4_define([RELEASE_DATE],[July, 2014])
+m4_define([RELEASE_DATE],[August, 2014])
 m4_define([VERSION_NUMBER],[2.3.1-rc2])
 

packagebuild/rpm-rh/README.RH

@@ -1,7 +1,7 @@
 ====================== Building PTPd RPMs ===================
 
 - The rpmbuild.sh included in this directory should perform
-  a full RPM build for RHEL systems (and probably CentOS + FC).
+  a full RPM build for RHEL systems (and CentOS and probably FC).
   This was used to build the RPMs starting with 2.3.0 RC2.
   The script was successfully used to build under RHEL 5.5
   and 6.2, but should build on any RHEL5+ system, CentOS,

packagebuild/rpm-rh/ptpd.spec

@@ -12,11 +12,11 @@
 Summary: Synchronises system time using the Precision Time Protocol (PTP) implementing the IEEE 1588-2008 (PTP v 2) standard
 Name: ptpd
 Version: 2.3.1
-Release: 0.99.rc2.%{distver}
+Release: 0.99.rc2%{distver}
 License: distributable
 Group: System Environment/Daemons
 Vendor: PTPd project team
-Source0: ptpd-2.3.1.rc2.tar.gz
+Source0: ptpd-2.3.1-rc2.tar.gz
 Source1: ptpd.init
 Source2: ptpd.sysconfig
 Source3: ptpd.conf
@@ -42,7 +42,7 @@ time synchronised via the PTP protocol.
 
 %prep 
 
-%setup -n ptpd-2.3.1
+%setup -n ptpd-2.3.1-rc2
 
 %build
 
@@ -150,7 +150,7 @@ fi
 
 
 %changelog
-* Thu Jul 03 2014 Wojciech Owczarek <[email protected]> 2.3.1-0.99.rc2
+* Fri Jul 25 2014 Wojciech Owczarek <[email protected]> 2.3.1-0.99.rc2
 * Thu Jun 26 2014 Wojciech Owczarek <[email protected]> 2.3.1-0.99.rc1
 * Thu Nov 21 2013 Wojciech Owczarek <[email protected]> 2.3.0-1
 - Added the PTPBASE SNMP MIB

packagebuild/rpm-rh/rpmbuild.sh

@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# ptpd RPM building script
+# (c) 2013-2014: Wojciech Owczarek, PTPd project
+
 PWD=`pwd`
 BUILDDIR=`mktemp -d $PWD/tmpbuild.XXXXXXXXX`
 SPEC=ptpd.spec

src/Makefile.am

@@ -60,6 +60,8 @@ endif
 if STATISTICS
 ptpd2_SOURCES += dep/statistics.h
 ptpd2_SOURCES += dep/statistics.c
+ptpd2_SOURCES += dep/outlierfilter.h
+ptpd2_SOURCES += dep/outlierfilter.c
 endif
 
 # NTP control

src/datatypes.h

@@ -547,6 +547,7 @@ typedef struct{
     Boolean runningMaxOutput;
     int dTmethod;
     int logdT;
+    int maxdT;
 #ifdef PTPD_STATISTICS
     int updateCount;
     int stableCount;
@@ -561,6 +562,43 @@ typedef struct{
 #endif /* PTPD_STATISTICS */
 } PIservo;
 
+
+#ifdef PTPD_STATISTICS
+	typedef struct {
+
+	    Boolean enabled;
+	    Boolean discard;
+	    Boolean autoTune;
+
+	    int capacity;
+	    double threshold;
+	    double weight;
+
+	    int minPercent;
+	    int maxPercent;
+	    double step;
+
+	    double minThreshold;
+	    double maxThreshold;
+
+	} OutlierFilterOptions;
+
+
+	typedef struct {
+
+	    DoubleMovingStdDev* rawStats;
+	    DoubleMovingMean* filteredStats;
+	    Boolean lastOutlier;
+	    double threshold;
+	    int autoTuneSamples;
+	    int autoTuneOutliers;
+	    int autoTuneScore;
+
+	} OutlierFilter;
+
+#endif /* PTPD_STATISTICS */
+
+
 /**
  * \struct PtpClock
  * \brief Main program data structure
@@ -770,12 +808,9 @@ typedef struct {
 	TimeInternal	rawDelaySM;
 	TimeInternal	rawPdelayMS;
 	TimeInternal	rawPdelaySM;
-	DoubleMovingStdDev* delayMSRawStats;
-	DoubleMovingStdDev* delaySMRawStats;
-	DoubleMovingMean* delaySMFiltered;
-	DoubleMovingMean* delayMSFiltered;
-	Boolean delayMSoutlier;
-	Boolean delaySMoutlier;
+
+	OutlierFilter 	oFilterMS;
+	OutlierFilter	oFilterSM;
 
 	Integer32 lastSyncCounter;
 
@@ -919,6 +954,7 @@ typedef struct {
 	double servoKP;
 	double servoKI;
 	int servoDtMethod;
+	double servoMaxdT;
 
 	/**
 	 *  When enabled, ptpd ensures that Sync message sequence numbers
@@ -937,18 +973,8 @@ typedef struct {
 
 #ifdef	PTPD_STATISTICS
 
-	Boolean delayMSOutlierFilterEnabled;
-	int delayMSOutlierFilterCapacity;
-	double delayMSOutlierFilterThreshold;
-	Boolean delayMSOutlierFilterDiscard;
-	double delayMSOutlierWeight;
-
-	Boolean delaySMOutlierFilterEnabled;
-	int delaySMOutlierFilterCapacity;
-	double delaySMOutlierFilterThreshold;
-	Boolean delaySMOutlierFilterDiscard;
-	double delaySMOutlierWeight;
-
+	OutlierFilterOptions oFilterMSOpts;
+	OutlierFilterOptions oFilterSMOpts;
 
 	int calibrationDelay;