Clean up unnecessary goto exit handler in raw_socket().
This commit is contained in:
parent
028d3b7bae
commit
ccae6e4c8a
@ -178,7 +178,7 @@ int raw_socket(int ifindex)
|
|||||||
log_line("Opening raw socket on ifindex %d", ifindex);
|
log_line("Opening raw socket on ifindex %d", ifindex);
|
||||||
if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) {
|
if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) {
|
||||||
log_error("socket call failed: %s", strerror(errno));
|
log_error("socket call failed: %s", strerror(errno));
|
||||||
goto out;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (SERVER_PORT == 67 && CLIENT_PORT == 68) {
|
if (SERVER_PORT == 67 && CLIENT_PORT == 68) {
|
||||||
@ -194,12 +194,9 @@ int raw_socket(int ifindex)
|
|||||||
sock.sll_ifindex = ifindex;
|
sock.sll_ifindex = ifindex;
|
||||||
if (bind(fd, (struct sockaddr *)&sock, sizeof(sock)) < 0) {
|
if (bind(fd, (struct sockaddr *)&sock, sizeof(sock)) < 0) {
|
||||||
log_error("bind call failed: %s", strerror(errno));
|
log_error("bind call failed: %s", strerror(errno));
|
||||||
goto out_fd;
|
close(fd);
|
||||||
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
return fd;
|
return fd;
|
||||||
out_fd:
|
|
||||||
close(fd);
|
|
||||||
out:
|
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user