Use TR_MSG instead of encoded strings in GSS request handler interface

[trust_router.git] / common / tr_util.c

diff --git a/common/tr_util.c b/common/tr_util.c
index 06b7d8a..2ce3c82 100644 (file)
--- a/common/tr_util.c
+++ b/common/tr_util.c
@@ -35,16 +35,39 @@
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
-#include <tr_dh.h>
+#include <time.h>
+#include <trust_router/tr_dh.h>
+#include <tr_util.h>
 
 void tr_bin_to_hex(const unsigned char * bin, size_t bin_len,
                   char * hex_out, size_t hex_len)
 {
   assert(hex_len >= 2*bin_len);
   while (bin_len >0) {
-    snprintf(hex_out, hex_len, "%2x", bin[0]);
+    snprintf(hex_out, hex_len, "%.2x", bin[0]);
     bin++, hex_out += 2;
     bin_len--;
     hex_len -= 2;
   }
 }
+
+/* Returns 0 if ts1==ts2, <0 if ts1<ts2, >= if ts1>ts2.
+ * Assumes that tv_nsec <= 1e9. */
+int tr_cmp_timespec(struct timespec *ts1, struct timespec *ts2)
+{
+  if (ts1->tv_sec > ts2->tv_sec)
+    return 1;
+
+  if (ts1->tv_sec < ts2->tv_sec)
+    return -1;
+
+  /* ts1->tv_sec==ts2->tv_sec */
+
+  if (ts1->tv_nsec > ts2->tv_nsec)
+    return 1;
+
+  if (ts1->tv_nsec < ts2->tv_nsec)
+    return -1;
+
+  return 0;
+}