aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2020-03-16 18:57:23 +0100
committerMarc-André Lureau <marcandre.lureau@redhat.com>2020-03-16 18:57:23 +0100
commit4571ca2a295629830bb3ffdc0b52d66084d436fe (patch)
tree48da53b9e8e623642d96a08eb3c884d3f6daddfb /src
parent464acee1de34d2a05d339c7205c4a8189d6b4c2b (diff)
downloadslirp-4571ca2a295629830bb3ffdc0b52d66084d436fe.zip
slirp-4571ca2a295629830bb3ffdc0b52d66084d436fe.tar.gz
slirp-4571ca2a295629830bb3ffdc0b52d66084d436fe.tar.bz2
socket: remove extra label and variable
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Diffstat (limited to 'src')
-rw-r--r--src/socket.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/socket.c b/src/socket.c
index 37838db..a01b46f 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -824,7 +824,6 @@ void sofwdrain(struct socket *so)
*/
int sotranslate_out(struct socket *so, struct sockaddr_storage *addr)
{
- int rc = 0;
Slirp *slirp = so->slirp;
struct sockaddr_in *sin = (struct sockaddr_in *)addr;
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)addr;
@@ -836,13 +835,12 @@ int sotranslate_out(struct socket *so, struct sockaddr_storage *addr)
/* It's an alias */
if (so->so_faddr.s_addr == slirp->vnameserver_addr.s_addr) {
if (get_dns_addr(&sin->sin_addr) >= 0) {
- goto ret;
+ return 0;
}
}
if (slirp->disable_host_loopback) {
- rc = -1;
errno = EPERM;
- goto ret;
+ return -1;
} else {
sin->sin_addr = loopback_addr;
}
@@ -858,13 +856,12 @@ int sotranslate_out(struct socket *so, struct sockaddr_storage *addr)
uint32_t scope_id;
if (get_dns6_addr(&sin6->sin6_addr, &scope_id) >= 0) {
sin6->sin6_scope_id = scope_id;
- goto ret;
+ return 0;
}
}
if (slirp->disable_host_loopback) {
- rc = -1;
errno = EPERM;
- goto ret;
+ return -1;
} else {
sin6->sin6_addr = in6addr_loopback;
}
@@ -877,8 +874,8 @@ int sotranslate_out(struct socket *so, struct sockaddr_storage *addr)
default:
break;
}
-ret:
- return rc;
+
+ return 0;
}
void sotranslate_in(struct socket *so, struct sockaddr_storage *addr)