nativenet: Port nativenet for netdev #1732

miri64 · 2014-09-29T12:55:19Z

To test this, run

export BOARD=native
SENDER=0 make -C tests/netdev/ all flash && SENDER=1 make -C tests/netdev/ all flash && make -C tests/netdev/ test

~~Depends on #1492:~~ (it's merged)

* #1680
|\
… …
| |
| * #1448
| |\
* | | #1733
| * | #1732
| | * #1731
| |/
|/
* (master)

miri64 · 2014-10-02T10:35:25Z

Rebased to master

miri64 · 2014-10-06T10:18:03Z

@LudwigOrtmann poke?

LudwigKnuepfer · 2014-10-06T12:41:06Z

Ayeee

LudwigKnuepfer · 2014-10-06T12:49:26Z

Makefile.dep

@@ -96,6 +96,10 @@ ifneq (,$(filter ccn_lite,$(USEMODULE)))
 	USEMODULE += crypto
 endif

+ifneq (,$(filter nativenet,$(USEMODULE)))
+	USEMODULE += netdev_base


The change in https://github.com/RIOT-OS/RIOT/pull/1732/files#diff-2b35e3dab26520778e1991f7041d00a5R3 seems to imply it is still possible to use nativenet without netdev_base..?

c05d6f1 fixes that

LudwigKnuepfer · 2014-10-06T12:56:53Z

I've got wget AND curl installed btw.

./tests/01-interaction.py
Traceback (most recent call last):
  File "/usr/lib/python3.4/site-packages/pexpect/__init__.py", line 972, in read_nonblocking
    s = os.read(self.child_fd, size)
OSError: [Errno 5] Input/output error

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/usr/lib/python3.4/site-packages/pexpect/__init__.py", line 1535, in expect_loop
    c = self.read_nonblocking(self.maxread, timeout)
  File "/usr/lib/python3.4/site-packages/pexpect/__init__.py", line 977, in read_nonblocking
    raise EOF('End Of File (EOF). Exception style platform.')
pexpect.EOF: End Of File (EOF). Exception style platform.

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "./tests/01-interaction.py", line 131, in <module>
    sys.exit(main())
  File "./tests/01-interaction.py", line 25, in main
    receiver.expect(r"RIOT netdev test")
  File "/usr/lib/python3.4/site-packages/pexpect/__init__.py", line 1451, in expect
    timeout, searchwindowsize)
  File "/usr/lib/python3.4/site-packages/pexpect/__init__.py", line 1466, in expect_list
    timeout, searchwindowsize)
  File "/usr/lib/python3.4/site-packages/pexpect/__init__.py", line 1554, in expect_loop
    raise EOF(str(err) + '\n' + str(self))
pexpect.EOF: End Of File (EOF). Exception style platform.
<pexpect.spawn object at 0x7fb1d8ca54a8>
version: 3.3
command: /usr/bin/make
args: ['/usr/bin/make', 'term']
searcher: <pexpect.searcher_re object at 0x7fb1d8caff60>
buffer (last 100 chars): b''
before (last 100 chars): b'udwig/RIOT/tests/netdev/../../Makefile.include:56: *** Neither wget nor curl is installed!.  Stop.\r\n'
after: <class 'pexpect.EOF'>
match: None
match_index: None
exitstatus: 2
flag_eof: True
pid: 9872
child_fd: 3
closed: False
timeout: 5
delimiter: <class 'pexpect.EOF'>
logfile: None
logfile_read: None
logfile_send: None
maxread: 2000
ignorecase: False
searchwindowsize: None
delaybeforesend: 0.05
delayafterclose: 0.1
delayafterterminate: 0.1
Makefile:49: recipe for target 'test' failed
make: *** [test] Error 1

miri64 · 2014-10-06T13:22:17Z

before (last 100 chars): b'udwig/RIOT/tests/netdev/../../Makefile.include:56: *** Neither wget nor curl is installed!. Stop.\r\n'

it says

LudwigKnuepfer · 2014-10-06T13:46:03Z

It's lying.

miri64 · 2014-10-06T15:33:18Z

I'll look into that tomorrow.

miri64 · 2014-10-06T15:37:19Z

But just by this error message I would presume it has something to do with a70ee0f. I don't do anything with neither curl nor wget.

LudwigKnuepfer · 2014-10-06T16:25:47Z

Maybe you mess up the environment ?

miri64 · 2014-10-06T17:23:49Z

