Attachment #201925 for bug #232969

View | Details | Raw Unified | Return to bug 232969 | Differences between
Collapse All | Expand All




--- src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp.orig	2017-07-27 13:18:27 UTC
+++ src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp
@@ -58,45 +58,36 @@
 
 int CollectorFreeBSD::getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available)
 {
-    int rc = VINF_SUCCESS;
     u_long cbMemPhys = 0;
     u_int cPagesMemFree = 0;
-    u_int cPagesMemInactive = 0;
     u_int cPagesMemCached = 0;
     u_int cPagesMemUsed = 0;
     int cbPage = 0;
-    size_t cbParameter = sizeof(cbMemPhys);
-    int cProcessed = 0;
-
-    if (!sysctlbyname("hw.physmem", &cbMemPhys, &cbParameter, NULL, 0))
-        cProcessed++;
+    size_t cbParameter;
 
+    cbParameter = sizeof(cbMemPhys);
+    if (sysctlbyname("hw.physmem", &cbMemPhys, &cbParameter, NULL, 0))
+        return VERR_NOT_SUPPORTED;
     cbParameter = sizeof(cPagesMemFree);
-    if (!sysctlbyname("vm.stats.vm.v_free_count", &cPagesMemFree, &cbParameter, NULL, 0))
-        cProcessed++;
+    if (sysctlbyname("vm.stats.vm.v_free_count", &cPagesMemFree, &cbParameter, NULL, 0))
+        return VERR_NOT_SUPPORTED;
     cbParameter = sizeof(cPagesMemUsed);
-    if (!sysctlbyname("vm.stats.vm.v_active_count", &cPagesMemUsed, &cbParameter, NULL, 0))
-        cProcessed++;
-    cbParameter = sizeof(cPagesMemInactive);
-    if (!sysctlbyname("vm.stats.vm.v_inactive_count", &cPagesMemInactive, &cbParameter, NULL, 0))
-        cProcessed++;
+    if (sysctlbyname("vm.stats.vm.v_active_count", &cPagesMemUsed, &cbParameter, NULL, 0))
+        return VERR_NOT_SUPPORTED;
+#if __FreeBSD_version < 1200016
     cbParameter = sizeof(cPagesMemCached);
-    if (!sysctlbyname("vm.stats.vm.v_cache_count", &cPagesMemCached, &cbParameter, NULL, 0))
-        cProcessed++;
+    if (sysctlbyname("vm.stats.vm.v_cache_count", &cPagesMemCached, &cbParameter, NULL, 0))
+        return VERR_NOT_SUPPORTED;
+#endif
         cProcessed++;
     cbParameter = sizeof(cbPage);
-    if (!sysctlbyname("hw.pagesize", &cbPage, &cbParameter, NULL, 0))
-        cProcessed++;
+    if (sysctlbyname("hw.pagesize", &cbPage, &cbParameter, NULL, 0))
+        return VERR_NOT_SUPPORTED;
 
-    if (cProcessed == 6)
-    {
-        *total     = cbMemPhys / _1K;
-        *used      = cPagesMemUsed * (cbPage / _1K);
-        *available = (cPagesMemFree + cPagesMemInactive + cPagesMemCached ) * (cbPage / _1K);
-    }
-    else
-        rc = VERR_NOT_SUPPORTED;
+    *total     = cbMemPhys / _1K;
+    *used      = (ULONG64)cPagesMemUsed * (cbPage / _1K);
+    *available = ((ULONG64)cPagesMemFree + cPagesMemCached) * (cbPage / _1K);
 
-    return rc;
+    return VINF_SUCCESS;
 }
 
 int CollectorFreeBSD::getProcessCpuLoad(RTPROCESS process, ULONG *user, ULONG *kernel)




