+static struct icmp6_hdr *
+pull_icmpv6(struct ofpbuf *packet)
+{
+ return ofpbuf_try_pull(packet, sizeof(struct icmp6_hdr));
+}
+
+static void
+parse_vlan(struct ofpbuf *b, struct flow *flow)
+{
+ struct qtag_prefix {
+ ovs_be16 eth_type; /* ETH_TYPE_VLAN */
+ ovs_be16 tci;
+ };
+
+ if (b->size >= sizeof(struct qtag_prefix) + sizeof(ovs_be16)) {
+ struct qtag_prefix *qp = ofpbuf_pull(b, sizeof *qp);
+ flow->vlan_tci = qp->tci | htons(VLAN_CFI);
+ }
+}
+
+static ovs_be16
+parse_ethertype(struct ofpbuf *b)
+{
+ struct llc_snap_header *llc;
+ ovs_be16 proto;
+
+ proto = *(ovs_be16 *) ofpbuf_pull(b, sizeof proto);
+ if (ntohs(proto) >= ETH_TYPE_MIN) {
+ return proto;
+ }
+
+ if (b->size < sizeof *llc) {
+ return htons(FLOW_DL_TYPE_NONE);
+ }
+
+ llc = b->data;
+ if (llc->llc.llc_dsap != LLC_DSAP_SNAP
+ || llc->llc.llc_ssap != LLC_SSAP_SNAP
+ || llc->llc.llc_cntl != LLC_CNTL_SNAP
+ || memcmp(llc->snap.snap_org, SNAP_ORG_ETHERNET,
+ sizeof llc->snap.snap_org)) {
+ return htons(FLOW_DL_TYPE_NONE);
+ }
+
+ ofpbuf_pull(b, sizeof *llc);
+ return llc->snap.snap_type;
+}
+
+static int
+parse_ipv6(struct ofpbuf *packet, struct flow *flow)
+{
+ const struct ip6_hdr *nh;
+ ovs_be32 tc_flow;
+ int nexthdr;
+
+ nh = ofpbuf_try_pull(packet, sizeof *nh);
+ if (!nh) {
+ return EINVAL;
+ }
+
+ nexthdr = nh->ip6_nxt;
+
+ flow->ipv6_src = nh->ip6_src;
+ flow->ipv6_dst = nh->ip6_dst;
+
+ tc_flow = get_unaligned_be32(&nh->ip6_flow);
+ flow->nw_tos = (ntohl(tc_flow) >> 4) & IP_DSCP_MASK;
+ flow->nw_proto = IPPROTO_NONE;
+
+ while (1) {
+ if ((nexthdr != IPPROTO_HOPOPTS)
+ && (nexthdr != IPPROTO_ROUTING)
+ && (nexthdr != IPPROTO_DSTOPTS)
+ && (nexthdr != IPPROTO_AH)
+ && (nexthdr != IPPROTO_FRAGMENT)) {
+ /* It's either a terminal header (e.g., TCP, UDP) or one we
+ * don't understand. In either case, we're done with the
+ * packet, so use it to fill in 'nw_proto'. */
+ break;
+ }
+
+ /* We only verify that at least 8 bytes of the next header are
+ * available, but many of these headers are longer. Ensure that
+ * accesses within the extension header are within those first 8
+ * bytes. All extension headers are required to be at least 8
+ * bytes. */
+ if (packet->size < 8) {
+ return EINVAL;
+ }
+
+ if ((nexthdr == IPPROTO_HOPOPTS)
+ || (nexthdr == IPPROTO_ROUTING)
+ || (nexthdr == IPPROTO_DSTOPTS)) {
+ /* These headers, while different, have the fields we care about
+ * in the same location and with the same interpretation. */
+ const struct ip6_ext *ext_hdr = (struct ip6_ext *)packet->data;
+ nexthdr = ext_hdr->ip6e_nxt;
+ if (!ofpbuf_try_pull(packet, (ext_hdr->ip6e_len + 1) * 8)) {
+ return EINVAL;
+ }
+ } else if (nexthdr == IPPROTO_AH) {
+ /* A standard AH definition isn't available, but the fields
+ * we care about are in the same location as the generic
+ * option header--only the header length is calculated
+ * differently. */
+ const struct ip6_ext *ext_hdr = (struct ip6_ext *)packet->data;
+ nexthdr = ext_hdr->ip6e_nxt;
+ if (!ofpbuf_try_pull(packet, (ext_hdr->ip6e_len + 2) * 4)) {
+ return EINVAL;
+ }
+ } else if (nexthdr == IPPROTO_FRAGMENT) {
+ const struct ip6_frag *frag_hdr = (struct ip6_frag *)packet->data;
+
+ nexthdr = frag_hdr->ip6f_nxt;
+ if (!ofpbuf_try_pull(packet, sizeof *frag_hdr)) {
+ return EINVAL;
+ }
+
+ /* We only process the first fragment. */
+ if ((frag_hdr->ip6f_offlg & IP6F_OFF_MASK) != htons(0)) {
+ nexthdr = IPPROTO_FRAGMENT;
+ break;
+ }
+ }
+ }
+
+ flow->nw_proto = nexthdr;
+ return 0;
+}
+
+static void
+parse_tcp(struct ofpbuf *packet, struct ofpbuf *b, struct flow *flow)
+{
+ const struct tcp_header *tcp = pull_tcp(b);
+ if (tcp) {
+ flow->tp_src = tcp->tcp_src;
+ flow->tp_dst = tcp->tcp_dst;
+ packet->l7 = b->data;
+ }
+}
+
+static void
+parse_udp(struct ofpbuf *packet, struct ofpbuf *b, struct flow *flow)