-
Notifications
You must be signed in to change notification settings - Fork 423
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updates Contiki-specific code to Contiki-NG
- Loading branch information
Showing
31 changed files
with
457 additions
and
1,001 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,5 @@ | ||
| libcoap_src = pdu.c net.c coap_cache.c coap_debug.c encode.c uri.c coap_subscribe.c resource.c str.c coap_option.c coap_async.c block.c mem.c coap_io.c coap_session.c coap_notls.c coap_hashkey.c coap_address.c coap_tcp.c coap_oscore.c | ||
|
|
||
| libcoap_dir := $(filter %libcoap,$(APPDS)) | ||
| vpath %c $(libcoap_dir)/src | ||
|
|
||
| # set include path for coap sources | ||
| CFLAGS += -I$(libcoap_dir)/include | ||
| LIBCOAP_DIR = os/net/app-layer/libcoap | ||
| MODULES += $(LIBCOAP_DIR)/src | ||
| MODULES += $(LIBCOAP_DIR)/include | ||
| MODULES_SOURCES_EXCLUDES += coap_io_riot.c | ||
| MODULES_SOURCES_EXCLUDES += coap_io_lwip.c |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,216 +1,77 @@ | ||
| #ifndef COAP_CONFIG_H_ | ||
| #define COAP_CONFIG_H_ | ||
|
|
||
| #include "contiki.h" | ||
| #include "contiki-lib.h" | ||
| #include "contiki-net.h" | ||
| /* Define if the system has small stack size */ | ||
| #define COAP_CONSTRAINED_STACK 1 | ||
|
|
||
| #define WITH_CONTIKI 1 | ||
| /* Define to 1 if you have the <assert.h> header file. */ | ||
| #define HAVE_ASSERT_H 1 | ||
|
|
||
| #ifndef COAP_CONSTRAINED_STACK | ||
| #define COAP_CONSTRAINED_STACK 1 | ||
| #endif | ||
| /* Define to 1 if you have the <inttypes.h> header file. */ | ||
| #define HAVE_INTTYPES_H 1 | ||
|
|
||
| #ifndef COAP_DISABLE_TCP | ||
| /* Define to 1 to build without TCP support. */ | ||
| #define COAP_DISABLE_TCP 1 | ||
| #endif | ||
|
|
||
| #define PACKAGE_STRING "libcoap" | ||
| #define PACKAGE_NAME "libcoap" | ||
| /* Define to 1 if you have the <limits.h> header file. */ | ||
| #define HAVE_LIMITS_H 1 | ||
|
|
||
| #ifndef COAP_DEFAULT_PDU_SIZE | ||
| #define COAP_DEFAULT_PDU_SIZE 64 | ||
| #endif /* COAP_DEFAULT_PDU_SIZE */ | ||
| #ifndef COAP_RXBUFFER_SIZE | ||
| #define COAP_RXBUFFER_SIZE 64 | ||
| #endif /* COAP_RXBUFFER_SIZE */ | ||
|
|
||
| /** Number of resources that can be handled by a CoAP server in addition to | ||
| * @c /.well-known/core */ | ||
| #ifndef COAP_MAX_RESOURCES | ||
| #define COAP_MAX_RESOURCES 3 | ||
| #endif /* COAP_MAX_RESOURCES */ | ||
|
|
||
| /** Number of attributes that can be handled (should be at least | ||
| * @c 2 * COAP_MAX_RESOURCES. to carry the content type and the | ||
| * resource type. */ | ||
| #ifndef COAP_MAX_ATTRIBUTES | ||
| #define COAP_MAX_ATTRIBUTES 4 | ||
| #endif /* COAP_MAX_ATTRIBUTES */ | ||
|
|
||
| /** | ||
| * Number of PDUs that can be stored simultaneously. This number | ||
| * includes both, the PDUs stored for retransmission as well as the | ||
| * PDUs received. Beware that choosing a too small value can lead to | ||
| * many retransmissions to be dealt with. | ||
| */ | ||
| #ifndef COAP_PDU_MAXCNT | ||
| #define COAP_PDU_MAXCNT 4 | ||
| #endif /* COAP_PDU_MAXCNT */ | ||
|
|
||
| /** | ||
| * Maximum number of sessions. | ||
| */ | ||
| #ifndef COAP_MAX_SESSIONS | ||
| #define COAP_MAX_SESSIONS 2 | ||
| #endif /* COAP_MAX_SESSIONS */ | ||
|
|
||
| /** | ||
| * Maximum number of subscriptions. Every additional subscriber costs | ||
| * 36 B. | ||
| */ | ||
| #ifndef COAP_MAX_SUBSCRIBERS | ||
| #define COAP_MAX_SUBSCRIBERS 3 | ||
| #endif /* COAP_MAX_SUBSCRIBERS */ | ||
|
|
||
| /** | ||
| * The maximum number of cache-key entries that allocate | ||
| * fixed-size memory blocks. | ||
| */ | ||
| #ifndef COAP_MAX_CACHE_KEYS | ||
| #define COAP_MAX_CACHE_KEYS (2U) | ||
| #endif /* COAP_MAX_CACHE_KEYS */ | ||
|
|
||
| /** | ||
| * The maximum number of cache-entry entries that allocate | ||
| * fixed-size memory blocks. | ||
| */ | ||
| #ifndef COAP_MAX_CACHE_ENTRIES | ||
| #define COAP_MAX_CACHE_ENTRIES (2U) | ||
| #endif /* COAP_MAX_CACHE_ENTRIES */ | ||
|
|
||
| /** | ||
| * Maximum number of large body transmissions. | ||
| */ | ||
| #ifndef COAP_MAX_LG_XMIT | ||
| #define COAP_MAX_LG_XMIT 2 | ||
| #endif /* COAP_MAX_LG_XMIT */ | ||
|
|
||
| /** | ||
| * Maximum number of large body client receives. | ||
| */ | ||
| #ifndef COAP_MAX_LG_CRCV | ||
| #define COAP_MAX_LG_CRCV 2 | ||
| #endif /* COAP_MAX_LG_CRCV */ | ||
|
|
||
| /** | ||
| * Maximum number of large body server receives. | ||
| */ | ||
| #ifndef COAP_MAX_LG_SRCV | ||
| #define COAP_MAX_LG_SRCV 2 | ||
| #endif /* COAP_MAX_LG_SRCV */ | ||
|
|
||
| /** | ||
| * Number of notifications that may be sent non-confirmable before a confirmable | ||
| * message is sent to detect if observers are alive. The maximum allowed value | ||
| * here is @c 255. | ||
| */ | ||
| #ifndef COAP_OBS_MAX_NON | ||
| #define COAP_OBS_MAX_NON 5 | ||
| #endif /* COAP_OBS_MAX_NON */ | ||
| #if COAP_OBS_MAX_NON > 255 | ||
| #error COAP_OBS_MAX_NON is too large | ||
| #endif /* COAP_OBS_MAX_NON > 255 */ | ||
|
|
||
| /** | ||
| * Number of different confirmable notifications that may fail (i.e. those | ||
| * that have hit MAX_RETRANSMIT multiple times) before an observer is removed. | ||
| * The maximum value for COAP_OBS_MAX_FAIL is @c 255. | ||
| */ | ||
| #ifndef COAP_OBS_MAX_FAIL | ||
| #define COAP_OBS_MAX_FAIL 1 | ||
| #endif /* COAP_OBS_MAX_FAIL */ | ||
| #if COAP_OBS_MAX_FAIL > 255 | ||
| #error COAP_OBS_MAX_FAIL is too large | ||
| #endif /* COAP_OBS_MAX_FAIL > 255 */ | ||
|
|
||
| #ifndef DEBUG | ||
| # define DEBUG DEBUG_PRINT | ||
| #endif | ||
| /* Define to 1 if you have the `memset' function. */ | ||
| #define HAVE_MEMSET 1 | ||
|
|
||
| #define HAVE_STRNLEN 1 | ||
| #define HAVE_SNPRINTF 1 | ||
| #define HAVE_STRINGS_H 1 | ||
| #define HAVE_NETDB_H 1 | ||
| /* Define to 1 if you have the <stddef.h> header file. */ | ||
| #define HAVE_STDDEF_H 1 | ||
|
|
||
| /* Define to 1 if you have the <stdint.h> header file. */ | ||
| #define HAVE_STDINT_H 1 | ||
|
|
||
| /* there is no file-oriented output */ | ||
| #define COAP_DEBUG_FD NULL | ||
| #define COAP_ERR_FD NULL | ||
| /* Define to 1 if you have the <stdlib.h> header file. */ | ||
| #define HAVE_STDLIB_H 1 | ||
|
|
||
| #include "contiki-conf.h" | ||
| /* Define to 1 if you have the `strcasecmp' function. */ | ||
| #define HAVE_STRCASECMP 1 | ||
|
|
||
| #if (defined(PLATFORM) && PLATFORM == PLATFORM_MC1322X) || defined(CONTIKI_TARGET_ECONOTAG) | ||
| /* Redbee econotags get a special treatment here: endianness is set | ||
| * explicitly, and | ||
| */ | ||
| /* Define to 1 if you have the <strings.h> header file. */ | ||
| #define HAVE_STRINGS_H 1 | ||
|
|
||
| #define BYTE_ORDER UIP_LITTLE_ENDIAN | ||
| /* Define to 1 if you have the <string.h> header file. */ | ||
| #define HAVE_STRING_H 1 | ||
|
|
||
| #define HAVE_ASSERT_H | ||
| #define HAVE_UNISTD_H | ||
| #define HAVE_SYS_TYPES_H | ||
| #define HAVE_LIMITS_H | ||
| #endif /* PLATFORM_MC1322X || CONTIKI_TARGET_ECONOTAG */ | ||
| /* Define to 1 if you have the `strnlen' function. */ | ||
| #define HAVE_STRNLEN 1 | ||
|
|
||
| #if defined(TMOTE_SKY) || defined(CONTIKI_TARGET_SKY) || defined(CONTIKI_TARGET_WISMOTE) | ||
| /* Need to set the byte order for TMote Sky explicitely */ | ||
| /* Define to 1 if you have the `strrchr' function. */ | ||
| #define HAVE_STRRCHR 1 | ||
|
|
||
| #define BYTE_ORDER UIP_LITTLE_ENDIAN | ||
| #undef COAP_DEFAULT_PDU_SIZE | ||
| #undef COAP_RXBUFFER_SIZE | ||
| #define COAP_DEFAULT_PDU_SIZE 100 | ||
| #define COAP_RXBUFFER_SIZE 100 | ||
| /* Define to 1 if you have the `snprintf' function. */ | ||
| #define HAVE_SNPRINTF 1 | ||
|
|
||
| #define COAP_MAX_BLOCK_SZX 2 | ||
| /* Define to the address where bug reports for this package should be sent. */ | ||
| #define PACKAGE_BUGREPORT "libcoap-developers@lists.sourceforge.net" | ||
|
|
||
| typedef int ssize_t; | ||
| typedef void FILE; | ||
| /* Define to the full name of this package. */ | ||
| #define PACKAGE_NAME "libcoap" | ||
|
|
||
| #define HAVE_LIMITS_H 1 | ||
| #undef HAVE_ASSERT_H | ||
| #define HAVE_VPRINTF 1 | ||
| #endif /* defined(TMOTE_SKY) */ | ||
|
|
||
| #ifdef CONTIKI_TARGET_MINIMAL_NET | ||
| #undef COAP_DEFAULT_PDU_SIZE | ||
| #undef COAP_RXBUFFER_SIZE | ||
| #define COAP_DEFAULT_PDU_SIZE 1152 | ||
| #define COAP_RXBUFFER_SIZE 1472 | ||
| #define HAVE_ASSERT_H 1 | ||
| #define HAVE_VPRINTF 1 | ||
| #define HAVE_SYS_TYPES_H 1 | ||
| #endif /* CONTIKI_TARGET_MINIMAL_NET */ | ||
| /* Define to the full name and version of this package. */ | ||
| #define PACKAGE_STRING "libcoap 4.3.0" | ||
|
|
||
| #ifdef CONTIKI_TARGET_CC2538DK | ||
| #define BYTE_ORDER UIP_LITTLE_ENDIAN | ||
| #undef COAP_DEFAULT_PDU_SIZE | ||
| #undef COAP_RXBUFFER_SIZE | ||
| #define COAP_DEFAULT_PDU_SIZE 100 | ||
| #define COAP_RXBUFFER_SIZE 100 | ||
| /* Define to the one symbol short name of this package. */ | ||
| #define PACKAGE_TARNAME "libcoap" | ||
|
|
||
| #undef COAP_MAX_BLOCK_SZX | ||
| #define COAP_MAX_BLOCK_SZX 2 | ||
| /* Define to the home page for this package. */ | ||
| #define PACKAGE_URL "https://libcoap.net/" | ||
|
|
||
| #define HAVE_LIMITS_H 1 | ||
| #endif /* CONTIKI_TARGET_CC2538DK */ | ||
|
|
||
| #ifndef BYTE_ORDER | ||
| # ifdef UIP_CONF_BYTE_ORDER | ||
| # define BYTE_ORDER UIP_CONF_BYTE_ORDER | ||
| # else | ||
| # error "UIP_CONF_BYTE_ORDER not defined" | ||
| # endif /* UIP_CONF_BYTE_ORDER */ | ||
| #endif /* BYTE_ORDER */ | ||
|
|
||
| /* Define assert() as empty directive unless HAVE_ASSERT_H is given. */ | ||
| #ifndef HAVE_ASSERT_H | ||
| # define assert(x) | ||
| #endif | ||
| /* Define to the version of this package. */ | ||
| #define PACKAGE_VERSION "4.3.0" | ||
|
|
||
| #define WITH_CONTIKI 1 | ||
|
|
||
| #define ntohs uip_ntohs | ||
|
|
||
| #include <stdio.h> | ||
| #define coap_log(fd, ...) printf(__VA_ARGS__) | ||
| #define HASH_NONFATAL_OOM 1 | ||
|
|
||
| #endif /* COAP_CONFIG_H_ */ | ||
| #ifndef HEAPMEM_CONF_ARENA_SIZE | ||
| #define HEAPMEM_CONF_ARENA_SIZE 4096 | ||
| #endif | ||
|
|
||
| #endif /* COAP_CONFIG_H_ */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,2 @@ | ||
| contiki-minimal-net.a | ||
| contiki-minimal-net.map | ||
| contiki/ | ||
| obj_minimal-net/ | ||
| server.minimal-net | ||
| symbols.c | ||
| symbols.h | ||
| contiki-ng/ | ||
| server.native |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| CONTIKI=contiki | ||
| TARGET?=minimal-net | ||
| CONTIKI=contiki-ng | ||
| TARGET?=native | ||
|
|
||
| all: server | ||
|
|
||
| $(CONTIKI): | ||
| git clone --depth 1 https://github.com/contiki-os/contiki.git $@ | ||
| cd $(CONTIKI)/apps && ln -s ../../../.. libcoap | ||
| git clone --depth 1 https://github.com/contiki-ng/contiki-ng.git $@ | ||
| cd $(CONTIKI)/os/net/app-layer && rm -rf libcoap && ln -s ../../../../../.. libcoap | ||
|
|
||
| server: $(CONTIKI) | ||
| $(MAKE) -f Makefile.contiki V=1 CONTIKI=$(CONTIKI) TARGET=$(TARGET) NODE_ADDR=0x1000 server | ||
| $(MAKE) -f Makefile.contiki CONTIKI=$(CONTIKI) TARGET=$(TARGET) server | ||
|
|
||
| clean: | ||
| $(MAKE) -f Makefile.contiki V=1 CONTIKI=$(CONTIKI) TARGET=$(TARGET) clean | ||
| rm -f server.minimal-net symbols.c symbols.h | ||
| $(MAKE) -f Makefile.contiki CONTIKI=$(CONTIKI) TARGET=$(TARGET) clean | ||
| rm -rf build |
Oops, something went wrong.