Changeset 8052 for trunk/src

Timestamp:

Mar 8, 2002, 12:37:56 PM (23 years ago)

Author:

sandervl

Message:

PH: Netbios updates (currently disabled)

Location:

trunk/src/wnetap32

Files:

• makefile (modified) (3 diffs)
• netapi32.def (deleted)
• oslibnet.cpp (modified) (3 diffs)
• oslibnet.h (modified) (2 diffs)
• wnetap32.cpp (modified) (5 diffs)
• wnetap32.def (added)
• wnetap32.h (added)

trunk/src/wnetap32/makefile

@@ -1 @@
-# $Id: makefile,v 1.19 2001-09-07 08:20:58 phaller Exp $
+# $Id: makefile,v 1.20 2002-03-08 11:37:10 sandervl Exp $
 
 #
@@ -42 +42 @@
 $(ODIN32_LIB)/user32.lib \
 $(ODIN32_LIB)/$(ODINCRT).lib \
+netapi32.lib \
 OS2386.LIB \
 $(RTLLIB_O)
@@ -47 +48 @@
 
 #
-# Target and original target names - names of the dll without extention and path
+# Target and original target names - names of the dll without extension and path
 #
+# @@@PH TARGET      = wnetap32
+# @@@PH ORGTARGET   = netapi32
 TARGET      = wnetap32
-ORGTARGET   = netapi32
-
 
 #

trunk/src/wnetap32/oslibnet.cpp

