Changeset 00365c6

Timestamp:

05/18/18 11:39:59 (3 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

cachetimestamps, develop, etsilive, master, rc-4.0.4, ringdecrementfix, ringperformance

Children:

991ff43

Parents:

b663d33

git-author:

Shane Alcock <salcock@…> (12/19/17 17:09:29)

git-committer:

Shane Alcock <salcock@…> (05/18/18 11:39:59)

Message:

Update to use new libwandder_etsili API

The new API should be more thread-safe than the original, at the
cost of being a bit more awkward to use.

Files:

• lib/format_etsilive.c (modified) (9 diffs)
• lib/protocols_pktmeta.c (modified) (1 diff)
• libpacketdump/link_21.c (modified) (2 diffs)

lib/format_etsilive.c

@@ -73 +73 @@
         uint16_t sourcecount;
         int threadindex;
+        wandder_etsispec_t *etsidec;
 } etsithread_t;
 
@@ -263 +264 @@
                 FORMAT_DATA->receivers[i].sourcecount = 0;
                 FORMAT_DATA->receivers[i].threadindex = i;
+                FORMAT_DATA->receivers[i].etsidec =
+                                wandder_create_etsili_decoder();
 
         }
@@ -291 +294 @@
                 close(src.sock);
         }
+        wandder_free_etsili_decoder(receiver->etsidec);
         free(receiver->sources);
 }
@@ -425 +429 @@
                 }
 
-                init_wandder_decoder(&dec, ptr, available, false);
+                wandder_attach_etsili_buffer(et->etsidec, ptr, available, false);
                 if (et->sources[i].cached.length != 0) {
                         reclen = et->sources[i].cached.length;
                 } else {
-                        reclen = wandder_etsili_get_pdu_length(&dec);
+                        reclen = wandder_etsili_get_pdu_length(et->etsidec);
 
                         if (reclen == 0) {
-                                free_wandder_decoder(&dec);
                                 continue;
                         }
@@ -439 +442 @@
                 if (available < reclen) {
                         /* Don't have the whole PDU yet */
-                        free_wandder_decoder(&dec);
                         continue;
                 }
@@ -445 +447 @@
                 /* Get the timestamp */
 
-                tv = wandder_etsili_get_header_timestamp(&dec);
+                tv = wandder_etsili_get_header_timestamp(et->etsidec);
                 if (tv.tv_sec == 0) {
-                        free_wandder_decoder(&dec);
                         continue;
                 }
@@ -487 +488 @@
         packet->wire_length = esock->cached.length;
         packet->capture_length = esock->cached.length;
+
+        /*
+        for (j = 0; j < packet->wire_length; j++) {
+                printf("%02x ", *(((uint8_t *)packet->buffer) + j));
+                if ((j % 16) == 15) printf("\n");
+        }
+        printf("\n");
+        */
 
         /* Advance the read pointer for this buffer
@@ -547 +556 @@
 
         /* Should never get here because cache is set when packet is read */
-        wandder_decoder_t dec;
+        wandder_etsispec_t *dec;
         size_t reclen;
 
         /* 0 should be ok here for quickly evaluating the first length
          * field... */
-        init_wandder_decoder(&dec, packet->buffer, 0, false);
-        reclen = (size_t)wandder_etsili_get_pdu_length(&dec);
-
-        free_wandder_decoder(&dec);
+        dec = wandder_create_etsili_decoder();
+        wandder_attach_etsili_buffer(dec, packet->buffer, 0, false);
+        reclen = (size_t)wandder_etsili_get_pdu_length(dec);
+        wandder_free_etsili_decoder(dec);
 
         return reclen;
@@ -569 +578 @@
          * this up again. */
         struct timeval tv;
-        wandder_decoder_t dec;
+        wandder_etsispec_t *dec;
 
         tv.tv_sec = 0;
         tv.tv_usec = 0;
 
-        init_wandder_decoder(&dec, packet->buffer, 0, false);
-        tv = wandder_etsili_get_header_timestamp(&dec);
-        free_wandder_decoder(&dec);
+
+        dec = wandder_create_etsili_decoder();
+        wandder_attach_etsili_buffer(dec, packet->buffer, 0, false);
+        tv = wandder_etsili_get_header_timestamp(dec);
+        wandder_free_etsili_decoder(dec);
         return tv;
 }

lib/protocols_pktmeta.c

@@ -129 +129 @@
 
 #ifdef HAVE_WANDDER
-        wandder_decoder_t dec;
+        wandder_etsispec_t *dec;
         uint8_t *ccptr;
 
-        init_wandder_decoder(&dec, (uint8_t *)link, *remaining, false);
-        ccptr = wandder_etsili_get_cc_contents(&dec, remaining);
+        /* XXX Bit annoying to be creating and freeing this every time */
+        dec = wandder_create_etsili_decoder();
+        wandder_attach_etsili_buffer(dec, (uint8_t *)link, *remaining, false);
+        ccptr = wandder_etsili_get_cc_contents(dec, remaining);
         /* Assuming all CCs are IP for now */
         *type = TRACE_TYPE_NONE;
+        wandder_free_etsili_decoder(dec);
         return ccptr;
 

libpacketdump/link_21.c

@@ -6 +6 @@
 DLLEXPORT void decode(int link_type UNUSED, const char *packet, unsigned len) {
 
-        wandder_decoder_t dec;
-        wandder_etsi_stack_t *stack = NULL;
         char linespace[4096];
         int i;
         uint8_t *cchdr = NULL;
         uint32_t rem = len;
+        wandder_etsispec_t *dec;
+        wandder_decoder_t *basedec = NULL;
 
-        init_wandder_decoder(&dec, (uint8_t *)packet, len, false);
-        while (wandder_etsili_get_next_fieldstr(&dec, linespace, 4096, &stack)) {
+        dec = wandder_create_etsili_decoder();
+        wandder_attach_etsili_buffer(dec, (uint8_t *)packet, len, false);
+
+        basedec = wandder_get_etsili_base_decoder(dec);
+        while (wandder_etsili_get_next_fieldstr(dec, linespace, 4096)) {
                 printf(" ETSILI: ");
-                for (i = 0; i < wandder_get_level(&dec); i++) {
+                for (i = 0; i < wandder_get_level(basedec); i++) {
                         printf("  ");
                 }
@@ -22 +25 @@
         }
 
-        wandder_reset_decoder(&dec);
-        cchdr = wandder_etsili_get_cc_contents(&dec, &rem);
+        cchdr = wandder_etsili_get_cc_contents(dec, &rem);
 
-        wandder_etsili_free_stack(stack);
-        free_wandder_decoder(&dec);
+        wandder_free_etsili_decoder(dec);
 
         if (cchdr) {