+/* Copyright (c) 2008 The Board of Trustees of The Leland Stanford
+ * Junior University
+ *
+ * We are making the OpenFlow specification and associated documentation
+ * (Software) available for public use and benefit with the expectation
+ * that others will use, modify and enhance the Software and contribute
+ * those enhancements back to the community. However, since we would
+ * like to make the Software available for broadest use, with as few
+ * restrictions as possible permission is hereby granted, free of
+ * charge, to any person obtaining a copy of this Software to deal in
+ * the Software under the copyrights without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * The name and trademarks of copyright holder(s) may NOT be used in
+ * advertising or publicity pertaining to the Software or any
+ * derivatives without specific, written prior permission.
+ */
#include <sys/types.h>
#include "flow.h"
#include <inttypes.h>
#define THIS_MODULE VLM_flow
void
-flow_extract(const struct buffer *packet, uint16_t in_port, struct flow *flow)
+flow_extract(struct buffer *packet, uint16_t in_port, struct flow *flow)
{
struct buffer b = *packet;
struct eth_header *eth;
memset(flow, 0, sizeof *flow);
flow->in_port = htons(in_port);
+ packet->l2 = b.data;
+ packet->l3 = NULL;
+ packet->l4 = NULL;
+
eth = buffer_at(&b, 0, sizeof *eth);
if (eth) {
buffer_pull(&b, ETH_HEADER_LEN);
memcpy(flow->dl_src, eth->eth_src, ETH_ADDR_LEN);
memcpy(flow->dl_dst, eth->eth_dst, ETH_ADDR_LEN);
+ packet->l3 = b.data;
if (flow->dl_type == htons(ETH_TYPE_IP)) {
const struct ip_header *nh = buffer_at(&b, 0, sizeof *nh);
if (nh) {
+ int ip_len = IP_IHL(nh->ip_ihl_ver) * 4;
+ if (ip_len < IP_HEADER_LEN) {
+ return;
+ }
+
flow->nw_src = nh->ip_src;
flow->nw_dst = nh->ip_dst;
flow->nw_proto = nh->ip_proto;
if (flow->nw_proto == IP_TYPE_TCP
|| flow->nw_proto == IP_TYPE_UDP) {
- int udp_ofs = IP_IHL(nh->ip_ihl_ver) * 4;
- const struct udp_header *th
- = buffer_at(&b, udp_ofs, sizeof *th);
+ const struct udp_header *th;
+ th = packet->l4 = buffer_at(&b, ip_len, sizeof *th);
if (th) {
flow->tp_src = th->udp_src;
flow->tp_dst = th->udp_dst;
+ } else {
+ /* Avoid tricking other code into thinking that this
+ * packet has an L4 header. */
+ flow->nw_proto = 0;
}
}
}