[SCM] GNU gnutls branch, master, updated. gnutls_3_1_3-24-g0d19c89

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=0d19c895785ebbd68e607b92dbc80d70ca06632c

The branch, master has been updated
       via  0d19c895785ebbd68e607b92dbc80d70ca06632c (commit)
       via  4153d9d65e5be6ff6cab9d9603ff63ab13c5956a (commit)
      from  c6aa14724579c198a746d62ed60a89127f53c2cf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0d19c895785ebbd68e607b92dbc80d70ca06632c
Author: Martin Storsjo <address@hidden>
Date:   Mon Oct 29 15:44:26 2012 +0200

    examples: Build an executable of ex-serv-dtls like the other examples
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

commit 4153d9d65e5be6ff6cab9d9603ff63ab13c5956a
Author: Martin Storsjo <address@hidden>
Date:   Mon Oct 29 15:44:25 2012 +0200

    examples: Make sure the timeout parameter to select is valid
    
    This makes the example work properly on Mac OS X (tested on 10.8).
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 doc/examples/Makefile.am    |    3 ++-
 doc/examples/ex-serv-dtls.c |    6 ++++++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 6f42a1f..a42b449 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -42,6 +42,7 @@ CXX_LDADD = ../../lib/libgnutlsxx.la \
 
 noinst_PROGRAMS = ex-client-resume ex-client-dtls
 noinst_PROGRAMS += ex-cert-select ex-client-x509
+noinst_PROGRAMS += ex-serv-dtls
 
 if ENABLE_CXX
 ex_cxx_SOURCES = ex-cxx.cpp
@@ -79,4 +80,4 @@ endif
 libexamples_la_SOURCES = examples.h ex-alert.c ex-pkcs12.c \
        ex-session-info.c ex-x509-info.c ex-verify.c    \
        tcp.c udp.c ex-pkcs11-list.c verify.c ex-verify-ssh.c \
-       ex-serv-dtls.c print-ciphersuites.c
+       print-ciphersuites.c
diff --git a/doc/examples/ex-serv-dtls.c b/doc/examples/ex-serv-dtls.c
index adcc7eb..04cc26b 100644
--- a/doc/examples/ex-serv-dtls.c
+++ b/doc/examples/ex-serv-dtls.c
@@ -296,6 +296,12 @@ pull_timeout_func (gnutls_transport_ptr_t ptr, unsigned 
int ms)
   tv.tv_sec = 0;
   tv.tv_usec = ms * 1000;
 
+  while(tv.tv_usec >= 1000000)
+    {
+      tv.tv_usec -= 1000000;
+      tv.tv_sec++;
+    }
+
   ret = select (priv->fd + 1, &rfds, NULL, NULL, &tv);
 
   if (ret <= 0)


hooks/post-receive
-- 
GNU gnutls