Bump API version to 3, release candidate 2

CMakeLists.txt

@@ -5,7 +5,7 @@ project(
   VERSION 4.3.0
   LANGUAGES CXX C)
 
-set(LIBCOAP_API_VERSION 2)
+set(LIBCOAP_API_VERSION 3)
 set(COAP_LIBRARY_NAME "coap-${LIBCOAP_API_VERSION}")
 
 option(

coap_config.h.lwip

@@ -16,8 +16,8 @@
 #endif
 
 #define PACKAGE_NAME "libcoap"
-#define PACKAGE_VERSION "4.3.0rc1"
-#define PACKAGE_STRING "libcoap 4.3.0rc1"
+#define PACKAGE_VERSION "4.3.0rc2"
+#define PACKAGE_STRING "libcoap 4.3.0rc2"
 
 #define assert(x) LWIP_ASSERT("CoAP assert failed", x)
 

coap_config.h.riot

@@ -100,10 +100,10 @@
 #define PACKAGE_NAME "libcoap"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "4.3.0rc1"
+#define PACKAGE_VERSION "4.3.0rc2"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libcoap 4.3.0rc1"
+#define PACKAGE_STRING "libcoap 4.3.0rc2"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1

coap_config.h.windows

@@ -78,7 +78,7 @@
 #define PACKAGE_NAME "libcoap"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libcoap 4.3.0rc1"
+#define PACKAGE_STRING "libcoap 4.3.0rc2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libcoap"
@@ -87,7 +87,7 @@
 #define PACKAGE_URL "https://libcoap.net/"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "4.3.0rc1"
+#define PACKAGE_VERSION "4.3.0rc2"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1

configure.ac

@@ -13,7 +13,7 @@ m4_define([libcoap_micro_version], [0])
 
 # define an appending release state if needed, for example for pre-releases
 # like 'alpha' or 'rc1', for a full release keep the value empty!
-m4_define([libcoap_release_state], [rc1])
+m4_define([libcoap_release_state], [rc2])
 
 # concatenate the full libcoap version string
 m4_define([libcoap_version], [m4_format([%s.%s.%s%s], libcoap_major_version, libcoap_minor_version, libcoap_micro_version, libcoap_release_state)])
@@ -119,7 +119,7 @@ AC_SUBST(LT_LIBCOAP_AGE)
 AC_SUBST(LIBCOAP_SO_VERSION)
 
 # Defining the API Version
-LIBCOAP_API_VERSION=2
+LIBCOAP_API_VERSION=3
 AC_SUBST(LIBCOAP_API_VERSION)
 
 # Define a numeric version string

examples/coap-client.c

@@ -41,7 +41,7 @@ static char* strndup(const char* s1, size_t n)
 #include <netdb.h>
 #endif
 
-#include <coap2/coap.h>
+#include <coap3/coap.h>
 
 #define MAX_USER 128 /* Maximum length of a user name (i.e., PSK
                       * identity) in bytes. */

examples/coap-rd.c

@@ -41,7 +41,7 @@
 #include <dirent.h>
 #endif
 
-#include <coap2/coap.h>
+#include <coap3/coap.h>
 
 #define COAP_RESOURCE_CHECK_TIME 2
 

examples/coap-server.c

@@ -56,7 +56,7 @@ static char* strndup(const char* s1, size_t n)
 /* Need to refresh time once per sec */
 #define COAP_RESOURCE_CHECK_TIME 1
 
-#include <coap2/coap.h>
+#include <coap3/coap.h>
 
 #ifndef min
 #define min(a,b) ((a) < (b) ? (a) : (b))

examples/coap_list.c

