Macintosh-HW
/
RASCSI
mirror of https://github.com/akuker/RASCSI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Disable piscsi_bridge creation

This commit is contained in:
Daniel Markstedt 2024-02-17 19:23:52 +09:00
parent 973ae99582
commit a307a85d2f
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cpp/devices/ctapdriver.cpp
View File

@ -113,6 +113,7 @@ bool CTapDriver::Init(const param_map& const_params)
return false; return false;
} }
#if 0
const int br_socket_fd = socket(AF_LOCAL, SOCK_STREAM, 0); const int br_socket_fd = socket(AF_LOCAL, SOCK_STREAM, 0);
if (br_socket_fd < 0) { if (br_socket_fd < 0) {
LogErrno("Can't open bridge socket"); LogErrno("Can't open bridge socket");
@ -121,15 +122,17 @@ bool CTapDriver::Init(const param_map& const_params)
close(ip_fd); close(ip_fd);
return false; return false;
} }
#endif
auto cleanUp = [&] (const string& error) { auto cleanUp = [&] (const string& error) {
LogErrno(error); LogErrno(error);
close(m_hTAP); close(m_hTAP);
close(ip_fd); close(ip_fd);
close(br_socket_fd); // close(br_socket_fd);
return false; return false;
}; };
#if 0
// Check if the bridge has already been created // Check if the bridge has already been created
// TODO Find an alternative to accessing a file, there is most likely a system call/ioctl // TODO Find an alternative to accessing a file, there is most likely a system call/ioctl
if (access(string("/sys/class/net/" + BRIDGE_NAME).c_str(), F_OK)) { if (access(string("/sys/class/net/" + BRIDGE_NAME).c_str(), F_OK)) {
@ -162,6 +165,7 @@ bool CTapDriver::Init(const param_map& const_params)
else { else {
spdlog::info(BRIDGE_NAME + " is already available"); spdlog::info(BRIDGE_NAME + " is already available");
} }
#endif
spdlog::trace(">ip link set piscsi0 up"); spdlog::trace(">ip link set piscsi0 up");
@ -197,6 +201,7 @@ bool CTapDriver::Init(const param_map& const_params)
void CTapDriver::CleanUp() const void CTapDriver::CleanUp() const
{ {
if (m_hTAP != -1) { if (m_hTAP != -1) {
#if 0
if (const int br_socket_fd = socket(AF_LOCAL, SOCK_STREAM, 0); br_socket_fd < 0) { if (const int br_socket_fd = socket(AF_LOCAL, SOCK_STREAM, 0); br_socket_fd < 0) {
LogErrno("Can't open bridge socket"); LogErrno("Can't open bridge socket");
} else { } else {
@ -207,6 +212,7 @@ void CTapDriver::CleanUp() const
} }
close(br_socket_fd); close(br_socket_fd);
} }
#endif
// Release TAP device // Release TAP device
close(m_hTAP); close(m_hTAP);
@ -270,11 +276,13 @@ string CTapDriver::SetUpNonEth0(int socket_fd, int ip_fd, const string& s)
return "Error extracting inet address and netmask"; return "Error extracting inet address and netmask";
} }
#if 0
spdlog::trace(">brctl addbr " + BRIDGE_NAME); spdlog::trace(">brctl addbr " + BRIDGE_NAME);
if (ioctl(socket_fd, SIOCBRADDBR, BRIDGE_NAME.c_str()) < 0) { if (ioctl(socket_fd, SIOCBRADDBR, BRIDGE_NAME.c_str()) < 0) {
return "Can't ioctl SIOCBRADDBR"; return "Can't ioctl SIOCBRADDBR";
} }
#endif
ifreq ifr_a; ifreq ifr_a;
ifr_a.ifr_addr.sa_family = AF_INET; ifr_a.ifr_addr.sa_family = AF_INET;

2
cpp/devices/ctapdriver.h
View File

@ -29,7 +29,7 @@ using namespace std;
class CTapDriver class CTapDriver
{ {
static const string BRIDGE_NAME; // static const string BRIDGE_NAME;
const inline static string DEFAULT_IP = "10.10.20.1/24"; //NOSONAR This hardcoded IP address is safe const inline static string DEFAULT_IP = "10.10.20.1/24"; //NOSONAR This hardcoded IP address is safe

2
cpp/devices/scsi_daynaport.cpp
View File

@ -72,10 +72,12 @@ bool SCSIDaynaPort::Init(const param_map& params)
return true; return true;
} }
#if 0
void SCSIDaynaPort::CleanUp() void SCSIDaynaPort::CleanUp()
{ {
tap.CleanUp(); tap.CleanUp();
} }
#endif
vector<uint8_t> SCSIDaynaPort::InquiryInternal() const vector<uint8_t> SCSIDaynaPort::InquiryInternal() const
{ {

2
cpp/devices/scsi_host_bridge.cpp
View File

@ -67,10 +67,12 @@ bool SCSIBR::Init(const param_map& params)
#endif #endif
} }
#if 0
void SCSIBR::CleanUp() void SCSIBR::CleanUp()
{ {
tap.CleanUp(); tap.CleanUp();
} }
#endif
vector<uint8_t> SCSIBR::InquiryInternal() const vector<uint8_t> SCSIBR::InquiryInternal() const
{ {