projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vconn: Reimplement in terms of the "stream" abstraction.
[openvswitch]
/
lib
/
dpif-netdev.c
diff --git
a/lib/dpif-netdev.c
b/lib/dpif-netdev.c
index cae6d2319a83a9d1eb4dae5f7116da9e0043a92d..816d4025f9d4bd770305b0f139f028182309411c 100644
(file)
--- a/
lib/dpif-netdev.c
+++ b/
lib/dpif-netdev.c
@@
-23,15
+23,11
@@
#include <fcntl.h>
#include <inttypes.h>
#include <net/if.h>
#include <fcntl.h>
#include <inttypes.h>
#include <net/if.h>
-#include <linux/rtnetlink.h>
-#include <linux/ethtool.h>
-#include <linux/sockios.h>
#include <netinet/in.h>
#include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <netinet/in.h>
#include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
-#include <sys/sysmacros.h>
#include <unistd.h>
#include "csum.h"
#include <unistd.h>
#include "csum.h"
@@
-160,7
+156,7
@@
get_dp_netdev(const struct dpif *dpif)
static int
name_to_dp_idx(const char *name)
{
static int
name_to_dp_idx(const char *name)
{
- if (!strncmp(name, "dp", 2) && isdigit(name[2])) {
+ if (!strncmp(name, "dp", 2) && isdigit(
(unsigned char)
name[2])) {
int dp_idx = atoi(name + 2);
if (dp_idx >= 0 && dp_idx < N_DP_NETDEVS) {
return dp_idx;
int dp_idx = atoi(name + 2);
if (dp_idx >= 0 && dp_idx < N_DP_NETDEVS) {
return dp_idx;
@@
-223,7
+219,7
@@
create_dp_netdev(const char *name, int dp_idx, struct dpif **dpifp)
}
/* Create datapath. */
}
/* Create datapath. */
- dp_netdevs[dp_idx] = dp = x
calloc(1,
sizeof *dp);
+ dp_netdevs[dp_idx] = dp = x
zalloc(
sizeof *dp);
list_push_back(&dp_netdev_list, &dp->node);
dp->dp_idx = dp_idx;
dp->open_cnt = 0;
list_push_back(&dp_netdev_list, &dp->node);
dp->dp_idx = dp_idx;
dp->open_cnt = 0;
@@
-377,7
+373,13
@@
do_add_port(struct dp_netdev *dp, const char *devname, uint16_t flags,
if (!internal) {
error = netdev_open(devname, NETDEV_ETH_TYPE_ANY, &netdev);
} else {
if (!internal) {
error = netdev_open(devname, NETDEV_ETH_TYPE_ANY, &netdev);
} else {
- error = netdev_open_tap(devname, &netdev);
+ error = netdev_create(devname, "tap", NULL);
+ if (!error) {
+ error = netdev_open(devname, NETDEV_ETH_TYPE_ANY, &netdev);
+ if (error) {
+ netdev_destroy(devname);
+ }
+ }
}
if (error) {
return error;
}
if (error) {
return error;
@@
-396,7
+398,7
@@
do_add_port(struct dp_netdev *dp, const char *devname, uint16_t flags,
port->netdev = netdev;
port->internal = internal;
port->netdev = netdev;
port->internal = internal;
-
mtu = netdev_get_mtu(netdev
);
+
netdev_get_mtu(netdev, &mtu
);
if (mtu > max_mtu) {
max_mtu = mtu;
}
if (mtu > max_mtu) {
max_mtu = mtu;
}
@@
-422,7
+424,7
@@
dpif_netdev_port_add(struct dpif *dpif, const char *devname, uint16_t flags,
return do_add_port(dp, devname, flags, port_no);
}
}
return do_add_port(dp, devname, flags, port_no);
}
}
- return E
XFULL
;
+ return E
FBIG
;
}
static int
}
static int
@@
-470,6
+472,7
@@
static int
do_del_port(struct dp_netdev *dp, uint16_t port_no)
{
struct dp_netdev_port *port;
do_del_port(struct dp_netdev *dp, uint16_t port_no)
{
struct dp_netdev_port *port;
+ char *name;
int error;
error = get_port_by_number(dp, port_no, &port);
int error;
error = get_port_by_number(dp, port_no, &port);
@@
-482,7
+485,12
@@
do_del_port(struct dp_netdev *dp, uint16_t port_no)
dp->n_ports--;
dp->serial++;
dp->n_ports--;
dp->serial++;
+ name = xstrdup(netdev_get_name(port->netdev));
netdev_close(port->netdev);
netdev_close(port->netdev);
+ if (port->internal) {
+ netdev_destroy(name);
+ }
+ free(name);
free(port);
return 0;
free(port);
return 0;
@@
-667,7
+675,7
@@
dp_netdev_lookup_flow(const struct dp_netdev *dp, const flow_t *key)
}
static void
}
static void
-answer_flow_query(
const struct dp_netdev_flow *flow
,
+answer_flow_query(
struct dp_netdev_flow *flow, uint32_t query_flags
,
struct odp_flow *odp_flow)
{
if (flow) {
struct odp_flow *odp_flow)
{
if (flow) {
@@
-685,6
+693,11
@@
answer_flow_query(const struct dp_netdev_flow *flow,
n * sizeof *odp_flow->actions);
odp_flow->n_actions = flow->n_actions;
}
n * sizeof *odp_flow->actions);
odp_flow->n_actions = flow->n_actions;
}
+
+ if (query_flags & ODPFF_ZERO_TCP_FLAGS) {
+ flow->tcp_ctl = 0;
+ }
+
} else {
odp_flow->stats.error = ENOENT;
}
} else {
odp_flow->stats.error = ENOENT;
}
@@
-698,7
+711,8
@@
dpif_netdev_flow_get(const struct dpif *dpif, struct odp_flow flows[], int n)
for (i = 0; i < n; i++) {
struct odp_flow *odp_flow = &flows[i];
for (i = 0; i < n; i++) {
struct odp_flow *odp_flow = &flows[i];
- answer_flow_query(dp_netdev_lookup_flow(dp, &odp_flow->key), odp_flow);
+ answer_flow_query(dp_netdev_lookup_flow(dp, &odp_flow->key),
+ odp_flow->flags, odp_flow);
}
return 0;
}
}
return 0;
}
@@
-790,7
+804,7
@@
add_flow(struct dpif *dpif, struct odp_flow *odp_flow)
struct dp_netdev_flow *flow;
int error;
struct dp_netdev_flow *flow;
int error;
- flow = x
calloc(1,
sizeof *flow);
+ flow = x
zalloc(
sizeof *flow);
flow->key = odp_flow->key;
flow->key.reserved = 0;
flow->key = odp_flow->key;
flow->key.reserved = 0;
@@
-827,7
+841,7
@@
dpif_netdev_flow_put(struct dpif *dpif, struct odp_flow_put *put)
if (hmap_count(&dp->flow_table) < MAX_FLOWS) {
return add_flow(dpif, &put->flow);
} else {
if (hmap_count(&dp->flow_table) < MAX_FLOWS) {
return add_flow(dpif, &put->flow);
} else {
- return E
XFULL
;
+ return E
FBIG
;
}
} else {
return ENOENT;
}
} else {
return ENOENT;
@@
-854,7
+868,7
@@
dpif_netdev_flow_del(struct dpif *dpif, struct odp_flow *odp_flow)
flow = dp_netdev_lookup_flow(dp, &odp_flow->key);
if (flow) {
flow = dp_netdev_lookup_flow(dp, &odp_flow->key);
if (flow) {
- answer_flow_query(flow, odp_flow);
+ answer_flow_query(flow,
0,
odp_flow);
dp_netdev_free_flow(dp, flow);
return 0;
} else {
dp_netdev_free_flow(dp, flow);
return 0;
} else {
@@
-874,7
+888,7
@@
dpif_netdev_flow_list(const struct dpif *dpif, struct odp_flow flows[], int n)
if (i >= n) {
break;
}
if (i >= n) {
break;
}
- answer_flow_query(flow, &flows[i++]);
+ answer_flow_query(flow,
0,
&flows[i++]);
}
return hmap_count(&dp->flow_table);
}
}
return hmap_count(&dp->flow_table);
}
@@
-890,7
+904,7
@@
dpif_netdev_execute(struct dpif *dpif, uint16_t in_port,
flow_t flow;
int error;
flow_t flow;
int error;
- if (packet->size < ETH_HLEN || packet->size > UINT16_MAX) {
+ if (packet->size < ETH_H
EADER_
LEN || packet->size > UINT16_MAX) {
return EINVAL;
}
return EINVAL;
}
@@
-988,7
+1002,7
@@
dp_netdev_flow_used(struct dp_netdev_flow *flow, const flow_t *key,
time_timeval(&flow->used);
flow->packet_count++;
flow->byte_count += packet->size;
time_timeval(&flow->used);
flow->packet_count++;
flow->byte_count += packet->size;
- if (key->dl_type == htons(ETH_
P
_IP)) {
+ if (key->dl_type == htons(ETH_
TYPE
_IP)) {
struct ip_header *nh = packet->l3;
flow->ip_tos = nh->ip_tos;
struct ip_header *nh = packet->l3;
flow->ip_tos = nh->ip_tos;
@@
-1161,7
+1175,7
@@
static void
dp_netdev_set_tp_port(struct ofpbuf *packet, flow_t *key,
const struct odp_action_tp_port *a)
{
dp_netdev_set_tp_port(struct ofpbuf *packet, flow_t *key,
const struct odp_action_tp_port *a)
{
- if (key->dl_type == htons(ETH_
P
_IP)) {
+ if (key->dl_type == htons(ETH_
TYPE
_IP)) {
uint16_t *field;
if (key->nw_proto == IPPROTO_TCP) {
struct tcp_header *th = packet->l4;
uint16_t *field;
if (key->nw_proto == IPPROTO_TCP) {
struct tcp_header *th = packet->l4;