Support for windows platform

.gitignore

@@ -29,11 +29,11 @@ stamp-h1
 .libs/
 libcoap*.la
 libcoap*.pc
-src/.deps/
-src/.dirstamp
-src/.libs/
-src/*.o
-src/*.lo
+src/**/.deps/
+src/**/.dirstamp
+src/**/.libs/
+src/**/*.o
+src/**/*.lo
 
 # the doc/ folder
 doc/Doxyfile
@@ -62,3 +62,7 @@ include/coap/coap.h
 tests/.deps
 tests/testdriver
 tests/*.o
+
+# ctags - Sublime plugin
+tags
+.tags*

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "ext/tinydtls"]
+	path = ext/tinydtls
+	url = https://git.eclipse.org/r/tinydtls/org.eclipse.tinydtls
+    ignore = dirty

Makefile.am

@@ -1,6 +1,6 @@
 # Makefile.am for libcoap
 #
-# Copyright (C) 2010-2015 Olaf Bergmann <[email protected]>
+# Copyright (C) 2010-2016 Olaf Bergmann <[email protected]>
 #           (C) 2015-2016 Carsten Schoenert <[email protected]>
 #
 # This file is part of the CoAP C library libcoap. Please see README and
@@ -29,7 +29,7 @@ EXTRA_DIST = \
 
 AM_CFLAGS = -I$(top_builddir)/include/coap -I$(top_srcdir)/include/coap $(WARNING_CFLAGS) -std=c99
 
-SUBDIRS = . $(DOC_DIR) tests examples
+SUBDIRS = $(subdirs) . $(DOC_DIR) tests examples
 
 ## Define a libtool archive target "libcoap-@[email protected]", with
 ## @LIBCOAP_API_VERSION@ substituted into the generated Makefile at configure
@@ -52,6 +52,8 @@ libcoap_@LIBCOAP_API_VERSION@_la_SOURCES = \
   src/async.c \
   src/block.c \
   src/coap_io.c \
+  src/coap_dtls.c \
+  src/coap_event.c \
   src/coap_time.c \
   src/debug.c \
   src/encode.c \
@@ -77,6 +79,8 @@ libcoap_include_HEADERS = \
   $(top_srcdir)/include/coap/block.h \
   $(top_builddir)/include/coap/coap.h \
   $(top_srcdir)/include/coap/coap_io.h \
+  $(top_srcdir)/include/coap/coap_dtls.h \
+  $(top_srcdir)/include/coap/coap_event.h \
   $(top_srcdir)/include/coap/coap_time.h \
   $(top_srcdir)/include/coap/debug.h \
   $(top_srcdir)/include/coap/encode.h \

coap_config.h.contiki

@@ -56,6 +56,7 @@
 
 #define HAVE_STRNLEN 1
 #define HAVE_SNPRINTF 1
+#define HAVE_STRINGS_H 1
 
 /* there is no file-oriented output */
 #define COAP_DEBUG_FD NULL
@@ -120,7 +121,7 @@ typedef void FILE;
 # endif /* UIP_CONF_BYTE_ORDER */
 #endif /* BYTE_ORDER */
 
-/* Define assert() as emtpy directive unless HAVE_ASSERT_H is given. */
+/* Define assert() as empty directive unless HAVE_ASSERT_H is given. */
 #ifndef HAVE_ASSERT_H
 # define assert(x)
 #endif

coap_config.h.windows

@@ -0,0 +1,111 @@
+#ifndef _COAP_CONFIG_H_
+#define _COAP_CONFIG_H_
+
+#if defined(_WIN32)
+
+/* Define to 1 if you have <ws2tcpip.h> header file. */
+#define HAVE_WS2TCPIP_H 1
+
+/* Define to 1 if you have <winsock2.h> header file. */
+#define HAVE_WINSOCK2_H 1
+
+/* Define to 1 if you have the <assert.h> header file. */
+#define HAVE_ASSERT_H 1
+
+/* Define to 1 if you have the `getaddrinfo' function. */
+#define HAVE_GETADDRINFO 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define to 1 if you have the `malloc' function. */
+#define HAVE_MALLOC 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memset' function. */
+#define HAVE_MEMSET 1
+
+/* Define to 1 if you have the `select' function. */
+#define HAVE_SELECT 1
+
+/* Define to 1 if you have the `socket' function. */
+#define HAVE_SOCKET 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strnlen' function. */
+#define HAVE_STRNLEN 1
+
+/* Define to 1 if you have the `strrchr' function. */
+#define HAVE_STRRCHR 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <time.h> header file. */
+#define HAVE_TIME_H 1
+
+#if defined(_MSC_VER) && (_MSC_VER < 1900) && !defined(snprintf)
+#define snprintf _snprintf
+#endif
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "[email protected]"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libcoap"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libcoap 4.1.2"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libcoap"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL "https://libcoap.net/"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "4.1.2"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* #  undef WORDS_BIGENDIAN */
+# endif
+#endif
+
+/* Define this to 1 for ancillary data on MacOS */
+/* #undef __APPLE_USE_RFC_3542 */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef ssize_t */
+
+#endif
+
+#endif /* _COAP_CONFIG_H_ */

