mark/iftop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes for type-punned pointers - Henne Vogelsang <hvogel@suse.de>

Browse Source
This commit is contained in:
pdw
2004-02-05 22:58:06 +00:00
parent f123c4f1f7
commit 2fd7012129
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
iftop.c
View File

@@ -187,6 +187,10 @@ static void handle_ip_packet(struct ip* iptr, int hw_dir)
{ {
int direction = 0; /* incoming */ int direction = 0; /* incoming */
history_type* ht; history_type* ht;
union {
history_type **ht_pp;
void **void_pp;
} u_ht = { &ht };
addr_pair ap; addr_pair ap;
int len; int len;
@@ -261,7 +265,7 @@ static void handle_ip_packet(struct ip* iptr, int hw_dir)
resolve(&iptr->ip_dst, NULL, 0); resolve(&iptr->ip_dst, NULL, 0);
resolve(&iptr->ip_src, NULL, 0); resolve(&iptr->ip_src, NULL, 0);
if(hash_find(history, &ap, (void**)&ht) == HASH_STATUS_KEY_NOT_FOUND) { if(hash_find(history, &ap, u_ht.void_pp) == HASH_STATUS_KEY_NOT_FOUND) {
ht = history_create(); ht = history_create();
hash_insert(history, &ap, ht); hash_insert(history, &ap, ht);
} }

12
resolver.c
View File

@@ -392,7 +392,11 @@ void resolver_worker(void* ptr) {
if(hostname != NULL) { if(hostname != NULL) {
char* old; char* old;
if(hash_find(ns_hash, &addr, (void**)&old) == HASH_STATUS_OK) { union {
char **ch_pp;
void **void_pp;
} u_old = { &old };
if(hash_find(ns_hash, &addr, u_old.void_pp) == HASH_STATUS_OK) {
hash_delete(ns_hash, &addr); hash_delete(ns_hash, &addr);
xfree(old); xfree(old);
} }
@@ -424,13 +428,17 @@ void resolver_initialise() {
void resolve(struct in_addr* addr, char* result, int buflen) { void resolve(struct in_addr* addr, char* result, int buflen) {
char* hostname; char* hostname;
union {
char **ch_pp;
void **void_pp;
} u_hostname = { &hostname };
int added = 0; int added = 0;
if(options.dnsresolution == 1) { if(options.dnsresolution == 1) {
pthread_mutex_lock(&resolver_queue_mutex); pthread_mutex_lock(&resolver_queue_mutex);
if(hash_find(ns_hash, addr, (void**)&hostname) == HASH_STATUS_OK) { if(hash_find(ns_hash, addr, u_hostname.void_pp) == HASH_STATUS_OK) {
/* Found => already resolved, or on the queue */ /* Found => already resolved, or on the queue */
} }
else { else {

13
ui.c
View File

@@ -472,6 +472,10 @@ void analyse_data() {
while(hash_next_item(history, &n) == HASH_STATUS_OK) { while(hash_next_item(history, &n) == HASH_STATUS_OK) {
history_type* d = (history_type*)n->rec; history_type* d = (history_type*)n->rec;
host_pair_line* screen_line; host_pair_line* screen_line;
union {
host_pair_line **h_p_l_pp;
void **void_pp;
} u_screen_line = { &screen_line };
addr_pair ap; addr_pair ap;
int i; int i;
int tsent, trecv; int tsent, trecv;
@@ -500,7 +504,7 @@ void analyse_data() {
} }
if(hash_find(screen_hash, &ap, (void**)&screen_line) == HASH_STATUS_KEY_NOT_FOUND) { if(hash_find(screen_hash, &ap, u_screen_line.void_pp) == HASH_STATUS_KEY_NOT_FOUND) {
screen_line = xcalloc(1, sizeof *screen_line); screen_line = xcalloc(1, sizeof *screen_line);
hash_insert(screen_hash, &ap, screen_line); hash_insert(screen_hash, &ap, screen_line);
screen_line->ap = ap; screen_line->ap = ap;
@@ -534,6 +538,11 @@ void sprint_host(char * line, struct in_addr* addr, unsigned int port, unsigned
char hostname[HOSTNAME_LENGTH]; char hostname[HOSTNAME_LENGTH];
char service[HOSTNAME_LENGTH]; char service[HOSTNAME_LENGTH];
char* s_name; char* s_name;
union {
char **ch_pp;
void **void_pp;
} u_s_name = { &s_name };
ip_service skey; ip_service skey;
int left; int left;
if(addr->s_addr == 0) { if(addr->s_addr == 0) {
@@ -550,7 +559,7 @@ void sprint_host(char * line, struct in_addr* addr, unsigned int port, unsigned
if(port != 0) { if(port != 0) {
skey.port = port; skey.port = port;
skey.protocol = protocol; skey.protocol = protocol;
if(options.portresolution && hash_find(service_hash, &skey, (void**)&s_name) == HASH_STATUS_OK) { if(options.portresolution && hash_find(service_hash, &skey, u_s_name.void_pp) == HASH_STATUS_OK) {
snprintf(service, HOSTNAME_LENGTH, ":%s", s_name); snprintf(service, HOSTNAME_LENGTH, ":%s", s_name);
} }
else { else {