j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Convert bitfields to integers in a safe way.

Browse source 
This is commit eb391c52ee redone, but without the
non-standard anonymous union.
This commit is contained in:
Guus Sliepen 2009-09-09 12:04:08 +02:00
parent 9b394bc887
commit 81afa26e4a
4 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/utils.c
View file

@ -100,3 +100,10 @@ const char *winerror(int err) {
}
#endif
unsigned int bitfield_to_int(void *bitfield, size_t size) {
unsigned int value = 0;
if(size > sizeof value)
size = sizeof value;
memcpy(&value, bitfield, size);
return value;
}

2
lib/utils.h
View file

@ -43,4 +43,6 @@ extern const char *winerror(int);
#define strerror(x) ((x)>0?strerror(x):winerror(GetLastError()))
#endif
extern unsigned int bitfield_to_int(void *bitfield, size_t size);
#endif /* __TINC_UTILS_H__ */

2
src/connection.c
View file

@ -144,7 +144,7 @@ void dump_connections(void)
for(node = connection_tree->head; node; node = node->next) {
c = node->data;
logger(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x outbuf %d/%d/%d"),
c->name, c->hostname, c->options, c->socket, *(uint32_t *)&c->status,
c->name, c->hostname, c->options, c->socket, bitfield_to_int(&c->status, sizeof c->status),
c->outbufsize, c->outbufstart, c->outbuflen);
}

2
src/net.c
View file

@ -251,7 +251,7 @@ static void check_dead_connections(void)
} else {
if(c->status.remove) {
logger(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."),
c->name, c->hostname, *(uint32_t *)&c->status);
c->name, c->hostname, bitfield_to_int(&c->status, sizeof c->status));
connection_del(c);
continue;
}