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

dthaler · 2016-09-17T19:26:38Z

These changes were already in the Iotivity code base, and we're trying to unfork libcoap and have iotivity just use the regular libcoap library. These changes include support for draft-ietf-core-coap-tcp-tls and some cross-platform fixes (e.g., to also run on Windows).

Change-Id: Idddee819530e8eb497a8abf72aa1f94a7b30d40b Signed-off-by: Dave Thaler <[email protected]>

…elop Change-Id: I92dee387c3d58b2d348366e923be007efe833b3e

…elop Change-Id: Ib573dd192fdb84622e9bd24b2e5932dad1dd9501

…elop

Change-Id: I41875348e9667a999bbb223bca3d99d4201fc8fb Signed-off-by: Dave Thaler <[email protected]>

…elop Change-Id: I02a8a520b3743f13b5ab957773c012587263fc83

obgm · 2016-09-20T13:53:08Z

Thanks, this contribution is highly appreciated. Unfortunately, Travis reports this PR to break the Linux port. It would be great if you could take a look into that issue.

Signed-off-by: Dave Thaler <[email protected]>

dthaler · 2016-09-22T13:47:54Z

Just pushed a fix for the bug due to a bad merge

Signed-off-by: Dave Thaler <[email protected]>

obgm · 2016-09-23T08:57:41Z

My apologies -- I have pushed an old patch to src/block.c which now breaks this PR.

tijuca · 2016-09-23T22:03:10Z

src/net.c

@@ -554,7 +554,7 @@ coap_send_ack(coap_context_t *context,
  return result;
 }

-#if defined(WITH_POSIX) || defined(WITH_CONTIKI)
+#if !defined(WITH_LWIP)


Please don't use negative logic here and let that check as it is, it's hard to figure out for some not well knowledge people what !WITH_LWIP means!

Signed-off-by: Dave Thaler <[email protected]>

rzr · 2016-11-07T14:11:17Z

Is this task tracked on iotivity tracker ?

I see there is a conflict to be resolved

dthaler · 2016-11-17T04:41:04Z

Yes https://jira.iotivity.org/browse/IOT-1072 tracks the iotivity task. IoTivity already uses this branch temporarily on Windows and other OS's will start snapping to it after merge. I will rebase to fix the conflict.

Signed-off-by: Dave Thaler <[email protected]>

dthaler · 2017-01-20T19:34:17Z

I believe all feedback so far has been addressed. Would like to see this PR merged so iotivity can start depending on the upstream branch. Let me know if there are any more blocking issues.

tijuca · 2017-01-22T11:44:25Z

Hello Dave,

first thanks for contributing! Some comments below.

Beside the build issues I'd like to see better commit messages, please see and note https://github.com/obgm/libcoap/blob/develop/CONTRIBUTE#L161
Please describe why the commit is made in the way you have done and make explanation what the commit is about (for example c1bda6e 749514f fd5c9ec). It's a bit tedious to go through every source change to understand what's changed and why. That's obviously not needed for typo fixes, but a good commit message helps to see what was changed.

Please don't mix extensions of specific changes to the header files or small adoptions within the header files with improving of the API documentation in other parts, split them of into more easier to understand changes.
For example c11591d is much to big. But other commits will need also be split of into smaller peaces.

Also try to decrease merge commit from upstream much as possible, normally there shouldn't be even one as you should use git rebase instead of git merge to pull upstream changes. I'm currently not able to make a review due the huge changes that I not really understand what and why the source is changed.

Please don't be disappointed, such big changes need time to get integrated. Maybe you can split the PR into more than one PR if it turns out there are some thematic changes. If I read your first post this PR is including two things, tcp-tls and cross-platform support for Windows. For the latter it would be good to have build support than.

Regards
Carsten

dthaler · 2017-02-10T00:02:28Z

FYI, The changes in this PR have been done in IoTivity's fork of this repo across the course of a couple years by a bunch of people. I am merely pushing them here, I am not authoritative for all the original changes, just trying to get rid of a forked copy and make contributions in the future to a single place rather than IoTivity folks continuing to make changes to their own fork. I will do what I can, but I may not be able to answer all questions myself. Pushing back just means that tons of devices (like all the devices Samsung ships) will continue to use a separate fork not the master GitHub version.

rzr · 2017-02-10T12:41:25Z

Hi as Samsung OSG developer I believe it's better for iotivity to be the most aligned possible with upstream, thanks @dthaler for your efforts.

tijuca · 2017-02-10T12:57:36Z

Dave, thanks for a little bit explanation about the details of this PR.
I agree and encourage the best for libcoap and the other projects is obviously to land pull requests early in libcoap and the uses code is not differing much between projects. It's like in the kernel, commit early and do also a pull request early.

I think Olaf is of course willing to pull your changes in this PR. But we need to puzzle the various things out into parts that are logical things. That for one simple reason, not only we need to understand what the changes are about. So how to get further here?

I'd suggest to do the easy parts first, for example changes that are made by you or direct working people.

