Changeset 317e903

Timestamp:

02/28/17 16:08:39 (4 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, master, ndag_format, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance

Children:

d759ee1

Parents:

6450950

Message:

Add support for PPTP GRE

Credit to EaseTheWorld? for producing the original patch for this.

Location:

lib

Files:

• libtrace.h.in (modified) (1 diff)
• protocols_transport.c (modified) (2 diffs)

lib/libtrace.h.in

@@ -869 +869 @@
 #define LIBTRACE_GRE_FLAG_VERMASK  0x0007
 
+
+/* PPTP GRE (RFC2637) */
+#define LIBTRACE_GRE_FLAG_ACK      0x0080
+#define LIBTRACE_GRE_PPTP_VERSION  0x0001
+
 /** Libtrace local definition of VXLAN Header
  * (draft-mahalingam-dutt-dcops-vxlan)

lib/protocols_transport.c

@@ -549 +549 @@
         uint32_t *remaining)
 {
+    uint8_t flags = ntohs(gre->flags);
     uint32_t size = 4; /* GRE is 4 bytes long by default */
     if (remaining && *remaining < size) {
@@ -555 +556 @@
     }
 
-    if ((ntohs(gre->flags) & LIBTRACE_GRE_FLAG_CHECKSUM) != 0) {
-        size += 4;  /* An extra 4 bytes. */
-    }
-
-    if ((ntohs(gre->flags) & LIBTRACE_GRE_FLAG_KEY) != 0) {
-        size += 4;  /* An extra 4 bytes. */
-    }
-
-    if ((ntohs(gre->flags) & LIBTRACE_GRE_FLAG_SEQ) != 0) {
-        size += 4;  /* An extra 4 bytes. */
+    if((flags & LIBTRACE_GRE_FLAG_VERMASK) == LIBTRACE_GRE_PPTP_VERSION) {
+        size += 4;
+
+        if ((flags & LIBTRACE_GRE_FLAG_SEQ) != 0) {
+            size += 4;
+        }
+        if ((flags & LIBTRACE_GRE_FLAG_ACK) != 0) {
+            size += 4;
+        }
+    } else {
+
+        if ((ntohs(gre->flags) & LIBTRACE_GRE_FLAG_CHECKSUM) != 0) {
+            size += 4;  /* An extra 4 bytes. */
+        }
+
+        if ((ntohs(gre->flags) & LIBTRACE_GRE_FLAG_KEY) != 0) {
+           size += 4;  /* An extra 4 bytes. */
+        }
+
+        if ((ntohs(gre->flags) & LIBTRACE_GRE_FLAG_SEQ) != 0) {
+            size += 4;  /* An extra 4 bytes. */
+        }
     }