From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 10 Oct 2012 02:55:48 +0000 (-0400)
Subject: [Bug 1374] Support SO_TIMESTAMPNS
X-Git-Tag: NTP_4_2_7P311~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b74b23ba1297eca9b209f77fa1e56de2fcb3bbe;p=thirdparty%2Fntp.git

[Bug 1374] Support SO_TIMESTAMPNS

bk: 5074e3b4wxE62xi-JqDCeK9-yHTeNQ
---

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 14ae72dfe..091254aa9 100644
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -3248,14 +3248,8 @@ fetch_timestamp(
 #endif	/* DEBUG_TIMING */
 			ts = nts;  /* network time stamp */
 			break;
-
-		default:
-			DPRINTF(4, ("fetch_timestamp: skipping control message 0x%x\n",
-				    cmsghdr->cmsg_type));
-		}
-		cmsghdr = CMSG_NXTHDR(msghdr, cmsghdr);
-	}
 #endif	/* HAVE_TIMESTAMP */
+
 #ifdef HAVE_TIMESTAMPNS
 		case SCM_TIMESTAMPNS:
 		{
@@ -3287,9 +3281,16 @@ fetch_timestamp(
 			break;
 		}
 #endif	/* HAVE_TIMESTAMPNS */
+
+		default:
+			DPRINTF(4, ("fetch_timestamp: skipping control message 0x%x\n",
+				    cmsghdr->cmsg_type));
+		}
+		cmsghdr = CMSG_NXTHDR(msghdr, cmsghdr);
+	}
 	return ts;
 }
-#endif	/* HAVE_TIMESTAMP */
+#endif	/* HAVE_PACKET_TIMESTAMP */
 
 
 /*