mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00
Code Issues Releases Wiki Activity

lib/flow: Add miniflow accessors and miniflow_get_tcp_flags().

Browse Source 
Add inlined generic accessors for miniflow integer type fields, and a
new miniflow_get_tcp_flags() usinge these.  These will be used in a
later patch.

Some definitions also used in lib/packets.h had to be moved there to
resolve circular include dependencies.  Similarly, some inline
functions using struct flow are now in lib/flow.h.  IMO this is
cleaner, since now the lib/flow.h need not be included from
lib/packets.h.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Reviewed-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
This commit is contained in:
Jarno Rajahalme
2014-04-18 08:26:56 -07:00
parent 419681daf1
commit b7807e4f64
6 changed files with 144 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
lib/packets.h
View File

@@ -23,7 +23,6 @@
#include <stdint.h>
#include <string.h>
#include "compiler.h"
#include "flow.h"
#include "openvswitch/types.h"
#include "random.h"
#include "hash.h"
@@ -32,6 +31,24 @@
struct ofpbuf;
struct ds;
/* Tunnel information used in flow key and metadata. */
struct flow_tnl {
ovs_be64 tun_id;
ovs_be32 ip_src;
ovs_be32 ip_dst;
uint16_t flags;
uint8_t ip_tos;
uint8_t ip_ttl;
};
/* Unfortunately, a "struct flow" sometimes has to handle OpenFlow port
* numbers and other times datapath (dpif) port numbers. This union allows
* access to both. */
union flow_in_port {
odp_port_t odp_port;
ofp_port_t ofp_port;
};
/* Datapath packet metadata */
struct pkt_metadata {
uint32_t recirc_id; /* Recirculation id carried with the
@@ -48,21 +65,6 @@ struct pkt_metadata {
#define PKT_METADATA_INITIALIZER(PORT) \
(struct pkt_metadata){ 0, 0, { 0, 0, 0, 0, 0, 0}, 0, 0, {(PORT)} }
static inline struct pkt_metadata
pkt_metadata_from_flow(const struct flow *flow)
{
struct pkt_metadata md;
md.recirc_id = flow->recirc_id;
md.dp_hash = flow->dp_hash;
md.tunnel = flow->tunnel;
md.skb_priority = flow->skb_priority;
md.pkt_mark = flow->pkt_mark;
md.in_port = flow->in_port;
return md;
}
bool dpid_from_string(const char *s, uint64_t *dpidp);
#define ETH_ADDR_LEN 6
@@ -652,23 +654,6 @@ static inline bool dl_type_is_ip_any(ovs_be16 dl_type)
|| dl_type == htons(ETH_TYPE_IPV6);
}
static inline bool is_ip_any(const struct flow *flow)
{
return dl_type_is_ip_any(flow->dl_type);
}
static inline bool is_icmpv4(const struct flow *flow)
{
return (flow->dl_type == htons(ETH_TYPE_IP)
&& flow->nw_proto == IPPROTO_ICMP);
}
static inline bool is_icmpv6(const struct flow *flow)
{
return (flow->dl_type == htons(ETH_TYPE_IPV6)
&& flow->nw_proto == IPPROTO_ICMPV6);
}
void format_ipv6_addr(char *addr_str, const struct in6_addr *addr);
void print_ipv6_addr(struct ds *string, const struct in6_addr *addr);
void print_ipv6_masked(struct ds *string, const struct in6_addr *addr,