Changeset 00365c6 for libpacketdump

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.

File:

• libpacketdump/link_21.c (modified) (2 diffs)

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) {