Changeset 2

Timestamp:

Mar 13, 2007, 10:32:52 AM (18 years ago)

Author:

Paul Smedley

Message:

Fix missing function os2_randget in lib/os2ea.c

File:

• trunk/samba-3.0.25pre1/source/lib/os2ea.c (modified) (3 diffs)

trunk/samba-3.0.25pre1/source/lib/os2ea.c

@@ -5 +5 @@
 #define INCL_LONGLONG
 #define INCL_DOS
+#define INCL_DOSPROCESS
+#define INCL_DOSPROFILE
+#define INCL_DOSMISC
+#define INCL_DOSMODULEMGR
 #define INCL_DOSERRORS
 //_SMB_H
@@ -14 +18 @@
 #ifndef TESTING
 #define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2)))
+#define CMD_KI_RDCNT            (0x63)
+
+typedef struct _CPUUTIL {
+    ULONG ulTimeLow;     /* Low 32 bits of time stamp      */
+    ULONG ulTimeHigh;    /* High 32 bits of time stamp     */
+    ULONG ulIdleLow;     /* Low 32 bits of idle time       */
+    ULONG ulIdleHigh;    /* High 32 bits of idle time      */
+    ULONG ulBusyLow;     /* Low 32 bits of busy time       */
+    ULONG ulBusyHigh;    /* High 32 bits of busy time      */
+    ULONG ulIntrLow;     /* Low 32 bits of interrupt time  */
+    ULONG ulIntrHigh;    /* High 32 bits of interrupt time */
+   } CPUUTIL;
+
 #include "local.h"
 #include "xfile.h"
@@ -41 +58 @@
         return 0;
 }
+
+// very simple random data gatherer derived from openssl
+void os2_randget(char * buffer, int length)
+{
+        QWORD qwTime;
+        ULONG SysVars[QSV_FOREGROUND_PROCESS];
+        int done = 0;
+
+        if (!buffer || length <= 0)
+        {
+                return;
+        }
+
+        DosTmrQueryTime(&qwTime);
+        memcpy(buffer, &qwTime, sizeof(qwTime) > length ? length : sizeof(qwTime));
+        done += sizeof(qwTime);
+        if (done >= length)
+        {
+                return;
+        }
+
+        if (DosPerfSysCall) 
+        {
+                CPUUTIL util;
+                if (DosPerfSysCall(CMD_KI_RDCNT, (ULONG)&util, 0, 0) == 0) 
+                {
+                        memcpy(buffer + done, &util, sizeof(util) > length - done ? length - done : sizeof(util));
+                        done += sizeof(util);
+                        if (done >= length)
+                        {
+                                return;
+                        }
+                }
+        }
+
+        DosQuerySysInfo(1, QSV_FOREGROUND_PROCESS, SysVars, sizeof(SysVars));
+        memcpy(buffer + done, SysVars, sizeof(SysVars) > length - done ? length - done : sizeof(SysVars));
+}
+
 
 void maperrno(int rc)