projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib: Replace IP_TYPE_ references with IPPROTO_.
[openvswitch]
/
lib
/
flow.c
diff --git
a/lib/flow.c
b/lib/flow.c
index 6842d3b5a17cc4433dac6e68cdfa0cfa9160cbda..7be10e29b0a708b3ca2f9a0c5be67a2256bffb2d 100644
(file)
--- a/
lib/flow.c
+++ b/
lib/flow.c
@@
-183,21
+183,21
@@
flow_extract(struct ofpbuf *packet, ovs_be64 tun_id, uint16_t in_port,
flow->nw_proto = nh->ip_proto;
packet->l4 = b.data;
if (!IP_IS_FRAGMENT(nh->ip_frag_off)) {
flow->nw_proto = nh->ip_proto;
packet->l4 = b.data;
if (!IP_IS_FRAGMENT(nh->ip_frag_off)) {
- if (flow->nw_proto == IP
_TYPE
_TCP) {
+ if (flow->nw_proto == IP
PROTO
_TCP) {
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;
}
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;
}
- } else if (flow->nw_proto == IP
_TYPE
_UDP) {
+ } else if (flow->nw_proto == IP
PROTO
_UDP) {
const struct udp_header *udp = pull_udp(&b);
if (udp) {
flow->tp_src = udp->udp_src;
flow->tp_dst = udp->udp_dst;
packet->l7 = b.data;
}
const struct udp_header *udp = pull_udp(&b);
if (udp) {
flow->tp_src = udp->udp_src;
flow->tp_dst = udp->udp_dst;
packet->l7 = b.data;
}
- } else if (flow->nw_proto == IP
_TYPE
_ICMP) {
+ } else if (flow->nw_proto == IP
PROTO
_ICMP) {
const struct icmp_header *icmp = pull_icmp(&b);
if (icmp) {
flow->icmp_type = htons(icmp->icmp_type);
const struct icmp_header *icmp = pull_icmp(&b);
if (icmp) {
flow->icmp_type = htons(icmp->icmp_type);
@@
-240,7
+240,7
@@
flow_extract_stats(const struct flow *flow, struct ofpbuf *packet,
memset(stats, 0, sizeof(*stats));
if ((flow->dl_type == htons(ETH_TYPE_IP)) && packet->l4) {
memset(stats, 0, sizeof(*stats));
if ((flow->dl_type == htons(ETH_TYPE_IP)) && packet->l4) {
- if ((flow->nw_proto == IP
_TYPE
_TCP) && packet->l7) {
+ if ((flow->nw_proto == IP
PROTO
_TCP) && packet->l7) {
struct tcp_header *tcp = packet->l4;
stats->tcp_flags = TCP_FLAGS(tcp->tcp_ctl);
}
struct tcp_header *tcp = packet->l4;
stats->tcp_flags = TCP_FLAGS(tcp->tcp_ctl);
}
@@
-486,7
+486,7
@@
flow_hash_symmetric_l4(const struct flow *flow, uint32_t basis)
if (fields.eth_type == htons(ETH_TYPE_IP)) {
fields.ip_addr = flow->nw_src ^ flow->nw_dst;
fields.ip_proto = flow->nw_proto;
if (fields.eth_type == htons(ETH_TYPE_IP)) {
fields.ip_addr = flow->nw_src ^ flow->nw_dst;
fields.ip_proto = flow->nw_proto;
- if (fields.ip_proto == IP
_TYPE_TCP || fields.ip_proto == IP_TYPE
_UDP) {
+ if (fields.ip_proto == IP
PROTO_TCP || fields.ip_proto == IPPROTO
_UDP) {
fields.tp_addr = flow->tp_src ^ flow->tp_dst;
} else {
fields.tp_addr = htons(0);
fields.tp_addr = flow->tp_src ^ flow->tp_dst;
} else {
fields.tp_addr = htons(0);