Update to GPLv3+; update copyright notices everywhere.

[userv-utils.git] / ipif / mech-timestamp.c

diff --git a/ipif/mech-timestamp.c b/ipif/mech-timestamp.c
index 93d30e66183bedb1ca17475978178ee0859fe2ce..129eee96b12ceed693409535930950ce04653cf2 100644 (file)
--- a/ipif/mech-timestamp.c
+++ b/ipif/mech-timestamp.c
@@ -1,8 +1,10 @@
 /*
  * Timestamp mechanism for udp tunnel
  *
+ * mechanism: timestamp
  * arguments: <max-skew> <max-age>
  *
+ * restrictions: none
  * encoding: prepend 4 bytes of UNIX time in network byte order
  *
  * <max-age> is maximum age in seconds we will accept a packet (or 0
@@ -11,11 +13,17 @@
  *
  */
 /*
- * Copyright (C) 2000 Ian Jackson
+ * This file is part of ipif, part of userv-utils
+ *
+ * Copyright 1996-2013 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ * Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>
+ * Copyright 1999,2003
+ *    Chancellor Masters and Scholars of the University of Cambridge
+ * Copyright 2010 Tony Finch <fanf@dotat.at>
  *
  * This is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
@@ -24,8 +32,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with userv-utils; if not, write to the Free Software
- * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with userv-utils; if not, see http://www.gnu.org/licenses/.
  */
 
 #include <stdint.h>
@@ -78,6 +85,8 @@ static const char *mdec_timestamp(struct mechdata *md, struct buffer *buf) {
   } else if (age < 0) {
     if (!md->max_skew || age >= -md->max_skew) return 0;
     sprintf(cbuf,"too much skew (%lds)",-age);
+  } else {
+    return 0;
   }
 
   if (tnow < md->next_warn) return "";