Release libstrophe-0.12.2

Signed-off-by: Steffen Jaeckel <jaeckel-floss@eyet-services.de>

ChangeLog

@@ -1,3 +1,11 @@
+0.12.2
+	- Fix reconnect issues when Stream Management is enabled (#211)
+	- Fix resolver ... this time for real hopefully (fixup of #200) (#214)
+	- Fix clearing of password cache on resumed connection (#214)
+	- Improve detection&implementation of `va_copy` (#213)
+	- Fix Valgrind CI builds against LibreSSL (#212)
+	- Fix perf example on platforms where an `rdtsc()` equivalent isn't implemented (#212)
+
 0.12.1
 	- Fix compilation in buildroot (#207)
 	- Fixes regarding OpenSSL (#208)

configure.ac

@@ -1,6 +1,6 @@
 m4_define([v_maj], [0])
 m4_define([v_min], [12])
-m4_define([v_patch], [1])
+m4_define([v_patch], [2])
 m4_define([project_version], [v_maj.v_min.v_patch])
 
 m4_define([lt_cur], m4_eval(v_maj + v_min))
@@ -86,9 +86,42 @@ AX_VALGRIND_DFLT([helgrind], [off])
 AX_VALGRIND_DFLT([sgcheck], [off])
 AX_VALGRIND_CHECK
 
+AC_SEARCH_LIBS([clock_gettime], [rt], AC_DEFINE(HAVE_CLOCK_GETTIME,1))
 AC_SEARCH_LIBS([socket], [network socket])
 AC_CHECK_FUNCS([snprintf vsnprintf], [], [have_snprintf=no])
-AC_CHECK_DECLS([va_copy], [], [], [#include <stdarg.h>])
+
+dnl Checking for va_copy availability
+AC_MSG_CHECKING([for va_copy])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
+va_list ap1,ap2;]], [[va_copy(ap1,ap2);]])],
+have_va_copy=yes,
+have_va_copy=no)
+AC_MSG_RESULT($have_va_copy)
+if test x"$have_va_copy" = x"yes"; then
+    AC_DEFINE(HAVE_VA_COPY,1,[Whether va_copy() is available])
+else
+    AC_MSG_CHECKING([for __va_copy])
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
+    va_list ap1,ap2;]], [[__va_copy(ap1,ap2);]])],
+    have___va_copy=yes,
+    have___va_copy=no)
+    AC_MSG_RESULT($have___va_copy)
+    if test x"$have___va_copy" = x"yes"; then
+        AC_DEFINE(HAVE___VA_COPY,1,[Whether __va_copy() is available])
+    fi
+fi
+
+if test x"$have_va_copy$have___va_copy" = x"nono"; then
+    dnl Checking whether va_list is an array type
+    AC_MSG_CHECKING([whether va_list is an array type])
+    AC_TRY_COMPILE2([
+    #include <stdarg.h>
+    void a(va_list * ap) {}],[
+    va_list ap1, ap2; a(&ap1); ap2 = (va_list) ap1],[
+      AC_MSG_RESULT(no)],[
+      AC_MSG_RESULT(yes)
+      AC_DEFINE([VA_LIST_IS_ARRAY], [1],[Define if va_list is an array type])])
+fi
 
 if test "x$enable_tls" != xno -a "x$with_gnutls" == xyes; then
     PKG_CHECK_MODULES([gnutls], [gnutls],

examples/perf.c

@@ -20,16 +20,20 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <inttypes.h>
+#include <time.h>
 
 static void init_timer(void);
 static void t_start(void);
 static uint64_t t_read(void);
+static const char *perf_time_unit;
+
+#define NUM_SAMPLES 1000u
 
 static void perf_rand(xmpp_ctx_t *ctx)
 {
     xmpp_rand_t *rng = xmpp_rand_new(ctx);
 
-    uint64_t t1, t2;
+    uint64_t t1, t2, t3 = 0;
     unsigned int n;
     const size_t alloc_sz = 0x1000u;
     size_t sz;
@@ -37,12 +41,12 @@ static void perf_rand(xmpp_ctx_t *ctx)
 
     /* pre-heat */
     for (n = 1; n < 4; ++n) {
-        xmpp_rand_bytes(rng, buf, n * 10);
+        xmpp_rand_bytes(rng, buf, alloc_sz / n);
     }
 
     for (sz = 2; sz <= alloc_sz; sz <<= 1) {
         t2 = 0;
-        for (n = 0; n < 1000u; ++n) {
+        for (n = 0; n < NUM_SAMPLES; ++n) {
 
             t_start();
             t1 = t_read();
@@ -52,10 +56,15 @@ static void perf_rand(xmpp_ctx_t *ctx)
             t1 = t_read() - t1;
             t2 += t1;
         }
-        t2 /= 1000;
+        t2 /= NUM_SAMPLES;
-        fprintf(stderr,
+        fprintf(stderr, "Reading %6zu bytes from PRNG took %8" PRIu64 " %s\n",
-                "Reading %6zu bytes from PRNG took %8" PRIu64 " cycles\n", sz,
+                sz, t2, perf_time_unit);
-                t2);
+        if (t3) {
+            double d3 = (double)t3, d2 = (double)t2;
+            fprintf(stderr, "    +%.2f%%\n",
+                    (d2 - d3) / ((d2 + d3) * 0.5) * 100.);
+        }
+        t3 = t2;
     }
     free(buf);
     xmpp_rand_free(ctx, rng);
@@ -90,7 +99,7 @@ static uint64_t rdtsc(void)
     unsigned hi, lo;
     __asm__ __volatile__("rdtsc" : "=a"(lo), "=d"(hi));
     return ((uint64_t)lo) | (((uint64_t)hi) << 32);
-#elif defined(LTC_PPC32) || defined(TFM_PPC32)
+#elif defined(__POWERPC__)
     unsigned long a, b;
     __asm__ __volatile__("mftbu %1 \nmftb %0\n" : "=r"(a), "=r"(b));
     return (((uint64_t)b) << 32ULL) | ((uint64_t)a);
@@ -116,25 +125,41 @@ static uint64_t rdtsc(void)
     uint64_t CNTVCT_EL0;
     __asm__ __volatile__("mrs %0, cntvct_el0" : "=r"(CNTVCT_EL0));
     return CNTVCT_EL0;
+#elif defined HAVE_CLOCK_GETTIME
+#define USE_CLOCK_GETTIME
+    struct timespec result;
+    clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &result);
+    return result.tv_sec * 1000000000 + result.tv_nsec;
 #else
     return clock();
-#endif
+#endif /* __GNUC__ */
 
 /* Microsoft and Intel Windows compilers */
-#elif defined _M_IX86 && !defined(LTC_NO_ASM)
+#elif defined _M_IX86
     __asm rdtsc
-#elif defined _M_AMD64 && !defined(LTC_NO_ASM)
+#elif defined _M_AMD64
     return __rdtsc();
-#elif defined _M_IA64 && !defined(LTC_NO_ASM)
+#elif defined _M_IA64
 #if defined __INTEL_COMPILER
 #include <ia64intrin.h>
 #endif
     return __getReg(3116);
+#elif defined HAVE_CLOCK_GETTIME
+#define USE_CLOCK_GETTIME
+    struct timespec result;
+    clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &result);
+    return result.tv_sec * 1000000000 + result.tv_nsec;
 #else
     return clock();
 #endif
 }
 
