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

Do not call ip_get_version() again and again

Browse Source
This commit is contained in:
angt
2015-12-14 18:37:50 +01:00
parent ffa549e444
commit 78ba4c9a59
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ip-static.h
View File

@@ -12,9 +12,9 @@ static inline int ip_get_version (const uint8_t *data, size_t size)
} }
_pure_ _pure_
static inline ssize_t ip_get_size (const uint8_t *data, size_t size) static inline ssize_t ip_get_size (const int ip_version, const uint8_t *data, size_t size)
{ {
switch (ip_get_version(data, size)) { switch (ip_version) {
case 4: case 4:
return ((data[2]<<8)|data[3]); return ((data[2]<<8)|data[3]);
case 6: case 6:
@@ -27,9 +27,9 @@ static inline ssize_t ip_get_size (const uint8_t *data, size_t size)
} }
_pure_ _pure_
static inline ssize_t ip_get_proto (const uint8_t *data, size_t size) static inline ssize_t ip_get_proto (const int ip_version, const uint8_t *data, size_t size)
{ {
switch (ip_get_version(data, size)) { switch (ip_version) {
case 4: case 4:
return data[9]; return data[9];
case 6: case 6:
@@ -42,9 +42,9 @@ static inline ssize_t ip_get_proto (const uint8_t *data, size_t size)
} }
_pure_ _pure_
static inline ssize_t ip_get_hdr_size (const uint8_t *data, size_t size) static inline ssize_t ip_get_hdr_size (const int ip_version, const uint8_t *data, size_t size)
{ {
switch (ip_get_version(data, size)) { switch (ip_version) {
case 4: case 4:
return (data[0]&0xF)<<2; return (data[0]&0xF)<<2;
case 6: case 6:

16
src/main.c
View File

@@ -491,11 +491,10 @@ static int gt_decrypt (struct crypto_ctx *ctx, buffer_t *dst, buffer_t *src)
return 0; return 0;
} }
static void gt_print_hdr (uint8_t *data, size_t ip_size, const char *sockname) static void gt_print_hdr (const int ip_version, uint8_t *data, size_t ip_size, const char *sockname)
{ {
const int ip_version = ip_get_version(data, GT_MTU_MAX); const ssize_t ip_proto = ip_get_proto(ip_version, data, ip_size);
const ssize_t ip_proto = ip_get_proto(data, GT_MTU_MAX); const ssize_t ip_hdr_size = ip_get_hdr_size(ip_version, data, ip_size);
const ssize_t ip_hdr_size = ip_get_hdr_size(data, GT_MTU_MAX);
char ip_src[33]; char ip_src[33];
char ip_dst[33]; char ip_dst[33];
@@ -943,7 +942,8 @@ int main (int argc, char **argv)
break; break;
} }
const ssize_t ip_size = ip_get_size(data, GT_MTU_MAX); const int ip_version = ip_get_version(data, GT_MTU_MAX);
const ssize_t ip_size = ip_get_size(ip_version, data, GT_MTU_MAX);
if _0_(ip_size<=0) if _0_(ip_size<=0)
continue; continue;
@@ -956,7 +956,7 @@ int main (int argc, char **argv)
} }
if _0_(debug) if _0_(debug)
gt_print_hdr(data, ip_size, sockname); gt_print_hdr(ip_version, data, ip_size, sockname);
blks[blk_write++].size = r; blks[blk_write++].size = r;
blk_count++; blk_count++;
@@ -1031,7 +1031,9 @@ int main (int argc, char **argv)
} }
size_t size = buffer_read_size(&tun.write); size_t size = buffer_read_size(&tun.write);
ssize_t ip_size = ip_get_size(tun.write.read, size);
const int ip_version = ip_get_version(tun.write.read, size);
ssize_t ip_size = ip_get_size(ip_version, tun.write.read, size);
if _0_(!ip_size) { if _0_(!ip_size) {
gt_log("%s: bad packet!\n", sockname); gt_log("%s: bad packet!\n", sockname);