- Jan 31, 2017
-
-
Marc Emmelmann authored
Merge into master to support Phoenix v3.0.0-beta release libcoap_phoenix: Enable 'make'-parallelization prereq.sh: Add `-j` option. `prereq.sh` ran through without giving an error. autogen.sh: Add input/output redirection for stdin/stderr to hide compilation output (unless errors show). See merge request !3
-
- Jan 23, 2017
-
-
Alexander Rehbein authored
prereq.sh: Add `-j` option. `prereq.sh` ran through without giving an error. autogen.sh: Add input/output redirection for stdin/stderr to hide compilation output (unless errors show).
-
- Sep 02, 2016
-
-
Marc Emmelmann authored
Merge the changes due to bringing in the upstream in to the current development branch. Finished on merging the upstream into the current code base. Bring in that merge into the development branch. Resolves #2, #3, #4, #5, #7, #8, #9, #10, #11, #12, #13, #14, #15, #18, #19, #20, #21, #22. See merge request !2
-
Marc Emmelmann authored
Tests do not build due to missing CUnit. Address later. Closing #21
-
Marc Emmelmann authored
-
Marc Emmelmann authored
Even though we did a verbatim copy of the code from resource.h, we encountered a compilation error when having the copied code here: ./include/coap/net.h:74:2: error: must use 'struct' tag to refer to type 'coap_context_t' (coap_context_t *, ^ struct 1 error generated. Adding struct to fix the issue.
-
Marc Emmelmann authored
-
Marc Emmelmann authored
Changes made for Phoenix: * Replaced a while loop with our code as original hashing was not computed correctly. We here enforced that the "/" is considered for hashing. Likely, that the upstream fixes for hashing take care of this issue as well. Hence, comment out our code and bring back here the current upstream version. * Added code to call our own data_deletion handler in case resources are going to be deleted. Keep that code fragment. See also #22
-
Marc Emmelmann authored
Changes done for Phoenix: added code (copied but not modified from libcoap) as required to duplicate the following typedef from resource.h in order to allow to add an additional global default callback to coap_context_t. Verfified that the copied code is aligned with the newest code in resource.h. extended coap_context_t Both changes need to be kept. See also #22
-
Marc Emmelmann authored
Added comments to highlight specific code changes made for Phoenix. Used #ifdef (0) to take them out. We added functionality to set during runtime (external) allocator and dealocator for memory. Added a comment per changed code line in the files. Used #ifdef (0) to take the code out. Check later if the code should be brought back in when porting to the new Phoenix memory management system. See also #22
-
Marc Emmelmann authored
Changes had no Phoenix-specific reason. Stick with upstream code. See also #22
-
Marc Emmelmann authored
Discussed our code (our changes) vs. code from the upstream. It looks like the upstream fixed the problem we ran into. Stick with the upstream code. The problem before was that it considered different paths equal, i.e., the comparison did not work. We got an error that "resources are already there" even though they did not exist. See also #22
-
- Aug 31, 2016
-
-
Marc Emmelmann authored
Instead of disabling examples completely, just diable building the documentation as this is the root of the ./confiugre error. See issues #20 and #19 for details.
-
- Aug 30, 2016
-
-
Marc Emmelmann authored
Building libcoap examples fails as we are missing the a2x tool on our systems. This can be added later to enable building examples again. Use a local subdirectory to install libcoap at. If we decide to have a centralized "3rdparty" dir at the phoenix top-level where we can install to, leave the local subdir. Adjusting .gitiignore to ignore our local install dir.
-
- Aug 29, 2016
-
-
Anatolii Borodin authored
`autogen.sh` calls `autoconf` and other required commands. The `--with-shared` `configure` option has been renamed to `--enable-shared`. Do not buid tests.
-
Anatolii Borodin authored
Sync the `develop` branch with the most recent upstream version. There were conflicts in the following files during the merge: - include/coap/coap_time.h - include/coap/resource.h - src/net.c - src/resource.c - src/uri.c * upstream: (219 commits) Add missing LOG_ERR log level configure.ac: fix CFLAGS append uri.[hc]: make 1st argument of coap_split_uri() const build.sh: bugfix: use LDLIBS for linking build.sh: set LDFLAGS=-lrt for glibc < 2.17 in lwip build build.sh: split build steps for platform lwip CI: enable platform lwip examples/lwip: depend on coap.h lwip: cleanups of leftover variables and similar compiler warnings lwip: Use latest version lwip: Include coap_config.h in lwippools.h lwip: Drop include in coap_io.h net: Fix coap_new_endpoint error handling configure: only add -Wunused-result if supported by the compiler Makefile.contiki: Added -Os to remove undefined symbol examples/contiki/Makefile: use --depth 1 for cloning Contiki server.c: fixed Contiki-related debug functions test_uri.c: additional unit tests for option encoding option.c: fixed off-by-one error in Uri-Query encoder doc/Makefile.am: remove *.md5 files after installation ...
-
Marc Emmelmann authored
-
- Aug 25, 2016
-
-
Anatolii Borodin authored
The source files have been moved to `src` and `include/coap` in the upstream. This merge should facilitate the following merges. The changes to `uthash.h` have been left, but can probably be rewritten later in a better way, by defining `uthash_malloc()` and `uthash_free()` before including `uthash.h`. * sync-point-moved-files: (69 commits) moving library related files to new folders updated year in boilerplate text Fixed Contiki-specific Makefile moved platform-specific Makefile.contiki into examples/contiki updated change log README was renamed to README.md to produce nice ouput fix CoAP RFC number in comments set new version number 4.1.2 use fixpoint arithmetic for retransmission timeout calculation bugfix: CLIENT_OBJS in Makefile.in unknown Replaced custom list implementation with linked lists from utlist.h Moved coap_list.[hc] to examples fixed omitted word in comment Fixed retransmission timeout calculation uthash.h: Add missing default statement in HASH_JEN moved to uthash 1.9.9 fix compiler warning for strnlen() reflect name change of coap_config.h.in in leading comment Removed internal function check_opt_size() that is not used anymore src/net.c: fixing gcc warning ...
-
Anatolii Borodin authored
Garbage files sometimes left by vim and git merge. It's better to keep these added lines always at the end of the file during merges.
-
Anatolii Borodin authored
The old code was not working.
-
Anatolii Borodin authored
* cleanup: Remove Makefile.phoenix Revert unused --without-hashing option Remove runCoapClient.sh and runCoapClient.sh Revert debug prints in `coap_touch_observer()` Do not zero fields that are already zeroed Add missing "minimization" bits Bug fix -- removed erroneous lines of code Removed unused code. moved code added by phoenix but not required by libcoap into a dedicated file that is part of phoenix minimize changes wrt. github/master minimize changes wrt. github/master minimize changes wrt. github/master branch minimize changes wrt. github/master branch minimize changes wrt. github/master branch reverted cosmetic changes (blanc lines etc) to bring file closer to github/master branch. deleted numerous debugging output (fprintf). minimize changes wrt. github/master branch Minimize changes to allow for easy merge of github/develop in our code Minimize changes to github/master branch to allow for easy migration with github/develop branch. Minimize changes wrt. github/master version to allow for easy migration of github/develop branch in our code. Minimize changes to original github/master version reverted changes to original file from github/master to ease up migration of the newest github/develop tree.
-
Anatolii Borodin authored
Move the build command to `prereq.sh`.
-
Anatolii Borodin authored
--without-hashing worked only with WITH_CONTKI.
-
Anatolii Borodin authored
The scripts became trivial and are not needed anymore.
-
Anatolii Borodin authored
The function will be rewritten in the upstream.
-
Anatolii Borodin authored
`c->resources` and `r->data` already `NULL` because the corresponding structures are already zeroed with `memset()`. Do not zero `resource` in `coap_delete_resource()`, the variable is not used after `coap_free()`, and the block will be rewritten in the upstream.
-
Anatolii Borodin authored
-
Removed the following statement within coap_add_data(): pdu->data++; pdu->data = '\0'; If data should be null-terminated, the null sign should be passed within the buffer to coap_add_data() and not always be added to it within the function call. This relates to issue #9
-
* udp_comm_open_send_socket(), udp_comm_close_socket(), and udp_comm_send() are not used at all (neither used in the libcoap code nor in the modules/coap/* code). * The three calls were only used in the code fragment for testing that is not used any more (i.e., commented out, see above) * since the corresponding (unused) code fragment that depended on the three calls had been removed, the code for the three calls should be removed as well. The only remaining insertion was the #include <strings.h>. No obvious dependencies on strings.h found and since the original file did not have that include, revert that change as well.
-
moved code added by phoenix but not required by libcoap into a dedicated file that is part of phoenix Adjusting libcoap to the needs of phoenix resulted in adding four additional clap-media types: #define COAP_MEDIATYPE_APPLICATION_LWM2M_TEXT 1541 /* application/vnd.oma.lwm2m+text */ #define COAP_MEDIATYPE_APPLICATION_LWM2M_TLV 1542 /* application/vnd.oma.lwm2m+tlv */ #define COAP_MEDIATYPE_APPLICATION_LWM2M_JSON 1543 /* application/vnd.oma.lwm2m+json */ #define COAP_MEDIATYPE_APPLICATION_LWM2M_OPAQUE 1544 /* application/vnd.oma.lwm2m+opaque */ those definitions were added to libcoap/pdu.h but are neither used by the modified nor by the unmodified (upstream) libcoap code. The definitions were removed from libcaop/pdu.h and were put in a new file (coap_pdu.h) which resides in the module/coap directory and is hence outside the code space of libcoap.
-
- Aug 23, 2016
-
-
Marc Emmelmann authored
minimize changes wrt. github/master in order to allow for easy integration of github/develop - delete header that adds info for Fokus copyright on changed code
-
Marc Emmelmann authored
minimize changes wrt. github/master in order to allow for easy integration of github/develop - [ ] delete header that adds info for Fokus copyright on changed code - [ ] bring back the header -- if necessary -- once we integrated with github/master - [ ] revert back to the original lib name, i.e.: libcoap (and not any more libcoap_phoenix)
-
Marc Emmelmann authored
minimize changes wrt. github/master branch in order to allow for easy integration of the latest code from github/develop. * remove header that provides info for Fokus copyright for changes.
-
Marc Emmelmann authored
minimize changes wrt. github/master branch in order to allow for easy integration of the latest code from github/develop. - [ ] remove additional log messages introduced for debugging (and the dependent #include stdio.h)
-
Marc Emmelmann authored
minimize changes wrt. github/master branch in order to allow for easy integration of the latest code from github/develop. - [ ] remove header that points to code changes and Fokus copyright for those - [ ] bring back header with copyright info once the merge of github/develop is done - [ ] delete extra blanc lines / spaces, etc. - [ ] remove unused code (here debugging messages)
-
- Aug 22, 2016
-
-
Marc Emmelmann authored
-
Marc Emmelmann authored
-
Marc Emmelmann authored
-
Marc Emmelmann authored
deleted header; revered back to libcoap as lib-name.
-
Marc Emmelmann authored
removed empty lines and unused code (debugging fragments). Note, the only two added functions could easily be moved into a separate file leaving this file unchanged against the github/master version. See also #4
-