MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-20 10:13:17 +00:00
Code Issues Releases Wiki Activity

Updated, so if XOpenDisplay() fails, an error is propagated back up

Browse Source
This commit is contained in:
Bryan Roe
2019-01-23 17:17:05 -08:00
parent 14a65d4bca
commit 6c6c0ff9ab
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
meshcore/KVM/Linux/linux_kvm.c
View File

@@ -87,6 +87,19 @@ typedef struct x11_struct
}x11_struct; }x11_struct;
x11_struct *x11_exports = NULL; x11_struct *x11_exports = NULL;
void kvm_send_error(char *msg)
{
int msgLen = strnlen_s(msg, 255);
char buffer[512];
((unsigned short*)buffer)[0] = (unsigned short)htons((unsigned short)MNG_ERROR); // Write the type
((unsigned short*)buffer)[1] = (unsigned short)htons((unsigned short)(msgLen + 4)); // Write the size
memcpy_s(buffer + 4, 512 - 4, msg, msgLen);
if (write(slave2master[1], buffer, msgLen + 4)) {}
fsync(slave2master[1]);
}
void kvm_send_resolution() void kvm_send_resolution()
{ {
char buffer[8]; char buffer[8];
@@ -341,6 +354,7 @@ int kvm_init(int displayNo)
//fprintf(logFile, "DisplayString=%s\n", displayString); //fprintf(logFile, "DisplayString=%s\n", displayString);
//fprintf(logFile, "XAUTHORITY is %s", getenv("XAUTHORITY")); fflush(logFile); //fprintf(logFile, "XAUTHORITY is %s", getenv("XAUTHORITY")); fflush(logFile);
//fprintf(logFile, "Error calling XOpenDisplay()\n"); fflush(logFile); //fprintf(logFile, "Error calling XOpenDisplay()\n"); fflush(logFile);
kvm_send_error("Error occured calling XOpenDisplay()");
} }
if (eventdisplay != NULL) { current_display = (unsigned short)displayNo; } if (eventdisplay != NULL) { current_display = (unsigned short)displayNo; }