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

Fix conversion in src/ip.h

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2019-04-02 10:38:54 +00:00
parent e338626c46
commit cd2ee2a7af
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ip.h
View File

@@ -21,9 +21,7 @@ struct ip_common {
static inline int static inline int
ip_read16(const uint8_t *src) ip_read16(const uint8_t *src)
{ {
uint16_t ret = src[1]; return ((int)src[1]) | (((int)src[0]) << 8);
ret |= ((uint16_t)src[0]) << 8;
return (int)ret;
} }
static inline uint8_t static inline uint8_t
@@ -75,7 +73,7 @@ ip_get_common(struct ip_common *ic, const uint8_t *data, int size)
} }
break; break;
case 6: case 6:
ic->tc = ((data[0] & 0xF) << 4) | (data[1] >> 4); ic->tc = (uint8_t)((data[0] << 4) | (data[1] >> 4));
ic->proto = data[6]; ic->proto = data[6];
if (size == ip_read16(&data[4]) + 40) { if (size == ip_read16(&data[4]) + 40) {
memcpy(ic->src.v6, &data[8], sizeof(ic->src.v6)); memcpy(ic->src.v6, &data[8], sizeof(ic->src.v6));