@@ -1 @@
-/*  $Id: oslibnet.cpp,v 1.5 2001-09-06 22:23:40 phaller Exp $
+/*  $Id: oslibnet.cpp,v 1.6 2002-03-08 11:37:10 sandervl Exp $
  *
  * Wrappers for OS/2 Netbios/Network/LAN API
@@ -30 +30 @@
 #include <netstats.h>
 #include <server.h>
+#include <ncb.h>
+#include <netbios.h>
+// #include <netb_1_c.h>
+// #include <netb_2_c.h>
+// #include <netb_4_c.h>
+
+#include "wnetap32.h"
+#include "oslibnet.h"
 
 
@@ -301 +309 @@
   return rc;
 }
+
+
+/*****************************************************************************
+ * Name      : OSLibNetBIOS
+ * Purpose   :
+ * Parameters: PNCB pncb (Win32-style of the structure!!!)
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    : TESTED
+ *
+ * Author    : Patrick Haller 2002/02/26 01:42
+ *****************************************************************************/
+
+UCHAR OSLibNetBIOS_Passthru(PNCB_w pncb)
+{
+  // IBM NETBIOS 3.0 as defined in ncb.h
+  // UCHAR rc = NetBios( (struct ncb LSFAR *)pncb );
+  
+  // Note:
+  // asynchronous operation probably not really supported here,
+  // this has to be done with a wrapper thread!
+  
+  // @@@PH
+  // open / close the right adapter based upon
+  // the LANA number specified inside the NCB
+  
+  USHORT sel = RestoreOS2FS();
+  UCHAR rc = NetBios32Submit(0, // send automatically to first adapter
+                                // open & close are implicit
+                             0, // single NCB w/o error retry!
+                             (struct ncb LSFAR *)pncb );
+  SetFS(sel);
+  return rc;
+}
+
+
+/*****************************************************************************
+ * Name      : OSLibNetBIOSEnum
+ * Purpose   :
+ * Parameters: PNCB pncb (Win32-style of the structure!!!)
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    : TESTED
+ *
+ * Author    : Patrick Haller 2002/02/26 01:42
+ *****************************************************************************/
+
+UCHAR OSLibNetBIOS_Enum(PNCB_w pncb)
+{
+  static BOOL flagEnumAvailable = FALSE;
+  static UCHAR arrLANA[ MAX_LANA_w ];
+  static int iLANALength = 0;
+  USHORT sel = RestoreOS2FS();
+
+  if (FALSE == flagEnumAvailable)
+  {
+    ULONG ulEntriesReturned  = 0;
+    ULONG ulEntriesAvailable = 0;
+    ULONG rc;
+    PVOID pBuffer;
+    ULONG ulBufferLength;
+    struct netbios_info_1* pNBI1;
+    
+    // reset the array first
+    memset( arrLANA, 0, sizeof( arrLANA ) );
+    
+    
+    // determine number of available entries
+    rc = NetBios32Enum(NULL,
+                       0,
+                       NULL,
+                       0,
+                       &ulEntriesReturned,
+                       &ulEntriesAvailable);
+    
+    // if network adapters are available ...
+    iLANALength = ulEntriesAvailable;
+    if (0 != ulEntriesAvailable)
+    {
+      // allocate buffer of sufficient size
+      ulBufferLength = ulEntriesAvailable * sizeof( struct netbios_info_1 );
+      pBuffer = malloc( ulBufferLength );
+      if (NULL == pBuffer)
+      {
+        SetFS(sel);
+        pncb->ncb_retcode  = NRC_SYSTEM_w;
+        return NRC_SYSTEM_w;
+      }
+        
+      // enumerate all network drivers (net1, net2, ...)
+      // and build the array of LANA numbers
+      rc = NetBios32Enum(NULL,  // local machine
+                         1,
+                         (PUCHAR)pBuffer,
+                         ulBufferLength,
+                         &ulEntriesReturned,
+                         &ulEntriesAvailable);
+      pNBI1 = (struct netbios_info_1 *)pBuffer;
+      for (ULONG ulCount = 0;
+           ulCount < ulEntriesReturned;
+           ulCount++)
+      {
+        arrLANA[ ulCount ] = pNBI1->nb1_lana_num;
+        pNBI1++;
+      }
+      
+      free( pBuffer );
+    }
+    // else no network adapters are available
+    
+    flagEnumAvailable = TRUE;
+  }
+  
+  // copy the result
+  PLANA_ENUM_w pLE = (PLANA_ENUM_w)pncb->ncb_buffer;
+  pLE->length      = iLANALength;
+  
+  // compensate UCHAR size for the length field
+  memcpy( pLE->lana,
+          arrLANA,
+          pncb->ncb_length - sizeof(UCHAR) );
+  pncb->ncb_retcode  = NRC_GOODRET_w;
+         
+  SetFS(sel);
+  return pncb->ncb_retcode;
+}
+
+
+
+
+/*****************************************************************************
+ * Name      : OSLibNetBIOS
+ * Purpose   :
+ * Parameters: PNCB pncb (Win32-style of the structure!!!)
+ * Variables :
+ * Result    :
+ * Remark    : this is for synchronous operation only!
+ * Status    : TESTED
+ *
+ * Author    : Patrick Haller 2002/02/26 01:42
+ *****************************************************************************/
+
+UCHAR OSLibNetBIOS(PNCB_w pncb)
+{
+  dprintf(("NETBIOS: Netbios NCB: command=%02xh, retcode=%d, lsn=%d, num=%d, buffer=%08xh, "
+           "length=%d callname='%s' name='%s' rto=%d sto=%d pfnCallback=%08xh, lana=%d, "
+           "cmd_cplt=%d event=%08xh\n",
+           pncb->ncb_command,
+           pncb->ncb_retcode,
+           pncb->ncb_lsn,
+           pncb->ncb_num,
+           pncb->ncb_buffer,
+           pncb->ncb_length,
+           pncb->ncb_callname,
+           pncb->ncb_name,
+           pncb->ncb_rto,
+           pncb->ncb_sto,
+           pncb->ncb_post,
+           pncb->ncb_lana_num,
+           pncb->ncb_cmd_cplt,
+           pncb->ncb_event));
+  
+  // Request Router
+  // The request router is responsible for mapping the incoming commands
+  // and NCBs to their OS/2 NetBIOS pendant plus support of synchronous /
+  // asynchronous handling of NCB processing.
+  
+  // Note:
+  // for a first attempt at NetBIOS support, we just try to pass through
+  // all supported commands and assume the structures are essentially
+  // compatible.
+  UCHAR rc;
+
+  switch (pncb->ncb_command & ~ASYNCH_w)
+  {
+    case NCBENUM_w:
+    {
+      // enumerate all network drivers (net1, net2, ...)
+      // and build the array of LANA numbers
+      rc = OSLibNetBIOS_Enum( pncb );
+      break;
+    }
+  
+    // Note: NCBLANSTALERT_w
+    // seems to be supported in asynchronous manner only,
+    // we just try to pass it through!
+  
+    case NCBACTION_w:
+      dprintf(("NCBACTION not yet implemented"));
+      break;
+  
+    case NCBTRACE_w:
+      dprintf(("NCBTRACE not yet implemented"));
+      break;
+    
+    case NCBRESET_w:
+      // This seems to cause the requester to go wild
+      // (netbios session limit exceeded)
+      // rc = OSLibNetBIOS_Passthru( pncb );
+    
+      // Win32 and OS/2 do have different behaviour upon RESET calls.
+      // Returning OK here is experimental.
+      pncb->ncb_retcode  = NRC_GOODRET_w;
+      pncb->ncb_cmd_cplt = NRC_GOODRET_w;
+      rc = NRC_GOODRET_w;
+      break;
+    
+    
+    default:
+      rc = OSLibNetBIOS_Passthru( pncb );
+      break;
+  }
+  
+  dprintf(("NETBIOS: Netbios NCB: command=%02xh --> rc=%d\n", 
+           pncb->ncb_command,
+           rc));
+  return rc;
+}
+
+
+/*****************************************************************************
+ * Name      : 
+ * Purpose   :
+ * Parameters: PNCB pncb (Win32-style of the structure!!!)
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    : TESTED
+ *
+ * Author    : Patrick Haller 2002/02/26 01:42
+ *****************************************************************************/
+
+DWORD WIN32API OSLibNetbiosHlpHandler(LPVOID lpParam)
+{
+  PNCB_w pncb = (PNCB_w)lpParam;
+  UCHAR ncb_cmd_original = pncb->ncb_command;
+  void (* CALLBACK ncb_post_original)( struct _NCB_w * ) = pncb->ncb_post;
+
+  // rewrite ncb for synchronous operation
+  pncb->ncb_command &= ~ASYNCH_w;
+  pncb->ncb_post    = 0;
+  // ncb_cmd_cplt is expected to be NRC_PENDING_w
+  // when we come here (set by the main Netbios() function)
+  
+  // synchronous operation
+  // return code is expected to be stored inside pncb
+  dprintf(("NETBIOS: async NETBIOS for command %02xh\n",
+           pncb->ncb_command));
+  
+  OSLibNetBIOS( pncb );
+  
+  dprintf(("NETBIOS: async NETBIOS for command %02xh returned %d\n",
+           pncb->ncb_command,
+           pncb->ncb_retcode));
+  
+  // restore original command
+  pncb->ncb_command = ncb_cmd_original;
+  pncb->ncb_post    = ncb_post_original;
+  
+  // propagate the command complete value as netbios is expected
+  // to do for asynchronous operation
+  pncb->ncb_cmd_cplt= pncb->ncb_retcode;
+  
+  // perform post-operation notification!
+  if (pncb->ncb_event)
+  {
+    // Netbios seems to use PulseEvent instead of SetEvent.
+    
+    // SetEvent( pncb->ncb_event );
+    PulseEvent( pncb->ncb_event );
+  }
+  
+  if (pncb->ncb_post != NULL)
+  {
+    // callback into post function
+    (pncb->ncb_post)( pncb );
+  }
+  
+  return pncb->ncb_retcode;
+}

