Changes from Iotivity for draft-ietf-core-coap-tcp-tls and cross-platform support

Makefile.am

@@ -52,6 +52,7 @@ libcoap_@LIBCOAP_API_VERSION@_la_SOURCES = \
   src/async.c \
   src/block.c \
   src/coap_io.c \
+  src/coap_list.c \
   src/coap_time.c \
   src/debug.c \
   src/encode.c \

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
@@ -130,5 +131,14 @@ typedef void FILE;
 #include <stdio.h>
 #define coap_log(fd, ...) printf(__VA_ARGS__)
 
+/* Make libcoap headers safe to use from C++ */
+#ifndef COAP_STATIC_INLINE
+#  if defined(__cplusplus)
+#    define COAP_STATIC_INLINE inline
+#  else
+#    define COAP_STATIC_INLINE static inline
+#  endif
+#endif
+
 #endif /* _CONFIG_H_ */
 

coap_config.h.lwip

@@ -22,4 +22,13 @@
 
 #define COAP_RESOURCES_NOHASH
 
+/* Make libcoap headers safe to use from C++ */
+#ifndef COAP_STATIC_INLINE
+#  if defined(__cplusplus)
+#    define COAP_STATIC_INLINE inline
+#  else
+#    define COAP_STATIC_INLINE static inline
+#  endif
+#endif
+
 #endif /* _CONFIG_H_ */

coap_config.h.windows

@@ -0,0 +1,64 @@
+#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 <assert.h> header file. */
+#define HAVE_ASSERT_H 1
+
+/* Define to 1 if you have <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define to 1 if you have <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have <time.h> header file. */
+#define HAVE_TIME_H 1
+
+/* Define to 1 if you have malloc(). */
+#define HAVE_MALLOC 1
+
+/* Define to 1 if you have vprintf(). */
+#define HAVE_VPRINTF 1
+
+/* Define to 1 if you have strnlen(). */
+#define HAVE_STRNLEN 1
+
+/* Define to 1 if you have snprintf(). */
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+#define HAVE_SNPRINTF 1
+#endif
+
+#define ssize_t SSIZE_T
+#define in_port_t uint16_t
+
+#endif
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libcoap"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "4.1.1"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libcoap 4.1.1"
+
+#ifndef COAP_STATIC_INLINE
+#  if defined(__cplusplus)
+#    define COAP_STATIC_INLINE inline
+#  else
+#    ifdef _MSC_VER
+#      define COAP_STATIC_INLINE static __inline
+#    else
+#      define COAP_STATIC_INLINE static inline
+#    endif
+#  endif
+#endif
+
+#endif /* _COAP_CONFIG_H_ */

configure.ac

