Changeset 209

Timestamp:

07/13/05 14:41:42

Author:

rachel

Message:

Output error packets again at end of packet-dump, together with a hexdump of contents.

Files:

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

openpgpsdk/trunk/examples/packet-dump.c

@@ -202 +202 @@
-    }
-
+static void print_packet(const ops_packet_t *packet)
+    {
+    unsigned char *cur;
+    int i;
+    int rem;
+    int blksz=4;
+
+    printf("\nhexdump of packet contents follows:\n");
+
+
+    for (i=1,cur=packet->raw; cur<(packet->raw+packet->length); cur+=blksz,i++)
+        {
+        rem = packet->raw+packet->length-cur;
+        hexdump(cur,rem<=blksz ? rem : blksz);
+        printf(" ");
+        if (!(i%8))
+            printf("\n");
+        
+        }
+    
+    printf("\n");
+    }
+
-static ops_parse_callback_return_t
-callback(const ops_parser_content_t *content_,void *arg_)
@@ -213 +236 @@
-    case OPS_PARSER_ERROR:
-        printf("parse error: %s\n",content->error.error);
+        break;
+
+    case OPS_PARSER_PACKET_END:
+        print_packet(&content->packet);
-        break;
-
@@ -719 +746 @@
-
-    if (!ops_parse_and_save_errs(&opt,&errors))
+        {
-        printf("\n*** Warning: errors were found when parsing input\n");
-
-
-
+
+
+
+
+
+
+
+
-
-    ops_ulong_list_free(&errors);

openpgpsdk/trunk/include/packet-parse.h

@@ -65 +65 @@
-int ops_parse(ops_parse_options_t *opt);
-int ops_parse_and_save_errs(ops_parse_options_t *opt,ops_ulong_list_t *errs);
+int ops_parse_errs(ops_parse_options_t *opt,ops_ulong_list_t *errs);
+
-void ops_parse_and_validate(ops_parse_options_t *opt);
-

openpgpsdk/trunk/src/packet-parse.c

@@ -14 +14 @@
-#include <stdlib.h>
-#include <string.h>
+#include <unistd.h>
+#include <errno.h>
-
-#ifdef DMALLOC
@@ -1648 +1650 @@
- * function to handle the content.
- *
- * \param *reader       Our reader
- * \param *cb           The callback
- * \param *opt          Parsing options
+ * \param *pktlen       On return, will contain number of bytes in packet
- * \return              1 on success, 0 on error, -1 on EOF
- */
-offset
+pktlen
-    {
-    char ptag[1];
@@ -1667 +1668 @@
-        return -1;
-
-offset+=one
+pktlen=0
-
-    assert(ret == OPS_R_OK);
@@ -1683 +1684 @@
-        if(!read_new_length(&C.ptag.length,opt))
-            return 0;
-
+
-        }
-    else
@@ -1695 +1696 @@
-            ret=read_scalar(&C.ptag.length,1,opt);
-            assert(ret == OPS_R_OK);
-            *offset+=1;
-            break;
-
@@ -1701 +1701 @@
-            ret=read_scalar(&C.ptag.length,2,opt);
-            assert(ret == OPS_R_OK);
-            *offset+=2;
-            break;
-
-        case OPS_PTAG_OF_LT_FOUR_BYTE:
-            ret=read_scalar(&C.ptag.length,4,opt);
-            *offset+=4;
-            assert(ret == OPS_R_OK);
-            break;
@@ -1768 +1766 @@
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    if(opt->accumulate)
-        {
@@ -1779 +1799 @@
-    opt->alength=0;
-        
-    /*
-     * update offset for packet contents
-     */
-
-    *offset+=region.length;
-
-    /* Ensure that the entire packet has been consumed 
-     */
-
-    if (region.length != region.length_read)
-        {
-        ops_data_t remainder;
-
-        if (read_data(&remainder,&region,opt))
-            {
-            /* now throw it away */
-            data_free(&remainder);
-            ERR("Remainder of packet consumed and discarded.");
-            }
-        else
-            ERR("Problem consuming remainder of error packet.");
-        }
-    return r ? 1 : 0;
-    }
@@ -1847 +1845 @@
-    do
-        {
-        pktlen=0;
-        r=ops_parse_one_packet(opt,&pktlen);
-        if (!r)
@@ -1858 +1855 @@
-
-/**
+ *
+ * \return 1 if success, 0 otherwise
+ */
+
+int ops_parse_errs(ops_parse_options_t *opt, ops_ulong_list_t *errs)
+    {
+    int err;
+    int r;
+    unsigned long pktlen;
+    ops_reader_fd_arg_t *arg;
+
+    int orig_acc;
+
+    /* can only handle ops_reader_fd for now */
+
+    if (opt->reader!=ops_reader_fd)
+        {
+        printf("ops_parse_errs: can only handle ops_reader_fd\n");
+        return 0;
+        }
+
+    arg=opt->reader_arg;
+
+    /* store current state of accumulate flag */
+
+    orig_acc=opt->accumulate;
+
+    /* set accumulate flag */
+
+    opt->accumulate=1;
+
+    /* now parse each error in turn. */
+
+    for (err=0; err<errs->used; err++)
+        {
+
+        //      printf("\n***\n*** Error at offset %lu \n***\n",errs->ulongs[err]);
+
+        /* move stream to offset of error */
+
+        r=lseek(arg->fd,errs->ulongs[err],SEEK_SET);
+        if (r==-1)
+            {
+            printf("error %d in first lseek to offset\n", errno);
+            return 0;
+            }
+
+        /* parse packet */
+
+        ops_parse_one_packet(opt,&pktlen);
+
+
+        /* restore accumulate flag original value */
+        opt->accumulate=orig_acc;
+
+        }
+
+    return 1;
+    }
+
+/**
- * \ingroup Parse
- *