Olaf has released the recent state of libcoap as version 4.1.2 so we can start now mostly lazy with new changes.

Apparently caused by an incorrect merge. Signed-off-by: Dan Mihai <[email protected]>

Fix pdu length truncation

Signed-off-by: Dave Thaler <[email protected]>

This commit makes sure libcoap doesn't generate any W4 warnings when building with a Visual Studion 2013 and 2015 compiler.

Making sure that "if" statements have opening brackets on the same line to fit the with the rest of the code.

Removing W4 warnings

AnderssonPeter · 2017-04-13T08:06:24Z

Any news on this?
I would love to have Windows support!

obgm · 2017-04-13T08:12:42Z

It certainly is high on my priority list but sorting stuff out will take some time.
Maybe it is feasible to cherry-pick some of the Windows-specific compatibility code. That part seems pretty straight-forward to me.

This change contains only packet format changes in the library to support coap+ws and coaps+ws. Signed-off-by: G S Senthil Kumar <[email protected]>

…p on windows. Merge changes from PR obgm#47 related to windows platform support. Add full windows platform support including correct error checking and working regression tests and examples. Remove need to build applications using libcoap with -DWITH_POSIX and to include coap_config.h. This applies to the examples as well.

…p on windows. Merge changes from PR obgm#47 related to windows platform support. Add full windows platform support including correct error checking and working regression tests and examples. Remove need to build applications using libcoap with -DWITH_POSIX and to include coap_config.h. This applies to the examples as well. # Conflicts: # examples/client.c # examples/coap-rd.c # examples/coap-server.c # include/coap/address.h # include/coap/coap_io.h # include/coap/net.h # include/coap/prng.h # src/address.c # src/block.c # src/net.c # src/pdu.c # src/platform/posix/coap_io.c # src/resource.c

Added CoAP over WebSocket PDU support.

Update pdu.c

Adding API to add token to empty message

obgm · 2018-06-04T12:31:02Z

@dthaler I am having trouble understanding what these changes are about. For example, commit 5f2d238 introduces a function coap_add_token_to_empty_message(). Neither the commit log nor the doxygen comment for the function prototype in commit bd60461 explain what this function is about and, more important, why it is needed in addition to coap_add_token().

The function coap_pdu_parse2() as changed by iotivity patches has a block of code bracketed by #if defined(WITH_TCP) || defined(WITH_WS) the problem is this block contains a reference to a structure member that is defined only if WITH_WS is defined, and it is possible to build this code in iotivity in the presence of WITH_TCP and the absence of WITH_WS. Whether that should ever happen is a separate question; the change keeps these two conditions separate so this can be used in the iotivity CI system which does build some targets in the way noted. Signed-off-by: Mats Wichmann <[email protected]>

Fix for where WITH_TCP is defined, WITH_WS is not.

dthaler added 10 commits July 26, 2016 18:15

Patches from IoTivity

1b3818d

Change-Id: Idddee819530e8eb497a8abf72aa1f94a7b30d40b Signed-off-by: Dave Thaler <[email protected]>

Patches from IoTivity

c1bda6e

Change-Id: Idddee819530e8eb497a8abf72aa1f94a7b30d40b Signed-off-by: Dave Thaler <[email protected]>

Merge branch 'develop' of https://github.com/dthaler/libcoap into dev…

673a575

…elop Change-Id: I92dee387c3d58b2d348366e923be007efe833b3e

Merge branch 'develop' of https://github.com/dthaler/libcoap into dev…

c11591d

…elop Change-Id: I92dee387c3d58b2d348366e923be007efe833b3e

Merge branch 'develop' of https://github.com/dthaler/libcoap into dev…

0e35a2f

…elop Change-Id: Ib573dd192fdb84622e9bd24b2e5932dad1dd9501

Merge branch 'develop' of https://github.com/dthaler/libcoap into dev…

40a6d09

…elop Change-Id: Ib573dd192fdb84622e9bd24b2e5932dad1dd9501

Merge branch 'develop' of https://github.com/dthaler/libcoap into dev…

c044245

…elop

More work on merging IoTivity patches

62c0186

Change-Id: I41875348e9667a999bbb223bca3d99d4201fc8fb Signed-off-by: Dave Thaler <[email protected]>

More work on merging IoTivity patches

fd5c9ec

Change-Id: I41875348e9667a999bbb223bca3d99d4201fc8fb Signed-off-by: Dave Thaler <[email protected]>

Merge branch 'develop' of https://github.com/dthaler/libcoap into dev…

72c7ce6

…elop Change-Id: I02a8a520b3743f13b5ab957773c012587263fc83

obgm mentioned this pull request Sep 21, 2016

WIP - split platform-dependent code into per-platform subtrees #6

Open

7 tasks

Fix merge bug

42aedb2

Signed-off-by: Dave Thaler <[email protected]>

dthaler added 2 commits September 22, 2016 12:50

Windows-specific fix

65e7398

Port tests to windows

e43531b

Signed-off-by: Dave Thaler <[email protected]>

