1) rename pkt_cleanup() to packet_destroy()
2) add struct pkt_hdr parameter (in preparation for proper init/destroy)
3) add packet_destroy() to cmd_capture(), hostmon() and
packet_size_breakdown() (again in preparation for proper init/destroy)
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/capture-pkt.c | 2 ++
src/detstats.c | 2 +-
src/hostmon.c | 2 ++
src/ifstats.c | 2 +-
src/itrafmon.c | 2 +-
src/packet.c | 2 +-
src/packet.h | 2 +-
src/pktsize.c | 2 ++
src/serv.c | 2 +-
9 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/capture-pkt.c b/src/capture-pkt.c
index 25e9f2b..93f0b58 100644
--- a/src/capture-pkt.c
+++ b/src/capture-pkt.c
@@ -69,6 +69,8 @@ int cmd_capture(int argc, char **argv)
}
printf("\n");
+ packet_destroy(&pkt);
+
close(fd);
if (fp)
diff --git a/src/detstats.c b/src/detstats.c
index 0f96e9b..7377161 100644
--- a/src/detstats.c
+++ b/src/detstats.c
@@ -616,7 +616,7 @@ err:
del_panel(statpanel);
delwin(statwin);
strcpy(current_logfile, "");
- pkt_cleanup();
+ packet_destroy(&pkt);
update_panels();
doupdate();
}
diff --git a/src/hostmon.c b/src/hostmon.c
index 51267ef..78315fe 100644
--- a/src/hostmon.c
+++ b/src/hostmon.c
@@ -1017,6 +1017,8 @@ err:
doupdate();
destroyethtab(&table);
+ packet_destroy(&pkt);
+
free_eth_desc(elist);
free_eth_desc(flist);
diff --git a/src/ifstats.c b/src/ifstats.c
index b7eeb7a..cc1e2ad 100644
--- a/src/ifstats.c
+++ b/src/ifstats.c
@@ -636,7 +636,7 @@ err:
fclose(logfile);
}
destroyiflist(table.head);
- pkt_cleanup();
+ packet_destroy(&pkt);
strcpy(current_logfile, "");
}
diff --git a/src/itrafmon.c b/src/itrafmon.c
index 8bf6c3a..2400e60 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -1178,7 +1178,7 @@ err:
delwin(statwin);
destroytcptable(&table);
destroyothptable(&othptbl);
- pkt_cleanup();
+ packet_destroy(&pkt);
if (logging) {
signal(SIGUSR1, SIG_DFL);
diff --git a/src/packet.c b/src/packet.c
index afa767f..ad6fb61 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -342,7 +342,7 @@ int packet_init(struct pkt_hdr *pkt)
return 0; /* all O.K. */
}
-void pkt_cleanup(void)
+void packet_destroy(struct pkt_hdr *pkt)
{
destroyfraglist();
}
diff --git a/src/packet.h b/src/packet.h
index e8811e6..1cdbe76 100644
--- a/src/packet.h
+++ b/src/packet.h
@@ -66,6 +66,6 @@ int packet_process(struct pkt_hdr *pkt, unsigned int *total_br,
in_port_t *sport, in_port_t *dport,
int match_opposite, int v6inv4asv6);
int packet_init(struct pkt_hdr *pkt);
-void pkt_cleanup(void);
+void packet_destroy(struct pkt_hdr *pkt);
#endif /* IPTRAF_NG_PACKET_H */
diff --git a/src/pktsize.c b/src/pktsize.c
index 8206919..413d768 100644
--- a/src/pktsize.c
+++ b/src/pktsize.c
@@ -318,6 +318,8 @@ void packet_size_breakdown(char *ifname, time_t facilitytime)
update_size_distrib(pkt.pkt_len, brackets, interval);
} while (!exitloop);
+ packet_destroy(&pkt);
+
err_close:
close(fd);
err:
diff --git a/src/serv.c b/src/serv.c
index eecb34a..9e57220 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -1069,7 +1069,7 @@ err:
doupdate();
destroyportlist(&list);
destroyporttab(ports);
- pkt_cleanup();
+ packet_destroy(&pkt);
strcpy(current_logfile, "");
}
--
1.9.1