/*
- * Copyright (c) 2010 Nicira Networks.
+ * Copyright (c) 2010, 2011 Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <config.h>
#include "multipath.h"
+#include <arpa/inet.h>
#include <inttypes.h>
#include <sys/types.h>
#include <netinet/in.h>
*reg = (*reg & ~(mask << ofs)) | (link << ofs);
}
-static uint32_t
-hash_symmetric_l4(const struct flow *flow, uint16_t basis)
-{
- struct {
- ovs_be32 ip_addr;
- ovs_be16 eth_type;
- ovs_be16 vlan_tci;
- ovs_be16 tp_addr;
- uint8_t eth_addr[ETH_ADDR_LEN];
- uint8_t ip_proto;
- } fields;
-
- int i;
-
- for (i = 0; i < ETH_ADDR_LEN; i++) {
- fields.eth_addr[i] = flow->dl_src[i] ^ flow->dl_dst[i];
- }
- fields.vlan_tci = flow->vlan_tci & htons(VLAN_VID_MASK);
- fields.eth_type = flow->dl_type;
- 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) {
- fields.tp_addr = flow->tp_src ^ flow->tp_dst;
- } else {
- fields.tp_addr = htons(0);
- }
- } else {
- fields.ip_addr = htonl(0);
- fields.ip_proto = 0;
- fields.tp_addr = htons(0);
- }
- return hash_bytes(&fields, sizeof fields, basis);
-}
-
static uint32_t
multipath_hash(const struct flow *flow, enum nx_mp_fields fields,
uint16_t basis)
return hash_bytes(flow->dl_src, sizeof flow->dl_src, basis);
case NX_MP_FIELDS_SYMMETRIC_L4:
- return hash_symmetric_l4(flow, basis);
+ return flow_hash_symmetric_l4(flow, basis);
}
NOT_REACHED();
return hash % n_links;
case NX_MP_ALG_HASH_THRESHOLD:
- return hash / (UINT32_MAX / n_links);
+ if (n_links == 1) {
+ return 0;
+ }
+ return hash / (UINT32_MAX / n_links + 1);
case NX_MP_ALG_HRW:
return (n_links <= 64
{
const char *fields, *algorithm;
- switch ((enum nx_mp_fields) ntohs(mp->fields)) {
+ uint16_t mp_fields = ntohs(mp->fields);
+ uint16_t mp_algorithm = ntohs(mp->algorithm);
+
+ switch ((enum nx_mp_fields) mp_fields) {
case NX_MP_FIELDS_ETH_SRC:
fields = "eth_src";
break;
fields = "<unknown>";
}
- switch ((enum nx_mp_algorithm) ntohs(mp->algorithm)) {
+ switch ((enum nx_mp_algorithm) mp_algorithm) {
case NX_MP_ALG_MODULO_N:
algorithm = "modulo_n";
break;