Can you give me the output with the following patch?

diff --git a/tests/netdev/tests/01-interaction.py b/tests/netdev/tests/01-interaction.py
index 3f2d66b..fb7037a 100755
--- a/tests/netdev/tests/01-interaction.py
+++ b/tests/netdev/tests/01-interaction.py
@@ -8,6 +8,7 @@

 import os, sys, time
 from pexpect import spawn, TIMEOUT, EOF
+import pprint

 class Abort(Exception):
     pass
@@ -17,9 +18,13 @@ board = os.environ.get('BOARD', 'native')
 DEFAULT_TIMEOUT=5

 def main():
+    pp = pprint.PrettyPrinter(indent=4)
+    pp.pprint(dict(os.environ))
     receiver = spawn("make term", timeout=5, env={"SENDER": '0'})
+    receiver.logfile = sys.stdout
     time.sleep(1)
     sender = spawn("make term", timeout=5, env={"SENDER": '1'})
+    sender.logfile = sys.stdout

     try:
         receiver.expect(r"RIOT netdev test")

LudwigKnuepfer · 2014-10-07T15:51:25Z

(I did, off the record)

LudwigKnuepfer · 2014-10-08T11:54:49Z

cpu/native/net/tap.c

@@ -206,7 +215,7 @@ int _native_marshall_ethernet(uint8_t *framebuf, radio_packet_t *packet)
     * Linux does this on its own, but it doesn't hurt to do it here.
     * As of now only tuntaposx needs this. */
    if (data_len < ETHERMIN) {
-        DEBUG("padding data! (%d -> ", data_len);
+        DEBUG("padding data!(%d -> ", data_len);


that is part of the coding conventions?

No. See dce54c4

LudwigKnuepfer · 2014-10-08T14:56:28Z

drivers/include/netdev/default.h

+#include "nativenet.h"
+
+#ifndef NETDEV_DEFAULT
+#define NETDEV_DEFAULT   (&nativenet_default_dev)


I'm wondering about two things here:

why not use it in tests/netdev/main.c?

wouldn't it make more sense to set this from the device?

To the first point: Like I did here?

To the second: Maybe, but that's only a matter of opinion IMHO

I was wondering about https://github.com/RIOT-OS/RIOT/blob/master/tests/netdev/main.c#L41

ad 2: sure, but if there is a possibility to not care about specific devices in the abstraction layer, it should be taken.

Anyway - 2 is not really part of this PR.

to 1: must have been drunk when I did this. 1 isn't really part of this PR either ;-)

just do it ad 1 ;)

LudwigKnuepfer · 2014-10-09T07:17:54Z

Sorry for commenting in commits...

miri64 · 2014-10-09T07:36:24Z

Fixed it anyways =)

LudwigKnuepfer · 2014-10-09T07:39:35Z

Quite elegantly so by use of reduction =)

LudwigKnuepfer · 2014-10-09T07:39:39Z

ACK

LudwigKnuepfer · 2014-10-09T07:39:59Z