trunk/src/wnetap32/oslibnet.h

@@ -1 @@
-/* $Id: oslibnet.h,v 1.3 2001-09-06 22:23:40 phaller Exp $ */
+/* $Id: oslibnet.h,v 1.4 2002-03-08 11:37:10 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Netbios/Network/LAN API
@@ -17 +17 @@
 
 #define NERR_OK   0
+
+#ifndef NERR_BASE
 #define NERR_BASE 1 /* @@@PH DUMMY ! */
+#endif
 
 

trunk/src/wnetap32/wnetap32.cpp

@@ -1 @@
-/* $Id: wnetap32.cpp,v 1.16 2001-09-07 08:20:59 phaller Exp $ */
+/* $Id: wnetap32.cpp,v 1.17 2002-03-08 11:37:10 sandervl Exp $ */
 
 /*
@@ -38 +38 @@
 #include <winconst.h>
 
+#include "wnetap32.h"
+#include "lanman.h"
 #include "oslibnet.h"
-#include "lanman.h"
 
 ODINDEBUGCHANNEL(WNETAP32-WNETAP32)
+
+
+extern DWORD WIN32API OSLibNetbiosHlpHandler(LPVOID lpParam);
 
 
@@ -48 +52 @@
  ****************************************************************************/
 
-#define NCBNAMSZ        16
-#define MAX_LANA       254
-
-typedef struct _NCB {
-    UCHAR   ncb_command;
-    UCHAR   ncb_retcode;
-    UCHAR   ncb_lsn;
-    UCHAR   ncb_num;
-    PUCHAR  ncb_buffer;
-    WORD    ncb_length;
-    UCHAR   ncb_callname[NCBNAMSZ];
-    UCHAR   ncb_name[NCBNAMSZ];
-    UCHAR   ncb_rto;
-    UCHAR   ncb_sto;
-    void (* CALLBACK ncb_post)( struct _NCB * );
-    UCHAR   ncb_lana_num;
-    UCHAR   ncb_cmd_cplt;
-    UCHAR   ncb_reserve[10];
-    HANDLE  ncb_event;
-} NCB, *PNCB;
-
-#define NRC_GOODRET     0x00
-#define NRC_BUFLEN      0x01
-#define NRC_ILLCMD      0x03
-#define NRC_CMDTMO      0x05
-#define NRC_INCOMP      0x06
-#define NRC_BADDR       0x07
-#define NRC_SNUMOUT     0x08
-#define NRC_NORES       0x09
-#define NRC_SCLOSED     0x0a
-#define NRC_CMDCAN      0x0b
-#define NRC_DUPNAME     0x0d
-#define NRC_NAMTFUL     0x0e
-#define NRC_ACTSES      0x0f
-#define NRC_LOCTFUL     0x11
-#define NRC_REMTFUL     0x12
-#define NRC_ILLNN       0x13
-#define NRC_NOCALL      0x14
-#define NRC_NOWILD      0x15
-#define NRC_INUSE       0x16
-#define NRC_NAMERR      0x17
-#define NRC_SABORT      0x18
-#define NRC_NAMCONF     0x19
-#define NRC_IFBUSY      0x21
-#define NRC_TOOMANY     0x22
-#define NRC_BRIDGE      0x23
-#define NRC_CANOCCR     0x24
-#define NRC_CANCEL      0x26
-#define NRC_DUPENV      0x30
-#define NRC_ENVNOTDEF   0x34
-#define NRC_OSRESNOTAV  0x35
-#define NRC_MAXAPPS     0x36
-#define NRC_NOSAPS      0x37
-#define NRC_NORESOURCES 0x38
-#define NRC_INVADDRESS  0x39
-#define NRC_INVDDID     0x3B
-#define NRC_LOCKFAIL    0x3C
-#define NRC_OPENERR     0x3f
-#define NRC_SYSTEM      0x40
-
-#define NRC_PENDING     0xff
-
 
 //******************************************************************************
