Revert "Set ESP Next Header field to 0x29 for IPv6 packets"

This reverts commit 02ae906bb691c8b342d7ff0875e200ce55c18f2a. Turns out
Pulse doesn't *accept* ESP frames with the correct Next-Header field
for IPv6. You have to send 0x04 (IPIP). So I cleaned it up and removed
the duplication for nothing...

Might need to put this back when we work out how GPST does IPv6.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

diff --git a/esp.c b/esp.c
index fd6cf2bbfb4d58695fd87d2850d926e66e92e924..1f276b05426ec124af8a748e85eb78b8ffc4c254 100644 (file)
--- a/esp.c
+++ b/esp.c
@@ -110,10 +110,7 @@ int construct_esp_packet(struct openconnect_info *vpninfo, struct pkt *pkt)
        for (i=0; i<padlen; i++)
                pkt->data[pkt->len + i] = i + 1;
        pkt->data[pkt->len + padlen] = padlen;
-       if ((pkt->data[0] & 0xf0) == 0x60) /* iph->ip_v */
-               pkt->data[pkt->len + padlen + 1] = 0x29; /* IPv6 */
-       else
-               pkt->data[pkt->len + padlen + 1] = 0x04; /* Legacy IP */
+       pkt->data[pkt->len + padlen + 1] = 0x04; /* Legacy IP */
 
        memcpy(pkt->esp.iv, vpninfo->esp_out.iv, sizeof(pkt->esp.iv));