miegl/glorytun
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Adrien Gallouët
2017-01-04 14:24:30 +00:00
parent c591a4d3cc
commit 8c8715187b
5 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ip.h
View File

@@ -10,8 +10,8 @@ struct ip_common {
uint16_t size; uint16_t size;
}; };
_pure_ _pure_ static inline uint8_t
static inline uint8_t ip_get_version (const uint8_t *data, size_t size) ip_get_version(const uint8_t *data, size_t size)
{ {
if (size < 20) if (size < 20)
return 0; return 0;
@@ -19,7 +19,8 @@ static inline uint8_t ip_get_version (const uint8_t *data, size_t size)
return data[0] >> 4; return data[0] >> 4;
} }
static inline int ip_get_common (struct ip_common *ic, const uint8_t *data, size_t size) static inline int
ip_get_common(struct ip_common *ic, const uint8_t *data, size_t size)
{ {
ic->version = ip_get_version(data, size); ic->version = ip_get_version(data, size);

2
src/main.c
View File

@@ -386,7 +386,7 @@ main(int argc, char **argv)
size_t size = 0; size_t size = 0;
while (sizeof(buf) - size >= gt.mtu) { while (sizeof(buf) - size >= gt.mtu) {
const ssize_t r = tun_read(tun_fd, &buf[size], const int r = tun_read(tun_fd, &buf[size],
sizeof(buf) - size); sizeof(buf) - size);
if (r <= 0 || r > gt.mtu) if (r <= 0 || r > gt.mtu)

18
src/str.h
View File

@@ -2,7 +2,8 @@
#include "common.h" #include "common.h"
static inline size_t str_cpy (char *restrict dst, const char *restrict src, size_t len) static inline size_t
str_cpy(char *restrict dst, const char *restrict src, size_t len)
{ {
if (!dst || !src) if (!dst || !src)
return 0; return 0;
@@ -17,14 +18,14 @@ static inline size_t str_cpy (char *restrict dst, const char *restrict src, size
return i; return i;
} }
_pure_ _pure_ static inline int
static inline int str_empty (const char *restrict str) str_empty(const char *restrict str)
{ {
return !str || !str[0]; return !str || !str[0];
} }
_pure_ _pure_ static inline size_t
static inline size_t str_cmp (const char *restrict sa, const char *restrict sb) str_cmp(const char *restrict sa, const char *restrict sb)
{ {
if (!sa || !sb) if (!sa || !sb)
return 1; return 1;
@@ -38,8 +39,8 @@ static inline size_t str_cmp (const char *restrict sa, const char *restrict sb)
return i + 1; return i + 1;
} }
_pure_ _pure_ static inline size_t
static inline size_t str_len (const char *restrict str) str_len(const char *restrict str)
{ {
if (!str) if (!str)
return 0; return 0;
@@ -47,7 +48,8 @@ static inline size_t str_len (const char *restrict str)
return strlen(str); return strlen(str);
} }
static inline char *str_cat (const char **strs, size_t count) static inline char *
str_cat(const char **strs, size_t count)
{ {
size_t size = 1; size_t size = 1;

4
src/tun.c
View File

@@ -158,7 +158,7 @@ tun_create(char *dev_name, char **ret_name)
return fd; return fd;
} }
ssize_t int
tun_read(int fd, void *data, size_t size) tun_read(int fd, void *data, size_t size)
{ {
if (!size) if (!size)
@@ -192,7 +192,7 @@ tun_read(int fd, void *data, size_t size)
#endif #endif
} }
ssize_t int
tun_write(int fd, const void *data, size_t size) tun_write(int fd, const void *data, size_t size)
{ {
if (!size) if (!size)

6
src/tun.h
View File

@@ -1,8 +1,6 @@
#pragma once #pragma once
#include <unistd.h>
int tun_create (char *, char **); int tun_create (char *, char **);
ssize_t tun_read (int, void *, size_t); int tun_read (int, void *, size_t);
ssize_t tun_write (int, const void *, size_t); int tun_write (int, const void *, size_t);
int tun_set_mtu (char *, int); int tun_set_mtu (char *, int);