Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

oonf_api: adapt for new sockets #3882

Merged
merged 1 commit into from
Sep 24, 2015
Merged

oonf_api: adapt for new sockets #3882

merged 1 commit into from
Sep 24, 2015

Conversation

miri64
Copy link
Member

@miri64 miri64 commented Sep 17, 2015

Adapts oonf_api to use posix_sockets instead of pnet (in pkg/oonf_api/0001-add-RIOT-support.patch) and updates the following patches accordingly.

Depends on #3646 (merged) for functionality, but should also compile without it.

@miri64 miri64 added Area: network Area: Networking Area: pkg Area: External package ports Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation labels Sep 17, 2015
@miri64 miri64 added this to the Release 2015.09 milestone Sep 17, 2015
@miri64
Copy link
Member Author

miri64 commented Sep 17, 2015

Rebased to current #3646.

@miri64 miri64 force-pushed the pkg/clean/oonf_api branch 2 times, most recently from 9b54f64 to bff4a03 Compare September 17, 2015 11:22
@miri64
Copy link
Member Author

miri64 commented Sep 17, 2015

And now it's finally working!

@miri64 miri64 mentioned this pull request Sep 17, 2015
Merged
@kaspar030 kaspar030 mentioned this pull request Sep 17, 2015
Closed
12 tasks
@Lotterleben
Copy link
Member

Oh boy :D Nice one :) I'm assuming the non-patch files are from a PR this PR depends on? (I'm sorry I'm not very up to speed currently, things have been a bit hectic :S)

Edit: reading properly can go a long way >.< sorry, will have a look.

@miri64
Copy link
Member Author

miri64 commented Sep 17, 2015

I'm assuming the non-patch files are from a PR this PR depends on?

Yes this PR is essentially only +80 −337

@miri64
Copy link
Member Author

miri64 commented Sep 21, 2015

Rebased to current #3646

@miri64
Copy link
Member Author

miri64 commented Sep 21, 2015

Rebased to current #3646

@OlegHahm OlegHahm added the State: waiting for other PR State: The PR requires another PR to be merged first label Sep 21, 2015
Lotterleben
Lotterleben reviewed Sep 21, 2015
View reviewed changes
pkg/oonf_api/0001-add-RIOT-support.patch
netaddr_from_socket(struct netaddr *dst, const union netaddr_socket *src) {
memset(dst->_addr, 0, sizeof(dst->_addr));
- if (src->std.sa_family == AF_INET) {
+ if (src->std.sin6_family == AF_INET) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tbh I don't quite get this line :/ If the address family is v4, assume src is a sockaddr_in6 but then set its family to AF_INET instead of AF_INET6?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right. That's an error. Will fix!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Errr.... This change removes this line from the patch… reading diffs to diffs is hell :D

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aghhh sry :D

@miri64 miri64 removed the State: waiting for other PR State: The PR requires another PR to be merged first label Sep 22, 2015
@miri64
Copy link
Member Author

miri64 commented Sep 22, 2015

Rebased and squashed to current master

@haukepetersen
Copy link
Contributor

Whats the state on this? @Lotterleben: were you able to test this? And can you give an ack?

@miri64
Copy link
Member Author

miri64 commented Sep 23, 2015

Rebased to current master

@miri64 miri64 added the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label Sep 23, 2015
@miri64
Copy link
Member Author

miri64 commented Sep 23, 2015

To make things easier: here's what this PR does to oonf: The patches changing types for use with socket_base are basically reverted and the only changes made to the oonf_api are now only Makefile and scope_id (which is basically a fancy socket-specific word to say interface) related.

@miri64
Copy link
Member Author

miri64 commented Sep 23, 2015

RIOT's POSIX sockets do not support scope_id yet. (for this POSIX net/if.h needs to be implemented and for this we need a stack-common interface API)

@Lotterleben
Copy link
Member

@haukepetersen I couldn't test it with my AODVv2 packets (still waaay behind on that port... doesnt have sockets again yet ^^), but I'll try with the oonf example app.

@haukepetersen
Copy link
Contributor

nice. Lets try to get this in ASAP - as the CC110x driver is almost in, this is pretty much the last thing needed to get the RC out...

@Lotterleben
Copy link
Member

Martine, were you able to build the exmaple app from within pkg/oonf_api/oonf_api/examples/rfc5444_reader_writer? I'm not sure if this is an error or just me being rusty and stupid.

Edit: I think its the latter. Nevermind me then ^^ Sry

@miri64
Copy link
Member Author

miri64 commented Sep 23, 2015

I have to confess that I only tested if examples/default with USEMODULE+="oonf_rfc5444" set was compiling 😞. Will look into the OONF examples too.

@miri64
Copy link
Member Author

miri64 commented Sep 23, 2015

oh my god... the makefiles for these are like ten versions out dated Oo will fix.

@miri64
Copy link
Member Author

miri64 commented Sep 23, 2015

Mh… all the applications don't seem to use sockets anyway, if I see that correctly. Question is: What do you want to test then?

@miri64
Copy link
Member Author

miri64 commented Sep 24, 2015

Adapted example and tests Makefiles (though I don't understand how the mechanism is supposed to work with the tests) and squashed immediately.

@miri64 miri64 mentioned this pull request Sep 24, 2015
Closed
@miri64 miri64 removed the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label Sep 24, 2015
@OlegHahm OlegHahm added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Sep 24, 2015
@OlegHahm
Copy link
Member

Let's see what Travis says.

@haukepetersen
Copy link
Contributor

Travis is happy -> I would say we merge...

@miri64
Copy link
Member Author

miri64 commented Sep 24, 2015

There is no application that actually builds this modules, so I would be very happy if someone at least tries to compile it ;-)

@OlegHahm
Copy link
Member

pkg/oonf_api/oonf_api/examples/rfc5444_reader_writer/ builds for me on native and on iotlab-m3 if I specify WERROR=0.

@miri64
Copy link
Member Author

miri64 commented Sep 24, 2015

Should be enough for now. I'm not willing to fix other peoples errors right now ;-)

miri64 added a commit that referenced this pull request Sep 24, 2015
@miri64
Merge pull request #3882 from authmillenon/pkg/clean/oonf_api
0008927 
oonf_api: adapt for new sockets
@miri64 miri64 merged commit 0008927 into RIOT-OS:master Sep 24, 2015
@miri64 miri64 deleted the pkg/clean/oonf_api branch September 24, 2015 13:44
@OlegHahm
Copy link
Member

post ACK

@miri64
Copy link
Member Author

miri64 commented Sep 24, 2015

Sorry 😥

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Lotterleben Lotterleben

Labels
Area: network Area: Networking Area: pkg Area: External package ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation
Projects
None yet
Milestone
Release 2015.09
Development

Successfully merging this pull request may close these issues.
4 participants
@miri64 @Lotterleben @haukepetersen @OlegHahm