Changeset 460 for branches/samba-3.3.x/source/lib

Timestamp:

Jun 9, 2010, 4:46:02 PM (15 years ago)

Author:

Silvan Scherrer

Message:

SambaServer 3.3: unified os2ea.c and os2path.c, rewrote randomizer

File:

• branches/samba-3.3.x/source/lib/os2helper.c (moved) (moved from branches/samba-3.3.x/source/lib/os2ea.c ) (5 diffs)

branches/samba-3.3.x/source/lib/os2helper.c

@@ -10 +10 @@
 #define INCL_DOSMODULEMGR
 #define INCL_DOSERRORS
-//_SMB_H
+
 #include <os2.h>
 #include <stdio.h>
@@ -16 +16 @@
 #include <errno.h>
 #include <types.h>
-
+#include <string.h>
 //YD for tmalloc
 #include <malloc.h>
@@ -32 +32 @@
 // Samba DEBUG() needs the following includes and defines
 #define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2)))
-#define CMD_KI_RDCNT            (0x63)
 #include <stdbool.h>
 #include "local.h"
@@ -99 +98 @@
 }
 
-/* Functions below are based on APR random code */
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// we search the path of the .exe and return it
+int os2_GetExePath(char *buff)
+{
+        APIRET rc = NO_ERROR;
+        PPIB ppib = NULL;
+        char sExePath [_MAX_PATH];
+        char sDrive [_MAX_PATH], sDir [_MAX_DIR]; 
+
+        // we search for the infoblock to get the module name
+        rc = DosGetInfoBlocks(NULL, &ppib);
+        if (rc != NO_ERROR)
+        {
+                return -1;
+        }
+
+        // with the module name we get the path (including the exe name)
+        rc = DosQueryModuleName(ppib->pib_hmte, sizeof(sExePath), sExePath);
+        if (rc != NO_ERROR)
+        {
+                return -1;
+        }
+
+        // we split to the different values
+        _splitpath(sExePath, sDrive, sDir, NULL, NULL);
+        // strcat(sDrive, sDir);
+        strncat(sDrive, sDir, strlen(sDir) -1);
+        strcpy(buff, sDrive);
+
+        return 0;
+}
+
+/* os2 specific random functions. this functions used to be based on APR random code.
+   but we discovered some nasty problems with it on fast hardware (especially on quadcore) and
+   decided to rewrite it with libc random() */
 
 void os2_randget(char * buffer, int length)
@@ -126 +143 @@
 }
 
-/* A bunch of system information like memory & process stats.
- * Not highly random but every bit helps....
- */
-static UCHAR randbyte_sysinfo()
-{
-    UCHAR byte = 0;
-    UCHAR SysVars[100];
-    int b;
-
-    DosQuerySysInfo(1, QSV_FOREGROUND_PROCESS, SysVars, sizeof(SysVars));
-
-    for (b = 0; b < 100; b++) {
-        byte ^= SysVars[b];
-    }
+UCHAR randbyte()
+{
+     int c;
+     UCHAR byte;
+     ULONG ulrandom;
+        ulrandom = random();
+        for (c = 0; c < sizeof(ulrandom); c++) {
+                byte ^= ((UCHAR *)&ulrandom)[c];
+        }
 
     return byte;
-}
-
-
-
-/* Similar in concept to randbyte_hrtimer() but accesses the CPU's internal
- * counters which run at the CPU's MHz speed. We get separate 
- * idle / busy / interrupt cycle counts which should provide very good 
- * randomness due to interference of hardware events.
- * This only works on newer CPUs (at least PPro or K6) and newer OS/2 versions
- * which is why it's run-time linked.
- */
-
-static HMODULE hDoscalls = 0;
-#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;
-
-APIRET APIENTRY(*pfnDosPerfSysCall) (ULONG ulCommand, ULONG ulParm1, ULONG ulParm2, ULONG ulParm3) = NULL;
-APIRET APIENTRY(*pfnDosQuerySysState) (ULONG func, ULONG arg1, ULONG pid, ULONG _res_, PVOID buf, ULONG bufsz) = NULL;
-
-static UCHAR randbyte_perf()
-{
-    UCHAR byte = 0;
-    CPUUTIL util;
-    int c;
-
-    if (hDoscalls == 0) {
-        char failed_module[20];
-        ULONG rc;
-
-        rc = DosLoadModule(failed_module, sizeof(failed_module), "DOSCALLS",
-                           &hDoscalls);
-
-        if (rc == 0) {
-            rc = DosQueryProcAddr(hDoscalls, 976, NULL, (PFN *)&pfnDosPerfSysCall);
-
-            if (rc) {
-                pfnDosPerfSysCall = NULL;
-            }
-        }
-    }
-
-    if (pfnDosPerfSysCall) {
-        if ((*pfnDosPerfSysCall) (CMD_KI_RDCNT, (ULONG)&util, 0, 0) == 0) {
-            for (c = 0; c < sizeof(util); c++) {
-                byte ^= ((UCHAR *)&util)[c];
-            }
-        }
-        else {
-            pfnDosPerfSysCall = NULL;
-        }
-    }
-
-    return byte;
-}
-
-
-
-UCHAR randbyte()
-{
-    return randbyte_sysinfo() ^ randbyte_perf();
 }