Changeset d5879cc for lib/trace.c

Timestamp:

02/27/06 16:40:19 (16 years ago)

Author:

Perry Lorier <perry@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

8a8e54b

Parents:

ab4cb04

Message:

Fix various issues

File:

• lib/trace.c (modified) (4 diffs)

lib/trace.c

@@ -158 +158 @@
         }
         format_list[nformats] = f;
+        /* Now, verify things */
+        if (format_list[nformats]->init_input) {
+#define REQUIRE(x) \
+                if (!format_list[nformats]->x) \
+                        fprintf(stderr,"%s: Input format should provide " #x "\n",format_list[nformats]->name)
+                REQUIRE(read_packet);
+                REQUIRE(start_input);
+                REQUIRE(config_input);
+                REQUIRE(pause_input);
+                REQUIRE(fin_input);
+                REQUIRE(get_link_type);
+                REQUIRE(get_capture_length);
+                REQUIRE(get_wire_length);
+                REQUIRE(get_framing_length);
+                REQUIRE(trace_event);
+                if (!format_list[nformats]->get_erf_timestamp 
+                        && !format_list[nformats]->get_seconds
+                        && !format_list[nformats]->get_timeval) {
+                        fprintf(stderr,"%s: A trace format capable of input, should provide at least one of\n"
+"get_erf_timestamp, get_seconds or trace_timeval\n",format_list[nformats]->name);
+                }
+#undef REQUIRE
+        }
+        else {
+#define REQUIRE(x) \
+                if (format_list[nformats]->x) \
+                        fprintf(stderr,"%s: Non Input format shouldn't need " #x "\n",format_list[nformats]->name)
+                REQUIRE(read_packet);
+                REQUIRE(start_input);
+                REQUIRE(pause_input);
+                REQUIRE(fin_input);
+                REQUIRE(get_link_type);
+                REQUIRE(get_capture_length);
+                REQUIRE(get_wire_length);
+                REQUIRE(get_framing_length);
+                REQUIRE(trace_event);
+#undef REQUIRE
+        }
+        if (format_list[nformats]->init_output) {
+#define REQUIRE(x) \
+                if (!format_list[nformats]->x) \
+                        fprintf(stderr,"%s: Output format should provide " #x "\n",format_list[nformats]->name)
+                REQUIRE(write_packet);
+                REQUIRE(start_output);
+                REQUIRE(config_output);
+                REQUIRE(fin_output);
+#undef REQUIRE
+        }
+        else {
+#define REQUIRE(x) \
+                if (format_list[nformats]->x) \
+                        fprintf(stderr,"%s: Non Output format shouldn't need " #x "\n",format_list[nformats]->name)
+                REQUIRE(write_packet);
+                REQUIRE(start_output);
+                REQUIRE(config_output);
+                REQUIRE(fin_output);
+#undef REQUIRE
+        }
         nformats++;
 }
@@ -256 +314 @@
         
         if (libtrace->format->init_input) {
-                if (!libtrace->format->init_input(libtrace)) {
+                int err=libtrace->format->init_input(libtrace);
+                assert (err==-1 || err==0);
+                if (err==-1) {
                         /* init_input should call trace_set_err to set 
                          * the error message
@@ -615 +675 @@
 }
 
-/* get a pointer to the link layer
- * @param packet        a pointer to a libtrace_packet structure
- *
- * @returns a pointer to the link layer, or NULL if there is no link layer
- * 
- * @note you should call trace_get_link_type() to find out what type of link layer this is
- */
 void *trace_get_link(const struct libtrace_packet_t *packet) {
         return (void *)packet->payload;
@@ -1293 +1346 @@
         if (filter->filterstring && ! filter->flag) {
                 pcap_t *pcap;
+                libtrace_linktype_t linktype=trace_get_link_type(packet);
+                if (linktype==(libtrace_linktype_t)-1) {
+                        trace_set_err(packet->trace,TRACE_ERR_BAD_PACKET,
+                                        "Packet has an unknown linktype");
+                        return -1;
+                }
+                if (libtrace_to_pcap_dlt(linktype) == -1) {
+                        trace_set_err(packet->trace,TRACE_ERR_BAD_PACKET,
+                                        "Unknown pcap equivilent linktype");
+                        return -1;
+                }
                 pcap=(pcap_t *)pcap_open_dead(
-                                libtrace_to_pcap_dlt(trace_get_link_type(packet)),
+                                libtrace_to_pcap_dlt(linktype),
                                 1500);
                 /* build filter */