@@ -292,12 +292,13 @@ fi
 
 # Checks for header files.
 AC_CHECK_HEADERS([assert.h arpa/inet.h limits.h netdb.h netinet/in.h \
-                  stdlib.h string.h strings.h sys/socket.h sys/time.h \
+                  stdlib.h string.h strings.h sys/select.h sys/socket.h sys/time.h \
                   time.h unistd.h sys/unistd.h syslog.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
+AC_C_INLINE
 
 # Checks for library functions.
 AC_CHECK_FUNCS([memset select socket strcasecmp strrchr getaddrinfo \
@@ -385,6 +386,17 @@ tests/Makefile
 libcoap-$LIBCOAP_API_VERSION.pc:libcoap-$LIBCOAP_API_VERSION.pc.in
 ])
 
+AH_BOTTOM([
+/* Make libcoap headers safe to use from C++ */
+#ifndef COAP_STATIC_INLINE
+#  if defined(__cplusplus)
+#    define COAP_STATIC_INLINE inline
+#  else
+#    define COAP_STATIC_INLINE static inline
+#  endif
+#endif
+])
+
 AC_OUTPUT
 
 AC_MSG_RESULT([

examples/Makefile.am

@@ -14,7 +14,7 @@ AM_CFLAGS = -isystem$(top_builddir)/include/coap -I$(top_srcdir)/include/coap $(
 # etsi_iot_01 and tiny are missing
 bin_PROGRAMS = coap-client coap-server coap-rd
 
-coap_client_SOURCES = client.c coap_list.c
+coap_client_SOURCES = client.c coap_append.c
 coap_client_LDADD = $(top_builddir)/.libs/libcoap-$(LIBCOAP_API_VERSION).la
 
 coap_server_SOURCES = coap-server.c

examples/client.c

@@ -12,18 +12,37 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#else
+# include "getopt.h"
+#endif
 #include <stdio.h>
 #include <ctype.h>
-#include <sys/select.h>
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#endif
+#ifdef HAVE_NETDB_H
+# include <netdb.h>
+#endif
+#ifndef HAVE_STRCASECMP
+  /* The POSIX strcasecmp() is not supported, so use the ISO C++ conformant _stricmp instead. */
+# define strcasecmp _stricmp
+#endif
 
 #include "coap.h"
+#include "coap_append.h"
 #include "coap_list.h"
 
 int flags = 0;
@@ -61,15 +80,17 @@ coap_tick_t max_wait;                   /* global timeout (changed by set_timeou
 unsigned int obs_seconds = 30;          /* default observe time */
 coap_tick_t obs_wait = 0;               /* timeout for current subscription */
 
+#ifndef min
 #define min(a,b) ((a) < (b) ? (a) : (b))
+#endif
 
 #ifdef __GNUC__
 #define UNUSED_PARAM __attribute__ ((unused))
 #else /* not a GCC */
 #define UNUSED_PARAM
 #endif /* GCC */
 
-static inline void
+COAP_STATIC_INLINE void
 set_timeout(coap_tick_t *timer, const unsigned int seconds) {
   coap_ticks(timer);
   *timer += seconds * COAP_TICKS_PER_SECOND;
@@ -305,7 +326,7 @@ resolve_address(const str *server, struct sockaddr *dst) {
    ((Pdu)->hdr->code == COAP_RESPONSE_CODE(201) ||                \
     (Pdu)->hdr->code == COAP_RESPONSE_CODE(204)))
 
-static inline int
+COAP_STATIC_INLINE int
 check_token(coap_pdu_t *received) {
   return received->hdr->token_length == the_token.length &&
     memcmp(received->hdr->token, the_token.s, the_token.length) == 0;
@@ -694,7 +715,7 @@ cmdline_uri(char *arg, int create_uri_opts) {
   if (proxy.length) {   /* create Proxy-Uri from argument */
     size_t len = strlen(arg);
     while (len > 270) {
-      coap_insert(&optlist,
+      coap_append(&optlist,
                   new_option_node(COAP_OPTION_PROXY_URI,
                   270,
                   (unsigned char *)arg));
@@ -703,7 +724,7 @@ cmdline_uri(char *arg, int create_uri_opts) {
       arg += 270;
     }
 
-    coap_insert(&optlist,
+    coap_append(&optlist,
                 new_option_node(COAP_OPTION_PROXY_URI,
                 len,
                 (unsigned char *)arg));
@@ -714,7 +735,7 @@ cmdline_uri(char *arg, int create_uri_opts) {
     }
 
     if (uri.port != COAP_DEFAULT_PORT && create_uri_opts) {
-      coap_insert(&optlist,
+      coap_append(&optlist,
                   new_option_node(COAP_OPTION_URI_PORT,
                   coap_encode_var_bytes(portbuf, uri.port),
                   portbuf));
@@ -725,7 +746,7 @@ cmdline_uri(char *arg, int create_uri_opts) {
       res = coap_split_path(uri.path.s, uri.path.length, buf, &buflen);
 
       while (res--) {
-        coap_insert(&optlist,
+        coap_append(&optlist,
                     new_option_node(COAP_OPTION_URI_PATH,
                     COAP_OPT_LENGTH(buf),
                     COAP_OPT_VALUE(buf)));
@@ -740,7 +761,7 @@ cmdline_uri(char *arg, int create_uri_opts) {
       res = coap_split_query(uri.query.s, uri.query.length, buf, &buflen);
 
       while (res--) {
-        coap_insert(&optlist,
+        coap_append(&optlist,
                     new_option_node(COAP_OPTION_URI_QUERY,
                     COAP_OPT_LENGTH(buf),
                     COAP_OPT_VALUE(buf)));
@@ -792,14 +813,14 @@ set_blocksize(void) {
     opt_length = coap_encode_var_bytes(buf,
           (block.num << 4 | block.m << 3 | block.szx));
 
-    coap_insert(&optlist, new_option_node(opt, opt_length, buf));
+    coap_append(&optlist, new_option_node(opt, opt_length, buf));
   }
 }
 
 static void
 cmdline_subscribe(char *arg) {
   obs_seconds = atoi(arg);
-  coap_insert(&optlist, new_option_node(COAP_OPTION_SUBSCRIPTION, 0, NULL));
+  coap_append(&optlist, new_option_node(COAP_OPTION_SUBSCRIPTION, 0, NULL));
 }
 
 static int
@@ -835,7 +856,7 @@ cmdline_proxy(char *arg) {
   return 1;
 }
 
-static inline void
+COAP_STATIC_INLINE void
 cmdline_token(char *arg) {
   strncpy((char *)the_token.s, arg, min(sizeof(_token_data), strlen(arg)));
   the_token.length = strlen(arg);
@@ -852,7 +873,7 @@ cmdline_option(char *arg) {
   if (*arg == ',')
     ++arg;
 
-  coap_insert(&optlist,
+  coap_append(&optlist,
               new_option_node(num, strlen(arg), (unsigned char *)arg));
 }
 
@@ -1212,7 +1233,7 @@ main(int argc, char **argv) {
       && create_uri_opts) {
         /* add Uri-Host */
 
-        coap_insert(&optlist,
+        coap_append(&optlist,
                     new_option_node(COAP_OPTION_URI_HOST,
                     uri.host.length,
                     uri.host.s));

examples/coap-rd.c

@@ -65,7 +65,7 @@ rd_t *resources = NULL;
 #define UNUSED_PARAM
 #endif /* GCC */
 
-static inline rd_t *
+COAP_STATIC_INLINE rd_t *
 rd_new(void) {
   rd_t *rd;
   rd = (rd_t *)coap_malloc(sizeof(rd_t));
@@ -75,7 +75,7 @@ rd_new(void) {
   return rd;
 }
 
-static inline void
+COAP_STATIC_INLINE void
 rd_delete(rd_t *rd) {
   if (rd) {
     coap_free(rd->data.s);

examples/coap_list.c → examples/coap_append.c

@@ -8,18 +8,17 @@
  * use.
  */
 
-/* #include "coap_config.h" */
+#include "coap_config.h"
 
 #include <stdio.h>
 #include <string.h>
 
 #include "debug.h"
 #include "mem.h"
-#include "coap_list.h"
-
+#include "coap_append.h"
 
 int
-coap_insert(coap_list_t **head, coap_list_t *node) {
+coap_append(coap_list_t **head, coap_list_t *node) {
   if (!node) {
     coap_log(LOG_WARNING, "cannot create option Proxy-Uri\n");
   } else {
@@ -30,24 +29,3 @@ coap_insert(coap_list_t **head, coap_list_t *node) {
 
   return node != NULL;
 }
-
-int
-coap_delete(coap_list_t *node) {
-  if (node) {
-    coap_free(node);
-  }
-  return 1;
-}
-
-void
-coap_delete_list(coap_list_t *queue) {
-  coap_list_t *elt, *tmp;
-
-  if (!queue)
-    return;
-
-  LL_FOREACH_SAFE(queue, elt, tmp) {
-    coap_delete(elt);
-  }
-}
-