Changeset 746

Timestamp:

04/27/06 00:48:42 (7 years ago)

Author:

perry

Message:

Fix some memory leaks
Add new destroy for bpf filters
Properly initialise memory for wag

Location:

trunk/lib

Files:

• format_erf.c (modified) (1 diff)
• format_pcap.c (modified) (3 diffs)
• format_wag.c (modified) (2 diffs)
• libtrace.h (modified) (1 diff)
• trace.c (modified) (2 diffs)

trunk/lib/format_erf.c

@@ -382 +382 @@
 
 static int erf_init_output(libtrace_out_t *libtrace) {
-        libtrace->format_data = calloc(1,sizeof(struct erf_format_data_out_t));
+        libtrace->format_data = malloc(sizeof(struct erf_format_data_out_t));
 
         OPTIONS.erf.level = 0;

trunk/lib/format_pcap.c

@@ -235 +235 @@
 }
 
-static int pcapint_pause_input(libtrace_t *libtrace)
+static int pcap_pause_input(libtrace_t *libtrace)
 {
         pcap_close(INPUT.pcap);
@@ -242 +242 @@
 }
 
+
 static int pcap_fin_input(libtrace_t *libtrace) 
 {
+        pcap_close(INPUT.pcap);
         free(libtrace->format_data);
         return 0; /* success */
@@ -554 +556 @@
         pcapint_config_input,           /* config_input */
         pcapint_start_input,            /* start_input */
-        pcapint_pause_input,            /* pause_input */
+        pcap_pause_input,               /* pause_input */
         pcapint_init_output,            /* init_output */
         NULL,                           /* config_output */

trunk/lib/format_wag.c

@@ -116 +116 @@
 static int wtf_init_input(struct libtrace_t *libtrace) 
 {
-        libtrace->format_data = malloc(sizeof(struct wag_format_data_t));
+        libtrace->format_data = calloc(1,sizeof(struct wag_format_data_t));
         return 0;
 }
@@ -133 +133 @@
 
 static int wtf_init_output(struct libtrace_out_t *libtrace) {
-        libtrace->format_data = calloc(1,sizeof(struct wag_format_data_out_t));
+        libtrace->format_data = malloc(sizeof(struct wag_format_data_out_t));
 
         OUTPUT.file = 0;

trunk/lib/libtrace.h

@@ -1123 +1123 @@
 DLLEXPORT int trace_bpf_filter(libtrace_filter_t *filter,
                 const libtrace_packet_t *packet);
+
+/** destory of BPF filter
+ * @param filter        the filter opaque pointer
+ * Deallocate all the resources associated with a BPF filter
+ */
+DLLEXPORT void trace_destroy_bpf(libtrace_filter_t *filter);
 /*@}*/
 

trunk/lib/trace.c

@@ -922 +922 @@
 DLLEXPORT struct libtrace_filter_t *trace_bpf_setfilter(const char *filterstring) {
 #if HAVE_BPF
-        struct libtrace_filter_t *filter = (struct libtrace_filter_t*)
+        libtrace_filter_t *filter = (struct libtrace_filter_t*)
                                 malloc(sizeof(struct libtrace_filter_t));
         filter->filterstring = strdup(filterstring);
@@ -931 +931 @@
         return 0;
 #endif
+}
+
+DLLEXPORT void trace_destroy_bpf(libtrace_filter_t *filter)
+{
+        free(filter->filterstring);
+        if (filter->flag)
+                pcap_freecode(&filter->filter);
+        free(filter);
 }