+// Note:
+// The major difference between OS/2 and Win32 regarding NetBIOS is
+// all operations and resources are per-process for Win32 and
+// global for OS/2. So we might probably end up with stray netbios names etc.
+// long after a process has vanished.
 //******************************************************************************
+//#define NETBIOS_ENABLED
 ODINFUNCTION1(UCHAR, OS2Netbios,
-              PNCB, pncb)
-{
-#ifdef DEBUG
-  WriteLog("OS2Netbios; pretend no network available\n");
-#endif
-  return(NRC_OPENERR);
-}
-//******************************************************************************
-//******************************************************************************
+              PNCB_w, pncb)
+{
+#ifndef NETBIOS_ENABLED
+  pncb->ncb_retcode = NRC_OPENERR_w;
+  return pncb->ncb_retcode;
+  
+#else
+  UCHAR rc;
+
+  // Note: OS/2 specific documentation is found in DSSPGR1+DSSPGR2
+  
+  // fork for asynchronous operation:
+  if (pncb->ncb_command & ASYNCH_w)
+  {
+    // either event or post may be specified
+    if ( (pncb->ncb_event != 0) &&
+         (pncb->ncb_post  != 0) )
+    {
+      pncb->ncb_retcode = NRC_ILLCMD_w;
+      return NRC_ILLCMD_w;
+    }
+    
+    
+    // @@@PH
+    // we might go for one or more statically allocated
+    // worker threads instead of creating and destroying
+    // a thread for each single request.
+    
+    // we're to start an ODIN thread ourself and do
+    // the operation itself synchronously!
+    
+    // say the netbios operation is still pending ...
+    pncb->ncb_cmd_cplt = NRC_PENDING_w;
+    
+    UCHAR  ucCommand = pncb->ncb_command;
+    DWORD  tidNetbios;
+    HANDLE hNetbiosThread = CreateThread(NULL,
+                                         0x8000,
+                                         OSLibNetbiosHlpHandler,
+                                         (LPVOID)pncb,
+                                         0, // thread creation flags
+                                         &tidNetbios);
+    if (hNetbiosThread == NULL)
+    {
+      // in case the thread could not be launched, 
+      // return with error
+      pncb->ncb_retcode  = NRC_SYSTEM_w;
+      pncb->ncb_cmd_cplt = NRC_SYSTEM_w;
+      return pncb->ncb_retcode;
+    }
+    else
+    {
+      dprintf(("NETBIOS: Netbios helper thread %d started for command %02xh\n",
+               tidNetbios,
+               ucCommand));
+      
+      // verify if the operation has completed already
+      if (pncb->ncb_cmd_cplt != NRC_PENDING_w)
+      {
+        // Docs say in this case return as if the request was synchronous
+        rc = pncb->ncb_retcode;
+      }
+      else
+      {
+        // this is the "operation pending" return code
+        rc = 0;
+      }
+    }
+  }
+  else
+  {
+    // verify request
+    if ( (pncb->ncb_event != 0) ||
+         (pncb->ncb_post  != 0) )
+    {
+      pncb->ncb_retcode = NRC_ILLCMD_w;
+      return NRC_ILLCMD_w;
+    }
+    
+    // call the Request Router
+    rc = OSLibNetBIOS( pncb );
+  }
+
+  return( rc );
+#endif /* NETBIOS_ENABLED */
+}
+
 
 /*****************************************************************************
@@ -1073 +1099 @@
  * Name      : NET_API_STATUS I_NetPathType
  * Purpose   :
+
  * Parameters: wrong
  * Variables :
@@ -1096 +1123 @@
 /*****************************************************************************
  * Name      : NET_API_STATUS NetapipBufferAllocate
+
  * Purpose   :
  * Parameters: wrong