tijuca reviewed Sep 23, 2016

View reviewed changes

dthaler added 2 commits October 11, 2016 11:03

Fix for x86 Windows

749514f

Signed-off-by: Dave Thaler <[email protected]>

Fix release build error

9feaa9e

Signed-off-by: Dave Thaler <[email protected]>

Linux compilation fix

9373a4c

Signed-off-by: Dave Thaler <[email protected]>

obgm added the enhancement label Jan 20, 2017

dthaler added 4 commits January 20, 2017 10:39

Merge remote-tracking branch 'upstream/develop' into develop

0012bae

Fixes from merging

fa987b4

Signed-off-by: Dave Thaler <[email protected]>

Addressed feedback from tijuca, don't use negative logic in ifdefs

d03c8a0

Signed-off-by: Dave Thaler <[email protected]>

Fix typo

ccc0f01

Signed-off-by: Dave Thaler <[email protected]>

malinengineer mentioned this pull request Feb 15, 2017

TCP support? #64

Closed

danmihai1 and others added 7 commits March 8, 2017 12:04

Fix pdu length truncation

40a2641

Apparently caused by an incorrect merge. Signed-off-by: Dan Mihai <[email protected]>

Merge pull request #4 from danmihai1/develop

a8b1149

Fix pdu length truncation

Merge remote-tracking branch 'upstream/develop' into develop

f21c7fb

Merge remote-tracking branch 'upstream/develop' into develop

358bd58

Signed-off-by: Dave Thaler <[email protected]>

Fixing libcoap W4 warnings.

d54f001

This commit makes sure libcoap doesn't generate any W4 warnings when building with a Visual Studion 2013 and 2015 compiler.

Bracket fixes.

9f1d956

Making sure that "if" statements have opening brackets on the same line to fit the with the rest of the code.

Merge pull request #5 from PawelWMS/origin_W4_fix

577804c

Removing W4 warnings

Added CoAP over WebSocket support.

2f6ff0c

This change contains only packet format changes in the library to support coap+ws and coaps+ws. Signed-off-by: G S Senthil Kumar <[email protected]>

jcmichelou added a commit to spinetix/libcoap that referenced this pull request May 6, 2017

Merge fix to coap_config.h.contiki from PR obgm#47.

3ee4552

jcmichelou mentioned this pull request May 6, 2017

Support for windows platform #78

Merged

jcmichelou added a commit to spinetix/libcoap that referenced this pull request May 25, 2017

Merge fix to coap_config.h.contiki from PR obgm#47.

9140575

dthaler and others added 6 commits May 30, 2017 13:57

Merge pull request #6 from SenthilKumarGS/develop

f4d20bc

Added CoAP over WebSocket PDU support.

Update pdu.c

5f2d238

Update pdu.c

5dc2fdc

Merge pull request #1 from Koushik4082/Koushik4082-patch-1

7164418

Update pdu.c

Update pdu.h

bd60461

Merge pull request #7 from Koushik4082/develop

fa8b2b9

Adding API to add token to empty message

mwichmann and others added 2 commits September 13, 2018 08:29

Merge pull request #8 from mwichmann/ws-fix

5a16b17

Fix for where WITH_TCP is defined, WITH_WS is not.

mrdeep1 force-pushed the develop branch from 317b9b7 to e7d7ded Compare September 12, 2023 10:54

mrdeep1 force-pushed the develop branch from 3c28453 to 5fd2f89 Compare October 5, 2023 13:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

dthaler commented Sep 17, 2016

obgm commented Sep 20, 2016

dthaler commented Sep 22, 2016

obgm commented Sep 23, 2016

tijuca Sep 23, 2016 •

edited

Loading

rzr commented Nov 7, 2016 •

edited

Loading

dthaler commented Nov 17, 2016

dthaler commented Jan 20, 2017

tijuca commented Jan 22, 2017 •

edited

Loading

dthaler commented Feb 10, 2017

rzr commented Feb 10, 2017

tijuca commented Feb 10, 2017

AnderssonPeter commented Apr 13, 2017

obgm commented Apr 13, 2017

obgm commented Jun 4, 2018

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

Are you sure you want to change the base?

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

Conversation

dthaler commented Sep 17, 2016

obgm commented Sep 20, 2016

dthaler commented Sep 22, 2016

obgm commented Sep 23, 2016

tijuca Sep 23, 2016 • edited Loading

Choose a reason for hiding this comment

rzr commented Nov 7, 2016 • edited Loading

dthaler commented Nov 17, 2016

dthaler commented Jan 20, 2017

tijuca commented Jan 22, 2017 • edited Loading

dthaler commented Feb 10, 2017

rzr commented Feb 10, 2017

tijuca commented Feb 10, 2017

AnderssonPeter commented Apr 13, 2017

obgm commented Apr 13, 2017

obgm commented Jun 4, 2018

tijuca Sep 23, 2016 •

edited

Loading

rzr commented Nov 7, 2016 •

edited

Loading

tijuca commented Jan 22, 2017 •

edited

Loading