+#if defined USE_CLOCK_GETTIME
+static const char *perf_time_unit = "ns";
+#else
+static const char *perf_time_unit = "cycles";
+#endif
+
 static void t_start(void)
 {
     timer = rdtsc();

m4/ac_try_compile2.m4

@@ -0,0 +1,28 @@
+dnl Like AC_TRY_EVAL but also errors out if the compiler generates
+dnl _any_ output. Some compilers might issue warnings which we want
+dnl to catch.
+AC_DEFUN([AC_TRY_EVAL2],
+[{ (eval echo configure:__oline__: \"[$]$1\") 1>&AS_MESSAGE_LOG_FD; dnl
+(eval [$]$1) 2>&AS_MESSAGE_LOG_FD; _out=`eval [$]$1 2>&1` && test "x$_out" = x; }])
+
+dnl Like AC_TRY_COMPILE but calls AC_TRY_EVAL2 instead of AC_TRY_EVAL
+AC_DEFUN([AC_TRY_COMPILE2],
+[cat > conftest.$ac_ext <<EOF
+[#]line __oline__ "configure"
+#include "confdefs.h"
+[$1]
+int main(void) {
+[$2]
+; return 0; }
+EOF
+if AC_TRY_EVAL2(ac_compile); then
+  ifelse([$3], , :, [rm -rf conftest*
+  $3])
+else
+  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
+  cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD
+ifelse([$4], , , [  rm -rf conftest*
+  $4
+])dnl
+fi
+rm -f conftest*])

src/auth.c

@@ -1239,10 +1239,8 @@ static int _handle_sm(xmpp_conn_t *const conn,
             }
             strophe_free(conn->ctx, queue_element_free(conn->ctx, e));
         }
-        conn->authenticated = 1;
+        strophe_debug(conn->ctx, "xmpp", "Session resumed successfully.");
-
+        _auth_success(conn);
-        /* call connection handler */
-        conn->conn_handler(conn, XMPP_CONN_CONNECT, 0, NULL, conn->userdata);
     } else if (strcmp(name, "failed") == 0) {
         name = NULL;
 

src/conn.c

@@ -79,6 +79,7 @@
 #endif
 
 static int _disconnect_cleanup(xmpp_conn_t *conn, void *userdata);
+static void _reset_sm_state_for_reconnect(xmpp_conn_t *conn);
 static char *_conn_build_stream_tag(xmpp_conn_t *conn,
                                     char **attributes,
                                     size_t attributes_len);
@@ -975,6 +976,7 @@ void conn_disconnect(xmpp_conn_t *conn)
         conn->tls = NULL;
     }
     sock_close(conn->sock);
+    _reset_sm_state_for_reconnect(conn);
 
     /* fire off connection handler */
     conn->conn_handler(conn, XMPP_CONN_DISCONNECT, conn->error,
@@ -1298,32 +1300,38 @@ xmpp_sm_state_t *xmpp_conn_get_sm_state(xmpp_conn_t *conn)
 
     ret = conn->sm_state;
     conn->sm_state = NULL;
-    if (ret->previd) {
-        strophe_free(conn->ctx, ret->previd);
-        ret->previd = NULL;
-    }
-
-    if (ret->can_resume) {
-        ret->previd = ret->id;
-        ret->id = NULL;
-
-        ret->bound_jid = conn->bound_jid;
-        conn->bound_jid = NULL;
-    } else if (ret->id) {
-        strophe_free(conn->ctx, ret->id);
-        ret->id = NULL;
-    }
-
-    ret->sm_enabled = ret->sm_support = ret->resume = 0;
-
-    if (ret->bind) {
-        xmpp_stanza_release(ret->bind);
-        ret->bind = NULL;
-    }
 
     return ret;
 }
 
+static void _reset_sm_state_for_reconnect(xmpp_conn_t *conn)
+{
+    xmpp_sm_state_t *s = conn->sm_state;
+
+    if (s->previd) {
+        strophe_free(conn->ctx, s->previd);
+        s->previd = NULL;
+    }
+
+    if (s->can_resume) {
+        s->previd = s->id;
+        s->id = NULL;
+
+        s->bound_jid = conn->bound_jid;
+        conn->bound_jid = NULL;
+    } else if (s->id) {
+        strophe_free(conn->ctx, s->id);
+        s->id = NULL;
+    }
+
+    s->sm_enabled = s->sm_support = s->resume = 0;
+
+    if (s->bind) {
+        xmpp_stanza_release(s->bind);
+        s->bind = NULL;
+    }
+}
+
 /**
  *  @param conn     a Strophe connection object
  *  @param sm_state A Stream Management state returned from a call to

src/ctx.c

@@ -50,10 +50,22 @@
 #include "resolver.h"
 #include "util.h"
 
-/* Workaround for systems without va_copy support. */
+#ifndef va_copy
-#if defined(_MSC_VER) && _MSC_VER < 1800 || \
+#ifdef HAVE_VA_COPY
-    !defined(_MSC_VER) && !defined(HAVE_DECL_VA_COPY)
+#define va_copy(dest, src) va_copy(dest, src)
-#define va_copy(d, s) (memcpy(&d, &s, sizeof(va_list)))
+#else
+#ifdef HAVE___VA_COPY
+#define va_copy(dest, src) __va_copy(dest, src)
+#else
+#ifndef VA_LIST_IS_ARRAY
+#define va_copy(dest, src) (dest) = (src)
+#else
+#include <string.h>
+#define va_copy(dest, src) \
+    memcpy((char *)(dest), (char *)(src), sizeof(va_list))
+#endif
+#endif
+#endif
 #endif
 
 /** Initialize the Strophe library.

src/resolver.c

@@ -322,7 +322,7 @@ static unsigned message_name_get(const unsigned char *buf,
                 return 0;
             pointer = (label_len & 0x3f) << 8 | buf[i++];
             /* Prevent infinite looping */
-            if (pointer == buf_offset)
+            if (pointer >= buf_offset)
                 return 0;
             if (name != NULL && name_len >= name_max && name_max > 0) {
                 /* We have filled the name buffer. Don't pass it recursively. */

tests/test_resolver.c

@@ -174,10 +174,10 @@ int main()
     xmpp_ctx_t *ctx;
     xmpp_rand_t *rand;
     resolver_srv_rr_t *srv_rr_list;
-    char *domain;
+    char *domain, *rnd_b64;
     unsigned char *buf;
     unsigned short port;
-    size_t i;
+    size_t i, slen;
     int ret;
 
     ctx = xmpp_ctx_new(NULL, NULL);
@@ -223,10 +223,18 @@ int main()
     ret = resolver_srv_lookup_buf(ctx, buf, sizeof(data2), &srv_rr_list);
     if (ret == XMPP_DOMAIN_FOUND && srv_rr_list != NULL)
         resolver_srv_free(ctx, srv_rr_list);
-    strophe_free(ctx, buf);
     xmpp_rand_free(ctx, rand);
     printf("ok\n");
 
+    printf("Broken message was:\n");
+    rnd_b64 = xmpp_base64_encode(ctx, buf, sizeof(data2));
+    slen = strlen(rnd_b64);
+    for (i = 0; i < slen; i += 64) {
+        printf("%.64s\n", &rnd_b64[i]);
+    }
+
+    strophe_free(ctx, buf);
+    strophe_free(ctx, rnd_b64);
     xmpp_ctx_free(ctx);
 
     return 0;

travis/before_script.sh

@@ -7,7 +7,7 @@ set -e
 if [ "x$LIBRESSL" = "xtrue" ]; then
     REPO_URL="https://github.com/libressl-portable/portable.git"
     AUTOGEN_CMD="./autogen.sh"
-    CONFIG_CMD="./configure --prefix=$HOME/xssl"
+    CONFIG_CMD="./configure --prefix=$HOME/xssl --disable-asm"
     MAKE_TARGET="install"
 else
     REPO_URL="https://github.com/openssl/openssl.git"