mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-19 12:06:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Default to port 5900

Browse Source
This commit is contained in:
Isaac Connor
2021-03-30 11:37:00 -04:00
parent 8c6f03a4e4
commit c7754e5be8
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/zm_libvnc_camera.cpp
View File

@@ -49,11 +49,11 @@ static char* GetPasswordCallback(rfbClient* cl) {
}
static rfbCredential* GetCredentialsCallback(rfbClient* cl, int credentialType){
rfbCredential *c = (rfbCredential *)malloc(sizeof(rfbCredential));
if (credentialType != rfbCredentialTypeUser) {
free(c);
Debug(1, "credentialType != rfbCredentialTypeUser");
return nullptr;
}
rfbCredential *c = (rfbCredential *)malloc(sizeof(rfbCredential));
Debug(1, "Getcredentials: %s:%s", (*rfbClientGetClientData_f)(cl, &TAG_1), (*rfbClientGetClientData_f)(cl, &TAG_2));
c->userCredential.password = strdup((const char *)(*rfbClientGetClientData_f)(cl, &TAG_1));
@@ -168,9 +168,16 @@ int VncCamera::PrimeCapture() {
mRfb->GetCredential = GetCredentialsCallback;
mRfb->programName = "Zoneminder VNC Monitor";
if ( mRfb->serverHost ) free(mRfb->serverHost);
if (mRfb->serverHost) free(mRfb->serverHost);
mRfb->serverHost = strdup(mHost.c_str());
mRfb->serverPort = atoi(mPort.c_str());
if (!mRfb->serverPort) {
Debug(1, "Defaulting to port 5900");
mRfb->serverPort = 5900;
}
} else {
Debug(1, "mRfb already exists?");
}
if (!(*rfbInitClient_f)(mRfb, 0, nullptr)) {
/* IF rfbInitClient fails, it calls rdbClientCleanup which will free mRfb */