Skip to content
Snippets Groups Projects
  1. Jan 31, 2017
    • Marc Emmelmann's avatar
      Merge branch 'develop' into 'master' · ce71f2b5
      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
      R17.01
      ce71f2b5
  2. Jan 23, 2017
  3. Sep 02, 2016
  4. Aug 31, 2016
  5. Aug 30, 2016
  6. Aug 29, 2016
    • Anatolii Borodin's avatar
      Run `autogen.sh` from `prereq.sh` · 6e6fe223
      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.
      6e6fe223
    • Anatolii Borodin's avatar
      Merge branch 'upstream' into develop · 4109bcb1
      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
        ...
      4109bcb1
    • Marc Emmelmann's avatar
  7. Aug 25, 2016
    • Anatolii Borodin's avatar
      Merge branch 'sync-point-moved-files' into upstream-merge · 287fba31
      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
        ...
      287fba31
    • Anatolii Borodin's avatar
      Add *~, *.swp and *.orig to .gitignore · d1f29e8a
      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.
      d1f29e8a
    • Anatolii Borodin's avatar
      Make prereq.sh callable from any working directory · 78518a6f
      Anatolii Borodin authored
      The old code was not working.
      78518a6f
    • Anatolii Borodin's avatar
      Merge branch 'cleanup' into develop · 869de95f
      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.
      869de95f
    • Anatolii Borodin's avatar
      Remove Makefile.phoenix · ba32450b
      Anatolii Borodin authored
      Move the build command to `prereq.sh`.
      ba32450b
    • Anatolii Borodin's avatar
      Revert unused --without-hashing option · ef5c9922
      Anatolii Borodin authored
      --without-hashing worked only with WITH_CONTKI.
      ef5c9922
    • Anatolii Borodin's avatar
      Remove runCoapClient.sh and runCoapClient.sh · e5500d1e
      Anatolii Borodin authored
      The scripts became trivial and are not needed anymore.
      e5500d1e
    • Anatolii Borodin's avatar
      Revert debug prints in `coap_touch_observer()` · b0ad6025
      Anatolii Borodin authored
      The function will be rewritten in the upstream.
      b0ad6025
    • Anatolii Borodin's avatar
      Do not zero fields that are already zeroed · 8132b718
      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.
      8132b718
    • Anatolii Borodin's avatar
      Add missing "minimization" bits · e246c74f
      Anatolii Borodin authored
      e246c74f
    • Marc Emmelmann's avatar
      Bug fix -- removed erroneous lines of code · 4a13b493
      Marc Emmelmann authored and Anatolii Borodin's avatar Anatolii Borodin committed
      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
      4a13b493
    • Marc Emmelmann's avatar
      Removed unused code. · fcf112a4
      Marc Emmelmann authored and Anatolii Borodin's avatar Anatolii Borodin committed
      * 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.
      fcf112a4
    • Marc Emmelmann's avatar
      moved code added by phoenix but not required by libcoap into a dedicated file... · 7a934245
      Marc Emmelmann authored and Anatolii Borodin's avatar Anatolii Borodin committed
      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.
      7a934245
  8. Aug 23, 2016
    • Marc Emmelmann's avatar
      minimize changes wrt. github/master · 6977c9ec
      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
      6977c9ec
    • Marc Emmelmann's avatar
      minimize changes wrt. github/master · d06b692a
      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)
      d06b692a
    • Marc Emmelmann's avatar
      minimize changes wrt. github/master branch · 3f1d47e2
      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.
      3f1d47e2
    • Marc Emmelmann's avatar
      minimize changes wrt. github/master branch · 0aef7af0
      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)
      0aef7af0
    • Marc Emmelmann's avatar
      minimize changes wrt. github/master branch · 19db16e9
      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)
      19db16e9
  9. Aug 22, 2016
Loading