From b3631ab3e0703f756de46b4424d9a5ac7a6bffd3 Mon Sep 17 00:00:00 2001 From: "Tristan B. Kildaire" Date: Mon, 15 Nov 2021 13:30:18 +0200 Subject: [PATCH] Updated to use stdint.h --- source/libtun/tunctl.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/source/libtun/tunctl.c b/source/libtun/tunctl.c index e48cdb1..7314b19 100644 --- a/source/libtun/tunctl.c +++ b/source/libtun/tunctl.c @@ -20,11 +20,19 @@ #include #include #include +#include -int createTun(char* interfaceName, int iffFlags) +/* TODO: Update types here using stdint */ +uint32_t createTun(char* interfaceName, int32_t iffFlags) { /* TODO: Add all required error checking */ - int tunFD = open("/dev/net/tun", O_RDWR); + int32_t tunFD = open("/dev/net/tun", O_RDWR); + + /* If error */ + if(tunFD < 0) + { + return tunFD; + } /* TUN properties */ struct ifreq interfaceReqData; @@ -38,22 +46,22 @@ int createTun(char* interfaceName, int iffFlags) strcpy(interfaceReqData.ifr_name, interfaceName); /* Attempt to bring up the tun device node */ - int tunStatus = ioctl(tunFD, TUNSETIFF, &interfaceReqData); + int32_t tunStatus = ioctl(tunFD, TUNSETIFF, &interfaceReqData); if(tunStatus < 0) { - tunFD = tunStatus; + tunFD = tunStatus; } return tunFD; } -int destroyTun(int fd) +uint32_t destroyTun(int fd) { return close(fd); } -int tunWrite(int fd, char* data, int length) +uint32_t tunWrite(int fd, char* data, int length) { write(fd, data, length); } @@ -64,7 +72,7 @@ int tunWrite(int fd, char* data, int length) * * (FIXME: For now we just read 20 bytes) */ -int tunRead(int fd, char* data, int amount) +uint32_t tunRead(int fd, char* data, int amount) { return read(fd, data, amount); }