Changeset 93c9aff

Timestamp:

01/29/16 11:17:35 (7 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

pfring

Children:

9e7c502

Parents:

a21b45e (diff), 206109f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/develop' into pfring

File:

• lib/format_rt.c (modified) (1 diff)

lib/format_rt.c

@@ -159 +159 @@
                 return -1;
         }
+
+        if (ntohl(connect_msg.type) == TRACE_RT_HELLO) {
+
+                if (connect_msg.length != sizeof(rt_hello_t)) {
+                        trace_set_err(libtrace, 
+                                        TRACE_ERR_INIT_FAILED,
+                                        "RT version mismatch: we are version 3, server is >= 4");
+                        return -1;
+                }
+        }
+
+        if (ntohl(connect_msg.type) == TRACE_RT_DENY_CONN) {
+
+                if (connect_msg.length != sizeof(rt_deny_conn_t)) {
+                        trace_set_err(libtrace, 
+                                        TRACE_ERR_INIT_FAILED,
+                                        "RT version mismatch: we are version 3, server is >= 4");
+                        return -1;
+                }
+        }
+
         
         if (connect_msg.magic != LIBTRACE_RT_MAGIC) {