mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-02 07:15:17 +00:00
Code Issues Releases Wiki Activity

flow: Fix misaligned access.

Browse Source 
The testsuite for the flow extractor triggered this.

With this commit, "make check" passes on SPARC.
This commit is contained in:
Ben Pfaff
2010-05-07 11:43:18 -07:00
parent afa3a93165
commit 176aaa65aa
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/flow.c
View File

@@ -27,6 +27,7 @@
#include "openflow/openflow.h" #include "openflow/openflow.h"
#include "openvswitch/datapath-protocol.h" #include "openvswitch/datapath-protocol.h"
#include "packets.h" #include "packets.h"
#include "unaligned.h"
#include "xtoxll.h" #include "xtoxll.h"
#include "vlog.h" #include "vlog.h"
@@ -154,8 +155,8 @@ flow_extract(struct ofpbuf *packet, uint32_t tun_id, uint16_t in_port,
if (flow->dl_type == htons(ETH_TYPE_IP)) { if (flow->dl_type == htons(ETH_TYPE_IP)) {
const struct ip_header *nh = pull_ip(&b); const struct ip_header *nh = pull_ip(&b);
if (nh) { if (nh) {
flow->nw_src = nh->ip_src; flow->nw_src = get_unaligned_u32(&nh->ip_src);
flow->nw_dst = nh->ip_dst; flow->nw_dst = get_unaligned_u32(&nh->ip_dst);
flow->nw_tos = nh->ip_tos & IP_DSCP_MASK; flow->nw_tos = nh->ip_tos & IP_DSCP_MASK;
flow->nw_proto = nh->ip_proto; flow->nw_proto = nh->ip_proto;
packet->l4 = b.data; packet->l4 = b.data;