riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

native: net: Make _native_tap_fd static

Browse Source 
One global variable less is always good.
This commit is contained in:
Benoît Canet 2015-07-19 11:21:26 +02:00
parent 88a81a3753
commit 800b057fac
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cpu/native/include/tap.h
View File

@ -36,7 +36,11 @@ extern "C" {
*/ */
int tap_init(char *name); int tap_init(char *name);
extern int _native_tap_fd; /**
* Close tap device
*/
void tap_cleanup(void);
extern unsigned char _native_tap_mac[ETHER_ADDR_LEN]; extern unsigned char _native_tap_mac[ETHER_ADDR_LEN];
struct nativenet_header { struct nativenet_header {

4
cpu/native/native_cpu.c
View File

@ -73,9 +73,7 @@ int reboot_arch(int mode)
/* TODO: close stdio fds */ /* TODO: close stdio fds */
#endif #endif
#ifdef MODULE_NATIVENET #ifdef MODULE_NATIVENET
if (_native_tap_fd != -1) { tap_cleanup();
real_close(_native_tap_fd);
}
#endif #endif
if (real_execve(_native_argv[0], _native_argv, NULL) == -1) { if (real_execve(_native_argv[0], _native_argv, NULL) == -1) {

11
cpu/native/net/tap.c
View File

@ -351,4 +351,15 @@ int tap_init(char *name)
DEBUG("RIOT native tap initialized.\n"); DEBUG("RIOT native tap initialized.\n");
return _native_tap_fd; return _native_tap_fd;
} }
void tap_cleanup(void)
{
if (_native_tap_fd == -1) {
return;
}
real_close(_native_tap_fd);
_native_tap_fd = -1;
}
/** @} */ /** @} */