iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VSOCK: Introduce vsock_auto_bind helper

Browse Source 
This peace of code is called three times, let's have a helper for it.

Signed-off-by: Asias He <asias@redhat.com>
Acked-by: Andy King <acking@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Asias He 2013-06-20 17:20:30 +08:00 committed by David S. Miller
parent b33698e267
commit b3a6dfe817
1 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
net/vmw_vsock/af_vsock.c
View File

@ -165,6 +165,18 @@ static struct list_head vsock_bind_table[VSOCK_HASH_SIZE + 1];
static struct list_head vsock_connected_table[VSOCK_HASH_SIZE]; static struct list_head vsock_connected_table[VSOCK_HASH_SIZE];
static DEFINE_SPINLOCK(vsock_table_lock); static DEFINE_SPINLOCK(vsock_table_lock);
/* Autobind this socket to the local address if necessary. */
static int vsock_auto_bind(struct vsock_sock *vsk)
{
struct sock *sk = sk_vsock(vsk);
struct sockaddr_vm local_addr;
if (vsock_addr_bound(&vsk->local_addr))
return 0;
vsock_addr_init(&local_addr, VMADDR_CID_ANY, VMADDR_PORT_ANY);
return __vsock_bind(sk, &local_addr);
}
static void vsock_init_tables(void) static void vsock_init_tables(void)
{ {
int i; int i;
@ -956,15 +968,10 @@ static int vsock_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock,
lock_sock(sk); lock_sock(sk);
if (!vsock_addr_bound(&vsk->local_addr)) { err = vsock_auto_bind(vsk);
struct sockaddr_vm local_addr; if (err)
goto out;
vsock_addr_init(&local_addr, VMADDR_CID_ANY, VMADDR_PORT_ANY);
err = __vsock_bind(sk, &local_addr);
if (err != 0)
goto out;
}
/* If the provided message contains an address, use that. Otherwise /* If the provided message contains an address, use that. Otherwise
* fall back on the socket's remote handle (if it has been connected). * fall back on the socket's remote handle (if it has been connected).
@ -1038,15 +1045,9 @@ static int vsock_dgram_connect(struct socket *sock,
lock_sock(sk); lock_sock(sk);
if (!vsock_addr_bound(&vsk->local_addr)) { err = vsock_auto_bind(vsk);
struct sockaddr_vm local_addr; if (err)
goto out;
vsock_addr_init(&local_addr, VMADDR_CID_ANY, VMADDR_PORT_ANY);
err = __vsock_bind(sk, &local_addr);
if (err != 0)
goto out;
}
if (!transport->dgram_allow(remote_addr->svm_cid, if (!transport->dgram_allow(remote_addr->svm_cid,
remote_addr->svm_port)) { remote_addr->svm_port)) {
@ -1163,17 +1164,9 @@ static int vsock_stream_connect(struct socket *sock, struct sockaddr *addr,
memcpy(&vsk->remote_addr, remote_addr, memcpy(&vsk->remote_addr, remote_addr,
sizeof(vsk->remote_addr)); sizeof(vsk->remote_addr));
/* Autobind this socket to the local address if necessary. */ err = vsock_auto_bind(vsk);
if (!vsock_addr_bound(&vsk->local_addr)) { if (err)
struct sockaddr_vm local_addr; goto out;
vsock_addr_init(&local_addr, VMADDR_CID_ANY,
VMADDR_PORT_ANY);
err = __vsock_bind(sk, &local_addr);
if (err != 0)
goto out;
}
sk->sk_state = SS_CONNECTING; sk->sk_state = SS_CONNECTING;