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.

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

native: unify and simplify usage of tapsetup script #3182

Merged
merged 2 commits into from
Aug 14, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,12 @@ Its features comprise
If you compile RIOT for the native cpu and include the nativenet module, you can specify a network interface like this: `PORT=tap0 make term`

#### SETTING UP A TAP NETWORK
There is a shellscript in `RIOT/cpu/native` called `tapsetup.sh` which you can use to create a network of tap interfaces.
There is a shellscript in `RIOT/dist/tools/tapsetup` called `tapsetup` which you can use to create a network of tap interfaces.

*USAGE*
To create a bridge and two (or count at your option) tap interfaces:
./tapsetup.sh create [count]

./dist/tools/tapsetup/tapsetup [-c [<count>]]

## CONTRIBUTE

Expand Down
29 changes: 8 additions & 21 deletions cpu/native/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,36 +45,23 @@ module, you need to specify a network interface like this:
Setting Up A Tap Network
========================

There is a shellscript in RIOT/cpu/native called `tapsetup.sh` which you
There is a shellscript in RIOT/dist/tools/tapsetup called `tapsetup` which you
can use to create a network of tap interfaces.

Usage:
To create a bridge and two (or count at your option) tap interfaces:

./tapsetup.sh create [count]
../../dist/tools/tapsetup/tapsetup [-c [<count>]]

To delete the bridge and all tap interfaces:

./tapsetup.sh delete


OSX Tap Networking
==================

For tun/tap networking in OSX you will need:
http://tuntaposx.sourceforge.net/

For OSX there is a separate script called `tapsetup-osx.sh`.
Run it, (it instructs you to start the RIOT instances).
In contrast to Linux you will need to run `tapsetup-osx.sh delete`
after killing your instances and rerun `tapsetup-osx.sh create` before
restarting.
On OSX you need to start the RIOT instance at some point during the script's
execution. The script will instruct you when to do that.

To delete the bridge and all tap interfaces:

FreeBSD Tap Networking
======================
../../dist/tools/tapsetup/tapsetup -d

For FreeBSD there is a separate script called `tapsetup-freebsd.sh`.
For OSX you **have** to run this after killing your RIOT instance and rerun
`../../dist/tools/tapsetup [-c [<count>]]` before restarting.


Daemonization
Expand Down
54 changes: 0 additions & 54 deletions cpu/native/tapsetup-freebsd.sh

This file was deleted.

47 changes: 0 additions & 47 deletions cpu/native/tapsetup-osx.sh

This file was deleted.

58 changes: 0 additions & 58 deletions cpu/native/tapsetup.sh

This file was deleted.

Loading