Changeset 925

Timestamp:

08/21/06 22:10:42 (7 years ago)

Author:

perry

Message:

trace_write_packet isn't const -- it can promote/demote packets

Location:

trunk/lib

Files:

• format_erf.c (modified) (3 diffs)
• libtrace.h.in (modified) (1 diff)
• libtrace_int.h (modified) (1 diff)
• trace.c (modified) (1 diff)

trunk/lib/format_erf.c

@@ -900 +900 @@
         return 0;
 }
+
+static bool find_compatible_linktype(libtrace_packet_t *packet)
+{
+        /* Keep trying to simplify the packet until we can find 
+         * something we can do with it */
+        do {
+                char type=libtrace_to_erf_type(trace_get_link_type(packet));
+
+                /* Success */
+                if (type != (char)-1)
+                        return true;
+
+                if (!demote_packet(packet)) {
+                        trace_set_err_out(packet->trace,
+                                        TRACE_ERR_NO_CONVERSION,
+                                        "No erf type for packet (%i)",
+                                        trace_get_link_type(packet));
+                        return false;
+                }
+
+        } while(1);
+
+        return true;
+}
                 
 static int erf_write_packet(libtrace_out_t *libtrace, 
@@ -940 +964 @@
         } else {
                 dag_record_t erfhdr;
-                int type;
                 /* convert format - build up a new erf header */
                 /* Timestamp */
@@ -950 +973 @@
                         erfhdr.flags.iface = trace_get_direction(packet);
 
-                /* Keep trying to simplify the packet until we can find 
-                 * something we can do with it */
-                do {
-                        type=libtrace_to_erf_type(trace_get_link_type(packet));
-                } while(type==(char)-1 && demote_packet((libtrace_packet_t *)packet));
-                /* We just don't support this link type sorry */
-                if (type==(char)-1) {
-                        trace_set_err_out(libtrace,
-                                        TRACE_ERR_NO_CONVERSION,
-                                        "No erf type for packet");
+                if (!find_compatible_linktype(packet))
                         return -1;
-                }
-                erfhdr.type = type;
+
+                erfhdr.type = libtrace_to_erf_type(trace_get_link_type(packet));
+
                 /* Packet length (rlen includes format overhead) */
                 assert(trace_get_capture_length(packet)>0 

trunk/lib/libtrace.h.in

@@ -738 +738 @@
  * @return the number of bytes written out, if zero or negative then an error has occured.
  */
-DLLEXPORT int trace_write_packet(libtrace_out_t *trace, const libtrace_packet_t *packet);
+DLLEXPORT int trace_write_packet(libtrace_out_t *trace, libtrace_packet_t *packet);
 /*@}*/
 

trunk/lib/libtrace_int.h

@@ -237 +237 @@
          * (or NULL if output not supported)
          */
-        int (*write_packet)(libtrace_out_t *libtrace, const libtrace_packet_t *packet);
+        int (*write_packet)(libtrace_out_t *libtrace, libtrace_packet_t *packet);
         /** return the libtrace link type for this packet 
          * @return the libtrace link type, or -1 if this link type is unknown

trunk/lib/trace.c

@@ -697 +697 @@
  * @author Shane Alcock
  * */
-DLLEXPORT int trace_write_packet(libtrace_out_t *libtrace, const libtrace_packet_t *packet) {
+DLLEXPORT int trace_write_packet(libtrace_out_t *libtrace, libtrace_packet_t *packet) {
         assert(libtrace);
         assert(packet);