Don't forget BSD..

Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2018-03-19 09:53:43 +00:00
parent 7999344c39
commit 6e75f4282d
2 changed files with 8 additions and 2 deletions

View File

@@ -7,6 +7,12 @@ struct ip_common {
uint8_t proto; uint8_t proto;
}; };
static inline uint8_t
ip_get_version(const uint8_t *data)
{
return data[0] >> 4;
}
static inline uint16_t static inline uint16_t
ip_read16(const uint8_t *src) ip_read16(const uint8_t *src)
{ {
@@ -21,7 +27,7 @@ ip_get_common(struct ip_common *ic, const uint8_t *data, size_t size)
if (size < 20) if (size < 20)
return 1; return 1;
switch (data[0] >> 4) { switch (ip_get_version(data)) {
case 4: case 4:
ic->tc = data[1]; ic->tc = data[1];
ic->proto = data[9]; ic->proto = data[9];

View File

@@ -224,7 +224,7 @@ tun_write(int fd, const void *data, size_t size)
#ifdef GT_BSD_TUN #ifdef GT_BSD_TUN
uint32_t family; uint32_t family;
switch (ip_get_version(data, size)) { switch (ip_get_version(data)) {
case 4: case 4:
family = htonl(AF_INET); family = htonl(AF_INET);
break; break;