projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename UNUSED macro to OVS_UNUSED to avoid naming conflict.
[openvswitch]
/
lib
/
vconn-tcp.c
diff --git
a/lib/vconn-tcp.c
b/lib/vconn-tcp.c
index b4e52343576bb05988911985943cb6503a015964..906718d5bdaefa7c492d413d31ed6ea5f0641b62 100644
(file)
--- a/
lib/vconn-tcp.c
+++ b/
lib/vconn-tcp.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009
, 2010
Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-75,7
+75,7
@@
tcp_open(const char *name, char *suffix, struct vconn **vconnp)
struct sockaddr_in sin;
int fd, error;
struct sockaddr_in sin;
int fd, error;
- error =
tcp_open_active(
suffix, OFP_TCP_PORT, &sin, &fd);
+ error =
inet_open_active(SOCK_STREAM,
suffix, OFP_TCP_PORT, &sin, &fd);
if (fd >= 0) {
return new_tcp_vconn(name, fd, error, &sin, vconnp);
} else {
if (fd >= 0) {
return new_tcp_vconn(name, fd, error, &sin, vconnp);
} else {
@@
-100,11
+100,11
@@
static int ptcp_accept(int fd, const struct sockaddr *sa, size_t sa_len,
struct vconn **vconnp);
static int
struct vconn **vconnp);
static int
-ptcp_open(const char *name UNUSED, char *suffix, struct pvconn **pvconnp)
+ptcp_open(const char *name
OVS_
UNUSED, char *suffix, struct pvconn **pvconnp)
{
int fd;
{
int fd;
- fd =
tcp_open_passive(
suffix, OFP_TCP_PORT);
+ fd =
inet_open_passive(SOCK_STREAM,
suffix, OFP_TCP_PORT);
if (fd < 0) {
return -fd;
} else {
if (fd < 0) {
return -fd;
} else {