Changeset 5577521 for lib/format_etsilive.c

Timestamp:

05/18/18 14:55:54 (3 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

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

Children:

86b365b, 8a237c7

Parents:

e8e9052

Message:

Fix out-of-date libwandder API usage when sending ETSI keepalive.

Also fixed a bunch of unused parameter warnings.

File:

• lib/format_etsilive.c (modified) (8 diffs)

lib/format_etsilive.c

@@ -491 +491 @@
 }
 
-static etsisocket_t *select_next_packet(etsithread_t *et, libtrace_t *libtrace) {
+static etsisocket_t *select_next_packet(etsithread_t *et) {
 
         int i;
@@ -504 +504 @@
 }
 
-static int etsilive_prepare_received(libtrace_t *libtrace, etsithread_t *et,
+static int etsilive_prepare_received(libtrace_t *libtrace,
+                etsithread_t *et UNUSED,
                 etsisocket_t *esock, libtrace_packet_t *packet) {
 
@@ -557 +558 @@
                 }
 
-                nextavail = select_next_packet(&(FORMAT_DATA->receivers[0]),
-                                libtrace);
+                nextavail = select_next_packet(&(FORMAT_DATA->receivers[0]));
                 if (nextavail == NULL) {
                         /* No complete packets available, take a short
@@ -602 +602 @@
 }
 
-static int etsilive_get_framing_length(const libtrace_packet_t *packet) {
+static int etsilive_get_framing_length(const libtrace_packet_t *packet UNUSED) {
 
         return 0;
@@ -625 +625 @@
 
 static libtrace_linktype_t etsilive_get_link_type(
-                const libtrace_packet_t *packet) {
+                const libtrace_packet_t *packet UNUSED) {
         return TRACE_TYPE_ETSILI;
 }
@@ -692 +692 @@
 
         wandder_encoder_t *encoder;
-        uint8_t *tosend;
-        uint32_t tosendlen;
+        wandder_encoded_result_t *tosend;
         int ret = 0;
         uint64_t zero = 0;
@@ -753 +752 @@
         wandder_encode_endseq(encoder);     // End Outermost Sequence
 
-        tosend = wandder_encode_finish(encoder, &tosendlen);
+        tosend = wandder_encode_finish(encoder);
 
         if (tosend != NULL) {
@@ -759 +758 @@
                  * sending.
                  */
-                ret = send(fd, tosend, tosendlen, 0);
-        }
-
+                ret = send(fd, tosend->encoded, tosend->len, 0);
+        }
+
+        wandder_release_encoded_result(encoder, tosend);
         free_wandder_encoder(encoder);
         return ret;