configure.ac

@@ -276,6 +276,14 @@ if test "x$build_examples" = "xyes" -a "x$build_documentation" = "xyes"; then
 fi
 AM_CONDITIONAL(BUILD_EXAMPLES, [test "x$build_examples" = "xyes"])
 
+# __dtls__
+AC_ARG_ENABLE([dtls],
+              [AC_HELP_STRING([--enable-dtls],
+              [Enable DTLS provided by tinydtls (default=yes)])],
+              [build_dtls="$enableval"],
+              [build_dtls="yes"])
+AM_CONDITIONAL(BUILD_DTLS, [test "x$build_dtls" = "xyes"])
+
 # end configure options
 #######################
 
@@ -333,6 +341,18 @@ AC_SEARCH_LIBS([inet_ntop], [nsl])
 # Check if clock_gettime() requires librt, when available
 AC_SEARCH_LIBS([clock_gettime], [rt])
 
+# Add tinydtls to build flags if selected
+if test "x$build_dtls" = "xyes" ; then
+	if test -d "$srcdir/ext/tinydtls"; then
+	   AC_CONFIG_SUBDIRS([ext/tinydtls])
+	   AC_DEFINE(HAVE_LIBTINYDTLS, [1], [Define if the system has libtinydtls])
+           CPPFLAGS="$CPPFLAGS -I \$(top_srcdir)/ext/tinydtls"
+           LDFLAGS="$LDFLAGS -L\$(top_srcdir)/ext/tinydtls -ltinydtls"
+        else
+           build_dtls="no"
+        fi
+fi
+
 AC_MSG_CHECKING([operating system])
 
 # Set up here some extra platform depended defines and variables.
@@ -341,7 +361,7 @@ AC_MSG_CHECKING([operating system])
 case $host in
     *-linux* | *-uclinux*)
     AC_MSG_RESULT([Linux])
-    ADDITIONAL_CFLAGS="-D_GNU_SOURCE -DWITH_POSIX"
+    ADDITIONAL_CFLAGS="-D_GNU_SOURCE"
 
     # Not yet needed but if some code definitions have to depend on the platform.
     #AC_DEFINE(OS_LINUX, 1, [Linux backend])
@@ -353,12 +373,12 @@ case $host in
     # set _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED to enable XPG4v2 (POSIX 2004)
     # set __EXTENSION__ to shut up feature test macros that restrict -std=c99
     # to only C99 (and nothing newer)
-    ADDITIONAL_CFLAGS="-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=600 -D__EXTENSIONS__=1 -DWITH_POSIX"
+    ADDITIONAL_CFLAGS="-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=600 -D__EXTENSIONS__=1"
     ;;
 
     *-darwin*)
     AC_MSG_RESULT([Darwin])
-    ADDITIONAL_CFLAGS="-D_GNU_SOURCE -DWITH_POSIX"
+    ADDITIONAL_CFLAGS="-D_GNU_SOURCE"
 
     AC_DEFINE(__APPLE_USE_RFC_3542, 1, [Define this to 1 for ancillary data on MacOS])
 
@@ -369,12 +389,12 @@ case $host in
 
     *-freebsd1*)
     AC_MSG_RESULT([FreeBSD-1x])
-    ADDITIONAL_CFLAGS="-D_GNU_SOURCE -DWITH_POSIX"
+    ADDITIONAL_CFLAGS="-D_GNU_SOURCE"
     ;;
 
     *kfreebsd*)
     AC_MSG_RESULT([kFreeBSD])
-    ADDITIONAL_CFLAGS="-D_GNU_SOURCE -DWITH_POSIX"
+    ADDITIONAL_CFLAGS="-D_GNU_SOURCE"
     ;;
 
     *)
@@ -444,3 +464,8 @@ if test "x$build_examples" = "xyes"; then
 else
     AC_MSG_RESULT([      build examples          : "no"])
 fi
+if test "x$build_dtls" = "xyes"; then
+	AC_MSG_RESULT([      build with DTLS support : "yes"])
+else
+	AC_MSG_RESULT([      build with DTLS support : "no"])
+fi