Changeset 220

Timestamp:

08/22/05 21:28:12

Author:

ben

Message:

Track packet position.

Files:

• openpgpsdk/trunk/examples/packet-dump.c (modified) (1 diff)
• openpgpsdk/trunk/include/packet-parse.h (modified) (1 diff)
• openpgpsdk/trunk/include/packet.h (modified) (1 diff)
• openpgpsdk/trunk/src/packet-parse.c (modified) (2 diffs)

openpgpsdk/trunk/examples/packet-dump.c

@@ -261 +261 @@
-        print_indent();
-        printf("==== ptag new_format=%d content_tag=%d length_type=%d"
-
+ position=0x%x (%d)
-               content->ptag.content_tag,content->ptag.length_type,
-
+
+
-        /*
-        print_tagname(ops_str_from_single_packet_tag(content->ptag.content_tag));

openpgpsdk/trunk/include/packet-parse.h

@@ -56 +56 @@
-    ops_packet_reader_t *reader; /*!< the reader function to use to get the data to be parsed */
-    void *reader_arg; /*!< the args to pass to the reader function */
+    // XXX: what do we do about offsets into compressed packets?
+    unsigned position; /*!< the offset from the beginning (with this reader) */
-
-    unsigned accumulate:1;      /*!< set to accumulate packet data */

openpgpsdk/trunk/include/packet.h

@@ -218 +218 @@
-    //    unsigned              length_read;    /*!< How much bytes of this packet we have read so far - for internal use
-    //                                    only. */
+    unsigned            position;       /*!< The position (within the current reader) of the packet */
-    } ops_ptag_t;
-

openpgpsdk/trunk/src/packet-parse.c

@@ -178 +178 @@
-    // we track length anyway, because it is used for packet offsets
-    opt->alength+=*plength;
+    // and also the position
+    opt->position+=*plength;
-
-    return ret;
@@ -1709 +1711 @@
-    ops_boolean_t indeterminate=ops_false;
-
+    C.ptag.position=opt->position;
+
-    ret=base_read(ptag,&one,0,opt);
-    if(ret == OPS_R_EOF)