diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-01-05 11:30:16 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-01-07 01:09:35 +0000 |
| commit | f410121cf2a94ef06fa42863352a77ba42a5fdf7 (patch) | |
| tree | d0c6acefca85ec9dbb758950cc6d48c79252970c /ui/cli | |
| parent | 7888c43a5711710222343ee8fca8c5e500b5ed3a (diff) | |
| download | wireshark-f410121cf2a94ef06fa42863352a77ba42a5fdf7.tar.gz | |
Remove some unnecessary dependencies and cleanup some code
No need for the GTK dependency on dissectors/packet-ipv6.h.
Add the stream_addr typedef in follow.h to make some code simpler.
Change-Id: I1cf906f58734a90263141362f2da33a140f93533
Reviewed-on: https://code.wireshark.org/review/13063
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/cli')
| -rw-r--r-- | ui/cli/tap-follow.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ui/cli/tap-follow.c b/ui/cli/tap-follow.c index 95473b2939..ae757261af 100644 --- a/ui/cli/tap-follow.c +++ b/ui/cli/tap-follow.c @@ -328,7 +328,7 @@ follow_common_stream_packet( if (tvbp->length > 0) { - memcpy(sc.src_addr, pip->net_src.data, pip->net_src.len); + memcpy(&sc.src_addr, pip->net_src.data, pip->net_src.len); sc.src_port = pip->srcport; sc.dlen = tvbp->length; sc.packet_num = pip->fd->num; @@ -391,7 +391,7 @@ followSslPacket( if (length > 0) { - memcpy(sc.src_addr, pip->net_src.data, pip->net_src.len); + memcpy(&sc.src_addr, pip->net_src.data, pip->net_src.len); sc.src_port = pip->srcport; sc.dlen = length; sc.packet_num = pip->fd->num; @@ -518,15 +518,15 @@ followDraw( if ((fp->type == type_TCP) || (fp->type == type_UDP)) { - static const guint8 ip_zero[MAX_IPADDR_LEN] = {0}; + static const stream_addr ip_zero = {0}; follow_stats_t stats; address_type type; follow_stats(&stats); if (stats.port[0] == 0 && stats.port[1] == 0 && - memcmp(stats.ip_address[0], ip_zero, sizeof ip_zero) == 0 && - memcmp(stats.ip_address[1], ip_zero, sizeof ip_zero) == 0) + memcmp(&stats.ip_address[0], &ip_zero, sizeof ip_zero) == 0 && + memcmp(&stats.ip_address[1], &ip_zero, sizeof ip_zero) == 0) { type = AT_NONE; len = 0; @@ -544,7 +544,7 @@ followDraw( for (node = 0; node < 2; node++) { - memcpy(fp->addrBuf[node], stats.ip_address[node], len); + memcpy(fp->addrBuf[node], &stats.ip_address[node], len); set_address(&fp->addr[node], type, len, fp->addrBuf[node]); fp->port[node] = stats.port[node]; } @@ -559,7 +559,7 @@ followDraw( { /* no data */ sc.dlen = 0; - memcpy(sc.src_addr, fp->addr[0].data, fp->addr[0].len) ; + memcpy(&sc.src_addr, fp->addr[0].data, fp->addr[0].len) ; sc.src_port = fp->port[0]; break; } @@ -571,7 +571,7 @@ followDraw( } /* node 0 is source of first chunk with data */ - if (memcmp(sc.src_addr, fp->addr[0].data, fp->addr[0].len) == 0 && + if (memcmp(&sc.src_addr, fp->addr[0].data, fp->addr[0].len) == 0 && sc.src_port == fp->port[0]) { addr[0] = &fp->addr[0]; @@ -608,7 +608,7 @@ followDraw( while (chunk <= fp->chunkMax) { - node = (memcmp(addr[0]->data, sc.src_addr, addr[0]->len) == 0 && + node = (memcmp(addr[0]->data, &sc.src_addr, addr[0]->len) == 0 && port[0] == sc.src_port) ? 0 : 1; if (chunk < fp->chunkMin) |