--- src/VBox/RDP/client-1.8.4/ssl.c.orig	2019-01-25 21:31:48.000000000 +0300
+++ src/VBox/RDP/client-1.8.4/ssl.c	2019-02-11 12:38:31.251992000 +0300
@@ -97,7 +97,7 @@
 rdssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * modulus,
 		  uint8 * exponent)
 {
-#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
 	BN_CTX *ctx;
 	BIGNUM *mod, *exp, *x, *y;
 	uint8 inr[SEC_MAX_MODULUS_SIZE];
@@ -128,7 +128,7 @@
 	BN_free(exp);
 	BN_free(mod);
 	BN_CTX_free(ctx);
-#else /* OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) */
+#else
 	BN_CTX *ctx;
 	BIGNUM mod, exp, x, y;
 	uint8 inr[SEC_MAX_MODULUS_SIZE];
@@ -316,12 +316,12 @@
 rdssl_hmac_md5(const void *key, int key_len, const unsigned char *msg, int msg_len,
 	       unsigned char *md)
 {
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(LIBRESSL_VERSION_NUMBER)
 	HMAC_CTX ctx;
 	HMAC_CTX_init(&ctx);
 #endif
 	HMAC(EVP_md5(), key, key_len, msg, msg_len, md, NULL);
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(LIBRESSL_VERSION_NUMBER)
 	HMAC_CTX_cleanup(&ctx);
 #endif
 }




--- src/VBox/RDP/client-1.8.4/tcp.c.orig	2019-01-25 21:31:48.000000000 +0300
+++ src/VBox/RDP/client-1.8.4/tcp.c	2019-02-11 12:39:02.556043000 +0300
@@ -311,8 +311,10 @@
 
 	if (!g_ssl_initialized)
 	{
+#ifndef LIBRESSL_VERSION_NUMBER
 		SSL_load_error_strings();
 		SSL_library_init();
+#endif
 		g_ssl_initialized = True;
 	}
 




--- src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp.orig	2017-07-27 13:18:46 UTC
+++ src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp
@@ -63,9 +63,7 @@
 
     int rc = VINF_SUCCESS;
     u_int cPagesMemFree = 0;
-    u_int cPagesMemInactive = 0;
     u_int cPagesMemCached = 0;
-    u_int cPagesMemUsed = 0;
     int cbPage = 0;
     size_t cbParameter;
     int cProcessed = 0;
@@ -73,25 +71,19 @@
     cbParameter = sizeof(cPagesMemFree);
     if (sysctlbyname("vm.stats.vm.v_free_count", &cPagesMemFree, &cbParameter, NULL, 0))
         rc = RTErrConvertFromErrno(errno);

-    if (   RT_SUCCESS(rc)
-        && sysctlbyname("vm.stats.vm.v_active_count", &cPagesMemUsed, &cbParameter, NULL, 0))
-        rc = RTErrConvertFromErrno(errno);
-    cbParameter = sizeof(cPagesMemInactive);
-    if (   RT_SUCCESS(rc)
-        && sysctlbyname("vm.stats.vm.v_inactive_count", &cPagesMemInactive, &cbParameter, NULL, 0))
-        rc = RTErrConvertFromErrno(errno);
+#if __FreeBSD_version < 1200016
     cbParameter = sizeof(cPagesMemCached);
     if (   RT_SUCCESS(rc)

 
     if (RT_SUCCESS(rc))
-        *pcb = (cPagesMemFree + cPagesMemInactive + cPagesMemCached ) * cbPage;
+        *pcb = ((uint64_t)cPagesMemFree + cPagesMemCached) * cbPage;
 
     return rc;
 }

Return to bug 232969

Lines 1-24 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_PerformanceFreeBSD.cpp (-16 / +58 lines)
1	--- src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp.orig 2017-07-27 13:18:27 UTC	1	--- src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp.orig 2017-07-27 13:18:27 UTC
2	+++ src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp	2	+++ src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp
3	@@ -80,8 +80,10 @@ int CollectorFreeBSD::getHostMemoryUsage(ULONG *total,	3	@@ -58,45 +58,36 @@
4	cbParameter = sizeof(cPagesMemInactive);	4
5	if (!sysctlbyname("vm.stats.vm.v_inactive_count", &cPagesMemInactive, &cbParameter, NULL, 0))	5	int CollectorFreeBSD::getHostMemoryUsage(ULONG total, ULONG used, ULONG *available)
6	cProcessed++;	6	{
		7	- int rc = VINF_SUCCESS;
		8	u_long cbMemPhys = 0;
		9	u_int cPagesMemFree = 0;
		10	- u_int cPagesMemInactive = 0;
		11	u_int cPagesMemCached = 0;
		12	u_int cPagesMemUsed = 0;
		13	int cbPage = 0;
		14	- size_t cbParameter = sizeof(cbMemPhys);
		15	- int cProcessed = 0;
		16	-
		17	- if (!sysctlbyname("hw.physmem", &cbMemPhys, &cbParameter, NULL, 0))
		18	- cProcessed++;
		19	+ size_t cbParameter;
		20
		21	+ cbParameter = sizeof(cbMemPhys);
		22	+ if (sysctlbyname("hw.physmem", &cbMemPhys, &cbParameter, NULL, 0))
		23	+ return VERR_NOT_SUPPORTED;
		24	cbParameter = sizeof(cPagesMemFree);
		25	- if (!sysctlbyname("vm.stats.vm.v_free_count", &cPagesMemFree, &cbParameter, NULL, 0))
		26	- cProcessed++;
		27	+ if (sysctlbyname("vm.stats.vm.v_free_count", &cPagesMemFree, &cbParameter, NULL, 0))
		28	+ return VERR_NOT_SUPPORTED;
		29	cbParameter = sizeof(cPagesMemUsed);
		30	- if (!sysctlbyname("vm.stats.vm.v_active_count", &cPagesMemUsed, &cbParameter, NULL, 0))
		31	- cProcessed++;
		32	- cbParameter = sizeof(cPagesMemInactive);
		33	- if (!sysctlbyname("vm.stats.vm.v_inactive_count", &cPagesMemInactive, &cbParameter, NULL, 0))
		34	- cProcessed++;
		35	+ if (sysctlbyname("vm.stats.vm.v_active_count", &cPagesMemUsed, &cbParameter, NULL, 0))
		36	+ return VERR_NOT_SUPPORTED;
7	+#if __FreeBSD_version < 1200016	37	+#if __FreeBSD_version < 1200016
8	cbParameter = sizeof(cPagesMemCached);	38	cbParameter = sizeof(cPagesMemCached);
9	if (!sysctlbyname("vm.stats.vm.v_cache_count", &cPagesMemCached, &cbParameter, NULL, 0))	39	- if (!sysctlbyname("vm.stats.vm.v_cache_count", &cPagesMemCached, &cbParameter, NULL, 0))
		40	- cProcessed++;
		41	+ if (sysctlbyname("vm.stats.vm.v_cache_count", &cPagesMemCached, &cbParameter, NULL, 0))
		42	+ return VERR_NOT_SUPPORTED;
10	+#endif	43	+#endif
11	cProcessed++;
12	cbParameter = sizeof(cbPage);	44	cbParameter = sizeof(cbPage);
13	if (!sysctlbyname("hw.pagesize", &cbPage, &cbParameter, NULL, 0))	45	- if (!sysctlbyname("hw.pagesize", &cbPage, &cbParameter, NULL, 0))
14	@@ -90,8 +92,8 @@ int CollectorFreeBSD::getHostMemoryUsage(ULONG *total,	46	- cProcessed++;
15	if (cProcessed == 6)	47	+ if (sysctlbyname("hw.pagesize", &cbPage, &cbParameter, NULL, 0))
16	{	48	+ return VERR_NOT_SUPPORTED;
17	*total = cbMemPhys / _1K;	49
		50	- if (cProcessed == 6)
		51	- {
		52	- *total = cbMemPhys / _1K;
18	- used = cPagesMemUsed (cbPage / _1K);	53	- used = cPagesMemUsed (cbPage / _1K);
19	- available = (cPagesMemFree + cPagesMemInactive + cPagesMemCached ) (cbPage / _1K);	54	- available = (cPagesMemFree + cPagesMemInactive + cPagesMemCached ) (cbPage / _1K);
20	+ used = (uint64_t)cPagesMemUsed (cbPage / _1K);	55	- }
21	+ available = ((uint64_t)cPagesMemFree + cPagesMemInactive + cPagesMemCached) (cbPage / _1K);	56	- else
22	}	57	- rc = VERR_NOT_SUPPORTED;
23	else	58	+ *total = cbMemPhys / _1K;
24	rc = VERR_NOT_SUPPORTED;	59	+ used = (ULONG64)cPagesMemUsed (cbPage / _1K);
		60	+ available = ((ULONG64)cPagesMemFree + cPagesMemCached) (cbPage / _1K);
		61
		62	- return rc;
		63	+ return VINF_SUCCESS;
		64	}
		65
		66	int CollectorFreeBSD::getProcessCpuLoad(RTPROCESS process, ULONG user, ULONG kernel)

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_RDP_client-1.8.4_ssl.c (+35 lines)
	1	--- src/VBox/RDP/client-1.8.4/ssl.c.orig 2019-01-25 21:31:48.000000000 +0300
	2	+++ src/VBox/RDP/client-1.8.4/ssl.c 2019-02-11 12:38:31.251992000 +0300
	3	@@ -97,7 +97,7 @@
	4	rdssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * modulus,
	5	uint8 * exponent)
	6	{
	7	-#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
	8	+#if OPENSSL_VERSION_NUMBER >= 0x10100000 \|\| defined(LIBRESSL_VERSION_NUMBER)
	9	BN_CTX *ctx;
	10	BIGNUM mod, exp, x, y;
	11	uint8 inr[SEC_MAX_MODULUS_SIZE];
	12	@@ -128,7 +128,7 @@
	13	BN_free(exp);
	14	BN_free(mod);
	15	BN_CTX_free(ctx);
	16	-#else /* OPENSSL_VERSION_NUMBER < 0x10100000 \|\| defined(LIBRESSL_VERSION_NUMBER) */
	17	+#else
	18	BN_CTX *ctx;
	19	BIGNUM mod, exp, x, y;
	20	uint8 inr[SEC_MAX_MODULUS_SIZE];
	21	@@ -316,12 +316,12 @@
	22	rdssl_hmac_md5(const void key, int key_len, const unsigned char msg, int msg_len,
	23	unsigned char *md)
	24	{
	25	-#if OPENSSL_VERSION_NUMBER < 0x10100000 \|\| defined(LIBRESSL_VERSION_NUMBER)
	26	+#if OPENSSL_VERSION_NUMBER < 0x10100000 \|\| !defined(LIBRESSL_VERSION_NUMBER)
	27	HMAC_CTX ctx;
	28	HMAC_CTX_init(&ctx);
	29	#endif
	30	HMAC(EVP_md5(), key, key_len, msg, msg_len, md, NULL);
	31	-#if OPENSSL_VERSION_NUMBER < 0x10100000 \|\| defined(LIBRESSL_VERSION_NUMBER)
	32	+#if OPENSSL_VERSION_NUMBER < 0x10100000 \|\| !defined(LIBRESSL_VERSION_NUMBER)
	33	HMAC_CTX_cleanup(&ctx);
	34	#endif
	35	}

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_RDP_client-1.8.4_tcp.c (+13 lines)
	1	--- src/VBox/RDP/client-1.8.4/tcp.c.orig 2019-01-25 21:31:48.000000000 +0300
	2	+++ src/VBox/RDP/client-1.8.4/tcp.c 2019-02-11 12:39:02.556043000 +0300
	3	@@ -311,8 +311,10 @@
	4
	5	if (!g_ssl_initialized)
	6	{
	7	+#ifndef LIBRESSL_VERSION_NUMBER
	8	SSL_load_error_strings();
	9	SSL_library_init();
	10	+#endif
	11	g_ssl_initialized = True;
	12	}
	13

Lines 1-14 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r3_freebsd_systemmem-freebsd.cpp (-8 / +10 lines)
1	--- src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp.orig 2017-07-27 13:18:46 UTC	1	--- src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp.orig 2017-07-27 13:18:46 UTC
2	+++ src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp	2	+++ src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp
3	@@ -65,7 +65,6 @@ RTDECL(int) RTSystemQueryAvailableRam(uint64_t *pcb)	3	@@ -63,9 +63,7 @@
		4
		5	int rc = VINF_SUCCESS;
4	u_int cPagesMemFree = 0;	6	u_int cPagesMemFree = 0;
5	u_int cPagesMemInactive = 0;	7	- u_int cPagesMemInactive = 0;
6	u_int cPagesMemCached = 0;	8	u_int cPagesMemCached = 0;
7	- u_int cPagesMemUsed = 0;	9	- u_int cPagesMemUsed = 0;
8	int cbPage = 0;	10	int cbPage = 0;
9	size_t cbParameter;	11	size_t cbParameter;
10	int cProcessed = 0;	12	int cProcessed = 0;
11	@@ -73,25 +72,23 @@ RTDECL(int) RTSystemQueryAvailableRam(uint64_t *pcb)	13	@@ -73,25 +71,19 @@
12	cbParameter = sizeof(cPagesMemFree);	14	cbParameter = sizeof(cPagesMemFree);
13	if (sysctlbyname("vm.stats.vm.v_free_count", &cPagesMemFree, &cbParameter, NULL, 0))	15	if (sysctlbyname("vm.stats.vm.v_free_count", &cPagesMemFree, &cbParameter, NULL, 0))
14	rc = RTErrConvertFromErrno(errno);	16	rc = RTErrConvertFromErrno(errno);
Lines 16-25 Link Here
16	- if ( RT_SUCCESS(rc)	18	- if ( RT_SUCCESS(rc)
17	- && sysctlbyname("vm.stats.vm.v_active_count", &cPagesMemUsed, &cbParameter, NULL, 0))	19	- && sysctlbyname("vm.stats.vm.v_active_count", &cPagesMemUsed, &cbParameter, NULL, 0))
18	- rc = RTErrConvertFromErrno(errno);	20	- rc = RTErrConvertFromErrno(errno);
19	cbParameter = sizeof(cPagesMemInactive);	21	- cbParameter = sizeof(cPagesMemInactive);
20	if ( RT_SUCCESS(rc)	22	- if ( RT_SUCCESS(rc)
21	&& sysctlbyname("vm.stats.vm.v_inactive_count", &cPagesMemInactive, &cbParameter, NULL, 0))	23	- && sysctlbyname("vm.stats.vm.v_inactive_count", &cPagesMemInactive, &cbParameter, NULL, 0))
22	rc = RTErrConvertFromErrno(errno);	24	- rc = RTErrConvertFromErrno(errno);
23	+#if __FreeBSD_version < 1200016	25	+#if __FreeBSD_version < 1200016
24	cbParameter = sizeof(cPagesMemCached);	26	cbParameter = sizeof(cPagesMemCached);
25	if ( RT_SUCCESS(rc)	27	if ( RT_SUCCESS(rc)
Lines 33-39 Link Here
33		35
34	if (RT_SUCCESS(rc))	36	if (RT_SUCCESS(rc))
35	- pcb = (cPagesMemFree + cPagesMemInactive + cPagesMemCached ) cbPage;	37	- pcb = (cPagesMemFree + cPagesMemInactive + cPagesMemCached ) cbPage;
36	+ pcb = ((uint64_t)cPagesMemFree + cPagesMemInactive + cPagesMemCached) cbPage;	38	+ pcb = ((uint64_t)cPagesMemFree + cPagesMemCached) cbPage;
37		39
38	return rc;	40	return rc;
39	}	41	}