projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
odp-util: Remove extraneous "set_tci(" from format_odp_action()
[openvswitch]
/
lib
/
flow.c
diff --git
a/lib/flow.c
b/lib/flow.c
index 1fab02fd6e5beb924fcd02ab6a7df75c9c9db1d5..78c45ade5aadca78206640b6a98ab5f386b8e69c 100644
(file)
--- a/
lib/flow.c
+++ b/
lib/flow.c
@@
-53,7
+53,7
@@
pull_ip(struct ofpbuf *packet)
}
static struct tcp_header *
}
static struct tcp_header *
-pull_tcp(struct ofpbuf *packet)
+pull_tcp(struct ofpbuf *packet)
{
if (packet->size >= TCP_HEADER_LEN) {
struct tcp_header *tcp = packet->data;
{
if (packet->size >= TCP_HEADER_LEN) {
struct tcp_header *tcp = packet->data;
@@
-66,19
+66,19
@@
pull_tcp(struct ofpbuf *packet)
}
static struct udp_header *
}
static struct udp_header *
-pull_udp(struct ofpbuf *packet)
+pull_udp(struct ofpbuf *packet)
{
return ofpbuf_try_pull(packet, UDP_HEADER_LEN);
}
static struct icmp_header *
{
return ofpbuf_try_pull(packet, UDP_HEADER_LEN);
}
static struct icmp_header *
-pull_icmp(struct ofpbuf *packet)
+pull_icmp(struct ofpbuf *packet)
{
return ofpbuf_try_pull(packet, ICMP_HEADER_LEN);
}
static void
{
return ofpbuf_try_pull(packet, ICMP_HEADER_LEN);
}
static void
-parse_vlan(struct ofpbuf *b,
flow_t
*flow)
+parse_vlan(struct ofpbuf *b,
struct flow
*flow)
{
struct qtag_prefix {
uint16_t eth_type; /* ETH_TYPE_VLAN */
{
struct qtag_prefix {
uint16_t eth_type; /* ETH_TYPE_VLAN */
@@
-139,7
+139,7
@@
parse_ethertype(struct ofpbuf *b)
*/
int
flow_extract(struct ofpbuf *packet, uint32_t tun_id, uint16_t in_port,
*/
int
flow_extract(struct ofpbuf *packet, uint32_t tun_id, uint16_t in_port,
-
flow_t
*flow)
+
struct flow
*flow)
{
struct ofpbuf b = *packet;
struct eth_header *eth;
{
struct ofpbuf b = *packet;
struct eth_header *eth;
@@
-213,7
+213,7
@@
flow_extract(struct ofpbuf *packet, uint32_t tun_id, uint16_t in_port,
} else if (flow->dl_type == htons(ETH_TYPE_ARP)) {
const struct arp_eth_header *arp = pull_arp(&b);
if (arp && arp->ar_hrd == htons(1)
} else if (flow->dl_type == htons(ETH_TYPE_ARP)) {
const struct arp_eth_header *arp = pull_arp(&b);
if (arp && arp->ar_hrd == htons(1)
- && arp->ar_pro == htons(ETH_TYPE_IP)
+ && arp->ar_pro == htons(ETH_TYPE_IP)
&& arp->ar_hln == ETH_ADDR_LEN
&& arp->ar_pln == 4) {
/* We only match on the lower 8 bits of the opcode. */
&& arp->ar_hln == ETH_ADDR_LEN
&& arp->ar_pln == 4) {
/* We only match on the lower 8 bits of the opcode. */
@@
-221,7
+221,7
@@
flow_extract(struct ofpbuf *packet, uint32_t tun_id, uint16_t in_port,
flow->nw_proto = ntohs(arp->ar_op);
}
flow->nw_proto = ntohs(arp->ar_op);
}
- if ((flow->nw_proto == ARP_OP_REQUEST)
+ if ((flow->nw_proto == ARP_OP_REQUEST)
|| (flow->nw_proto == ARP_OP_REPLY)) {
flow->nw_src = arp->ar_spa;
flow->nw_dst = arp->ar_tpa;
|| (flow->nw_proto == ARP_OP_REPLY)) {
flow->nw_src = arp->ar_spa;
flow->nw_dst = arp->ar_tpa;
@@
-235,7
+235,7
@@
flow_extract(struct ofpbuf *packet, uint32_t tun_id, uint16_t in_port,
* arguments must have been initialized through a call to flow_extract().
*/
void
* arguments must have been initialized through a call to flow_extract().
*/
void
-flow_extract_stats(const
flow_t *flow, struct ofpbuf *packet,
+flow_extract_stats(const
struct flow *flow, struct ofpbuf *packet,
struct odp_flow_stats *stats)
{
memset(stats, '\0', sizeof(*stats));
struct odp_flow_stats *stats)
{
memset(stats, '\0', sizeof(*stats));
@@
-254,8
+254,8
@@
flow_extract_stats(const flow_t *flow, struct ofpbuf *packet,
/* Extract 'flow' with 'wildcards' into the OpenFlow match structure
* 'match'. */
void
/* Extract 'flow' with 'wildcards' into the OpenFlow match structure
* 'match'. */
void
-flow_to_match(const
flow_t *flow, uint32_t wildcards, bool tun_id_from_cookie
,
- struct ofp_match *match)
+flow_to_match(const
struct flow *flow, uint32_t wildcards
,
+
bool tun_id_from_cookie,
struct ofp_match *match)
{
if (!tun_id_from_cookie) {
wildcards &= OFPFW_ALL;
{
if (!tun_id_from_cookie) {
wildcards &= OFPFW_ALL;
@@
-281,7
+281,7
@@
flow_to_match(const flow_t *flow, uint32_t wildcards, bool tun_id_from_cookie,
void
flow_from_match(const struct ofp_match *match, bool tun_id_from_cookie,
void
flow_from_match(const struct ofp_match *match, bool tun_id_from_cookie,
- uint64_t cookie,
flow_t
*flow, uint32_t *flow_wildcards)
+ uint64_t cookie,
struct flow
*flow, uint32_t *flow_wildcards)
{
uint32_t wildcards = ntohl(match->wildcards);
{
uint32_t wildcards = ntohl(match->wildcards);
@@
-304,15
+304,13
@@
flow_from_match(const struct ofp_match *match, bool tun_id_from_cookie,
memcpy(flow->dl_dst, match->dl_dst, ETH_ADDR_LEN);
flow->nw_tos = match->nw_tos;
flow->nw_proto = match->nw_proto;
memcpy(flow->dl_dst, match->dl_dst, ETH_ADDR_LEN);
flow->nw_tos = match->nw_tos;
flow->nw_proto = match->nw_proto;
- memset(flow->reserved, 0, sizeof flow->reserved);
-
if (flow_wildcards) {
*flow_wildcards = wildcards;
}
}
char *
if (flow_wildcards) {
*flow_wildcards = wildcards;
}
}
char *
-flow_to_string(const
flow_t
*flow)
+flow_to_string(const
struct flow
*flow)
{
struct ds ds = DS_EMPTY_INITIALIZER;
flow_format(&ds, flow);
{
struct ds ds = DS_EMPTY_INITIALIZER;
flow_format(&ds, flow);
@@
-320,7
+318,7
@@
flow_to_string(const flow_t *flow)
}
void
}
void
-flow_format(struct ds *ds, const
flow_t
*flow)
+flow_format(struct ds *ds, const
struct flow
*flow)
{
ds_put_format(ds, "tunnel%08"PRIx32":in_port%04"PRIx16
":vlan%"PRIu16":pcp%"PRIu8
{
ds_put_format(ds, "tunnel%08"PRIx32":in_port%04"PRIx16
":vlan%"PRIu16":pcp%"PRIu8
@@
-346,7
+344,7
@@
flow_format(struct ds *ds, const flow_t *flow)
}
void
}
void
-flow_print(FILE *stream, const
flow_t *flow)
+flow_print(FILE *stream, const
struct flow *flow)
{
char *s = flow_to_string(flow);
fputs(s, stream);
{
char *s = flow_to_string(flow);
fputs(s, stream);