@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <coap2/coap.h>
+#include <coap3/coap.h>
 
 int
 coap_insert(coap_list_t **head, coap_list_t *node) {

examples/coap_list.h

@@ -28,7 +28,7 @@
 #ifndef COAP_LIST_H_
 #define COAP_LIST_H_
 
-#include <coap2/utlist.h>
+#include <coap3/utlist.h>
 
 typedef struct coap_list_t {
   struct coap_list_t *next;

examples/contiki/coap-observer.c

@@ -35,7 +35,7 @@
 
 #include <string.h>
 
-#include "coap2/coap.h"
+#include "coap3/coap.h"
 
 static coap_context_t *coap_context;
 

examples/contiki/server.c

@@ -38,7 +38,7 @@
 
 #include <string.h>
 
-#include "coap2/coap.h"
+#include "coap3/coap.h"
 
 static coap_context_t *coap_context;
 

examples/etsi_iot_01.c

@@ -22,7 +22,7 @@
 #include <errno.h>
 #include <signal.h>
 
-#include <coap2/coap.h>
+#include <coap3/coap.h>
 
 #define COAP_RESOURCE_CHECK_TIME_SEC  1
 

examples/lwip/server-coap.c

@@ -1,5 +1,5 @@
 #include "coap_config.h"
-#include <coap2/coap.h>
+#include <coap3/coap.h>
 
 coap_context_t *main_coap_context;
 

examples/lwip/server-coap.h

@@ -1,5 +1,5 @@
 #include "coap_config.h"
-#include <coap2/coap.h>
+#include <coap3/coap.h>
 
 void server_coap_init(void);
 /* call this when you think that resources could be dirty */

examples/tiny.c

@@ -19,7 +19,7 @@
 #include <netdb.h>
 #include <signal.h>
 
-#include <coap2/coap.h>
+#include <coap3/coap.h>
 
 #define Nn 8  /* duplicate definition of N if built on sky motes */
 #define ENCODE_HEADER_SIZE 4

include/coap3/coap.h.windows

@@ -18,13 +18,13 @@
 #define LIBCOAP_PACKAGE_NAME "libcoap"
 
 /* Define the full name and version of libcoap. */
-#define LIBCOAP_PACKAGE_STRING "libcoap 4.3.0rc1"
+#define LIBCOAP_PACKAGE_STRING "libcoap 4.3.0rc2"
 
 /* Define the home page for libcoap. */
 #define LIBCOAP_PACKAGE_URL "https://libcoap.net/"
 
 /* Define the version of libcoap this file belongs to. */
-#define LIBCOAP_PACKAGE_VERSION "4.3.0rc1"
+#define LIBCOAP_PACKAGE_VERSION "4.3.0rc2"
 
 /* Define the numeric version identifier for libcoap */
 #define LIBCOAP_VERSION (4003000U)
@@ -33,29 +33,29 @@
 extern "C" {
 #endif
 
-#include "coap2/libcoap.h"
+#include "coap3/libcoap.h"
 
-#include "coap2/coap_forward_decls.h"
-#include "coap2/address.h"
-#include "coap2/async.h"
-#include "coap2/bits.h"
-#include "coap2/block.h"
-#include "coap2/coap_cache.h"
-#include "coap2/coap_debug.h"
-#include "coap2/coap_dtls.h"
-#include "coap2/coap_event.h"
-#include "coap2/coap_io.h"
-#include "coap2/coap_prng.h"
-#include "coap2/coap_time.h"
-#include "coap2/encode.h"
-#include "coap2/mem.h"
-#include "coap2/net.h"
-#include "coap2/option.h"
-#include "coap2/pdu.h"
-#include "coap2/resource.h"
-#include "coap2/str.h"
-#include "coap2/subscribe.h"
-#include "coap2/uri.h"
+#include "coap3/coap_forward_decls.h"
+#include "coap3/address.h"
+#include "coap3/async.h"
+#include "coap3/bits.h"
+#include "coap3/block.h"
+#include "coap3/coap_cache.h"
+#include "coap3/coap_debug.h"
+#include "coap3/coap_dtls.h"
+#include "coap3/coap_event.h"
+#include "coap3/coap_io.h"
+#include "coap3/coap_prng.h"
+#include "coap3/coap_time.h"
+#include "coap3/encode.h"
+#include "coap3/mem.h"
+#include "coap3/net.h"
+#include "coap3/option.h"
+#include "coap3/pdu.h"
+#include "coap3/resource.h"
+#include "coap3/str.h"
+#include "coap3/subscribe.h"
+#include "coap3/uri.h"
 
 #ifdef __cplusplus
 }

include/coap3/coap_async_internal.h

@@ -15,7 +15,7 @@
 #ifndef COAP_ASYNC_INTERNAL_H_
 #define COAP_ASYNC_INTERNAL_H_
 
-#include "coap2/net.h"
+#include "coap3/net.h"
 
 #ifndef WITHOUT_ASYNC
 

include/coap3/coap_internal.h

@@ -33,7 +33,7 @@
 # include <assert.h>
 #endif
 
-#include "coap2/coap.h"
+#include "coap3/coap.h"
 
 /*
  * Include all the header files that are for internal use only.

man/examples-code-check.c

@@ -100,7 +100,7 @@ static void check_synopsis(const char* file) {
     exit_code = 1;
     return;
   }
-  fprintf(fpcode, "#include <coap2/coap.h>\n");
+  fprintf(fpcode, "#include <coap3/coap.h>\n");
   fprintf(fpcode, "#ifdef __GNUC__\n");
   fprintf(fpcode, "#define U __attribute__ ((unused))\n");
   fprintf(fpcode, "#else /* not a GCC */\n");
@@ -412,7 +412,7 @@ int main(int argc, char* argv[])
         }
         if (fpcode) {
           if (strstr (buffer, "LIBCOAP_API_VERSION")) {
-            fprintf(fpcode, "#include <coap2/coap.h>\n");
+            fprintf(fpcode, "#include <coap3/coap.h>\n");
             fprintf(fpcode, "#ifdef __GNUC__\n");
             fprintf(fpcode, "#define U __attribute__ ((unused))\n");
             fprintf(fpcode, "#else /* not a GCC */\n");

src/address.c

@@ -6,7 +6,7 @@
  * README for terms of use.
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #if !defined(WITH_CONTIKI) && !defined(WITH_LWIP)
 #ifdef HAVE_ARPA_INET_H

src/async.c

@@ -11,7 +11,7 @@
  * @brief state management for asynchronous messages
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #ifndef WITHOUT_ASYNC
 

src/block.c

@@ -6,7 +6,7 @@
  * README for terms of use.
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #ifndef min
 #define min(a,b) ((a) < (b) ? (a) : (b))

src/coap_asn1.c

@@ -6,7 +6,7 @@
 * README for terms of use.
 */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 size_t
 asn1_len(const uint8_t **ptr)

src/coap_cache.c

@@ -6,7 +6,7 @@
 * README for terms of use.
 */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 /* Determines if the given option_type denotes an option type that can
  * be used as CacheKey. Options that can be cache keys are not Unsafe

src/coap_debug.c

@@ -6,7 +6,7 @@
  * README for terms of use.
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #if defined(HAVE_STRNLEN) && defined(__GNUC__) && !defined(_GNU_SOURCE)
 #define _GNU_SOURCE 1

src/coap_event.c

@@ -7,7 +7,7 @@
  * of use.
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 /*
  * This replaces coap_set_event_handler() so that handler registration is

src/coap_gnutls.c

@@ -41,7 +41,7 @@
  * 3.6.6 or later is required to support Raw Public Key(RPK)
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #ifdef HAVE_LIBGNUTLS
 

src/coap_hashkey.c

@@ -6,7 +6,7 @@
  * README for terms of use.
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 void
 coap_hash_impl(const unsigned char *s, size_t len, coap_key_t h) {

src/coap_io.c

@@ -6,7 +6,7 @@
  * README for terms of use.
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #ifdef HAVE_STDIO_H
 #  include <stdio.h>

src/coap_io_lwip.c

@@ -7,7 +7,7 @@
  * README for terms of use.
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 #include <lwip/udp.h>
 
 #if NO_SYS

src/coap_io_riot.c

@@ -6,7 +6,7 @@
  * README for terms of use.
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #ifdef HAVE_STDIO_H
 #  include <stdio.h>

src/coap_mbedtls.c

@@ -18,7 +18,7 @@
  * m_env      A coap_mbedtls_env_t * (held in c_session->tls)
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #ifdef HAVE_MBEDTLS
 

src/coap_notls.c

@@ -7,7 +7,7 @@
 * of use.
 */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #if !defined(HAVE_LIBTINYDTLS) && !defined(HAVE_OPENSSL) && !defined(HAVE_LIBGNUTLS) && !defined(HAVE_MBEDTLS)
 

src/coap_openssl.c

@@ -8,7 +8,7 @@
 * of use.
 */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #ifdef HAVE_OPENSSL
 

src/coap_prng.c

@@ -7,7 +7,7 @@
  * for terms of use.
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #ifdef HAVE_GETRANDOM
 #include <sys/random.h>

src/coap_session.c

@@ -6,7 +6,7 @@
 * README for terms of use.
 */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #ifndef COAP_SESSION_C_
 #define COAP_SESSION_C_

src/coap_tcp.c

@@ -7,7 +7,7 @@
  * of use.
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #include <errno.h>
 #include <sys/types.h>

src/coap_time.c

@@ -6,7 +6,7 @@
  * README for terms of use.
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #ifdef HAVE_TIME_H
 #include <time.h>

src/coap_tinydtls.c

@@ -8,7 +8,7 @@
  * of use.
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #ifdef HAVE_LIBTINYDTLS
 

src/encode.c

@@ -6,7 +6,7 @@
  * README for terms of use.
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 /* Carsten suggested this when fls() is not available: */
 #ifndef HAVE_FLS

src/mem.c

@@ -7,7 +7,7 @@
  */
 
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #if defined(RIOT_VERSION) && defined(MODULE_MEMARRAY)
 #include <memarray.h>

src/net.c

@@ -6,7 +6,7 @@
  * README for terms of use.
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #include <ctype.h>
 #include <stdio.h>

src/option.c

@@ -8,7 +8,7 @@
  */
 
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #include <stdio.h>
 #include <string.h>

src/pdu.c

@@ -6,7 +6,7 @@
  * README for terms of use.
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #if defined(HAVE_LIMITS_H)
 #include <limits.h>

src/resource.c

@@ -6,7 +6,7 @@
  * README for terms of use.
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #include <stdio.h>
 #include <errno.h>

src/str.c

@@ -6,7 +6,7 @@
  * README for terms of use.
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #include <stdio.h>
 

src/subscribe.c

@@ -7,7 +7,7 @@
  * README for terms of use.
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 void
 coap_subscription_init(coap_subscription_t *s) {

src/uri.c

@@ -6,7 +6,7 @@
  * README for terms of use.
  */
 
-#include "coap2/coap_internal.h"
+#include "coap3/coap_internal.h"
 
 #if defined(HAVE_LIMITS_H)
 #include <limits.h>

tests/oss-fuzz/pdu_parse_target.c

@@ -1,4 +1,4 @@
-#include <coap2/coap.h>
+#include <coap3/coap.h>
 
 int
 LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {

tests/oss-fuzz/split_uri_target.c

@@ -1,4 +1,4 @@
-#include <coap2/coap.h>
+#include <coap3/coap.h>
 
 int
 LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {

win32/libcoap.props

@@ -17,7 +17,7 @@
     <CUnitIncludeDirDbg>$(CUnitRootDirDbg)include</CUnitIncludeDirDbg>
     <CUnitLibDir>$(CUnitRootDir)lib</CUnitLibDir>
     <CUnitLibDirDbg>$(CUnitRootDirDbg)lib</CUnitLibDirDbg>
-    <LibCoAPIncludeDir>include\coap2</LibCoAPIncludeDir>
+    <LibCoAPIncludeDir>include\coap3</LibCoAPIncludeDir>
   </PropertyGroup>
   <PropertyGroup />
   <ItemDefinitionGroup />