(don't forget to squash)

miri64 · 2014-10-09T07:41:23Z

done and waiting for Travis

LudwigKnuepfer · 2014-10-09T07:41:56Z

Maybe I'll have another look ... ;) (just kidding)

nativenet: Port nativenet for netdev

miri64 force-pushed the netdev-nativenet branch from 2b25c99 to abb67a1 Compare September 29, 2014 13:01

LudwigKnuepfer added the State: waiting for other PR State: The PR requires another PR to be merged first label Sep 29, 2014

miri64 added Area: network Area: Networking Platform: native Platform: This PR/issue effects the native platform Process: API change Integration Process: PR contains or issue proposes an API change. Should be handled with care. labels Sep 29, 2014

miri64 added this to the Release NEXT MAJOR milestone Sep 29, 2014

miri64 assigned LudwigKnuepfer Sep 29, 2014

This was referenced Sep 29, 2014

sys: net: Initial import of a general interface to a network protocol #1448

Merged

sixlowpan: Clean-up, take IPv6 out, and refactor to netapi #1680

Closed

sys: net: Initial import of a UART network interface #1454

Closed

miri64 force-pushed the netdev-nativenet branch from abb67a1 to 3ef4122 Compare October 1, 2014 17:26

miri64 mentioned this pull request Oct 1, 2014

drivers: Introduce a general interface for network device drivers #1492

Merged

5 tasks

miri64 force-pushed the netdev-nativenet branch from 3ef4122 to 80ea035 Compare October 2, 2014 10:32

miri64 removed the State: waiting for other PR State: The PR requires another PR to be merged first label Oct 2, 2014

miri64 force-pushed the netdev-nativenet branch from 80ea035 to ed5cbe9 Compare October 2, 2014 11:16

miri64 added the State: waiting for other PR State: The PR requires another PR to be merged first label Oct 2, 2014

miri64 force-pushed the netdev-nativenet branch 2 times, most recently from ab486b6 to beab588 Compare October 3, 2014 13:14

miri64 removed the State: waiting for other PR State: The PR requires another PR to be merged first label Oct 3, 2014

LudwigKnuepfer reviewed Oct 6, 2014
View reviewed changes

miri64 force-pushed the netdev-nativenet branch 3 times, most recently from f7b35a9 to 45d4cf0 Compare October 8, 2014 10:37

LudwigKnuepfer reviewed Oct 8, 2014
View reviewed changes

LudwigKnuepfer added the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label Oct 8, 2014

LudwigKnuepfer reviewed Oct 8, 2014
View reviewed changes

miri64 added 3 commits October 9, 2014 09:40

nativenet: Apply coding conventions

333c49a

nativenet: Supply net_dev_t support for nativenet

2647858

netdev.tests: Remove unneccessary #ifndef path

bf21a9e

miri64 force-pushed the netdev-nativenet branch from 962cd87 to bf21a9e Compare October 9, 2014 07:41

miri64 added a commit that referenced this pull request Oct 9, 2014

Merge pull request #1732 from authmillenon/netdev-nativenet

56f8de8

nativenet: Port nativenet for netdev

miri64 merged commit 56f8de8 into RIOT-OS:master Oct 9, 2014

miri64 deleted the netdev-nativenet branch October 9, 2014 08:46

OlegHahm removed the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label Oct 9, 2014

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

nativenet: Port nativenet for netdev #1732

nativenet: Port nativenet for netdev #1732

miri64 commented Sep 29, 2014

miri64 commented Oct 2, 2014

miri64 commented Oct 6, 2014

LudwigKnuepfer commented Oct 6, 2014

LudwigKnuepfer Oct 6, 2014

miri64 Oct 6, 2014

LudwigKnuepfer commented Oct 6, 2014

miri64 commented Oct 6, 2014

LudwigKnuepfer commented Oct 6, 2014

miri64 commented Oct 6, 2014

miri64 commented Oct 6, 2014

LudwigKnuepfer commented Oct 6, 2014

miri64 commented Oct 6, 2014

LudwigKnuepfer commented Oct 7, 2014

LudwigKnuepfer Oct 8, 2014

miri64 Oct 8, 2014

LudwigKnuepfer Oct 8, 2014

miri64 Oct 8, 2014

miri64 Oct 8, 2014

LudwigKnuepfer Oct 9, 2014

LudwigKnuepfer Oct 9, 2014

LudwigKnuepfer Oct 9, 2014

miri64 Oct 9, 2014

LudwigKnuepfer Oct 9, 2014

LudwigKnuepfer commented Oct 9, 2014

miri64 commented Oct 9, 2014

LudwigKnuepfer commented Oct 9, 2014

LudwigKnuepfer commented Oct 9, 2014

LudwigKnuepfer commented Oct 9, 2014

miri64 commented Oct 9, 2014

LudwigKnuepfer commented Oct 9, 2014

nativenet: Port nativenet for netdev #1732

nativenet: Port nativenet for netdev #1732

Conversation

miri64 commented Sep 29, 2014

miri64 commented Oct 2, 2014

miri64 commented Oct 6, 2014

LudwigKnuepfer commented Oct 6, 2014

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LudwigKnuepfer commented Oct 6, 2014

miri64 commented Oct 6, 2014

LudwigKnuepfer commented Oct 6, 2014

miri64 commented Oct 6, 2014

miri64 commented Oct 6, 2014

LudwigKnuepfer commented Oct 6, 2014

miri64 commented Oct 6, 2014

LudwigKnuepfer commented Oct 7, 2014

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LudwigKnuepfer commented Oct 9, 2014

miri64 commented Oct 9, 2014

LudwigKnuepfer commented Oct 9, 2014

LudwigKnuepfer commented Oct 9, 2014

LudwigKnuepfer commented Oct 9, 2014

miri64 commented Oct 9, 2014

LudwigKnuepfer commented Oct 9, 2014