cleaner error handling on UDP encapsultion sockopt failure

src/charon/network/socket.c

@@ -389,16 +389,15 @@ static status_t initialize(private_socket_t *this)
 	{
 		this->logger->log(this->logger, ERROR, "unable to setup send socket on port %d!", this->natt_port);
 		return FAILED;
-	} else {
+	}
-		int type = UDP_ENCAP_ESPINUDP;
+	else
-		if (setsockopt(this->natt_fd, SOL_UDP, UDP_ENCAP, &type, sizeof(type)) < 0 
-		    && errno == ENOPROTOOPT)
 	{
-			this->logger->log(this->logger, ERROR, "unable to set UDP_ENCAP on natt send socket!");
+		int type = UDP_ENCAP_ESPINUDP;
-			close(this->natt_fd);
+		if (setsockopt(this->natt_fd, SOL_UDP, UDP_ENCAP, &type, sizeof(type)) < 0)
-			close(this->send_fd);
+		{
-			close(this->raw_fd);
+			this->logger->log(this->logger, ERROR, 
-			return FAILED;
+							  "unable to set UDP_ENCAP on natt send socket! NAT-T may fail! error: %s",
+							  strerror(errno)); 
 		}
 	}