[naviserver-commits] naviserver/nsd driver.c,1.4,1.5

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/naviserver/nsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23242/nsd

Modified Files:
	driver.c 
Log Message:
added support for UDP and Unix domain sockets for HTTP over udp/unix sockets. 
Removed obsolete driver functions.


Index: driver.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/driver.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** driver.c	16 May 2005 00:53:01 -0000	1.4
--- driver.c	20 May 2005 20:30:16 -0000	1.5
***************
*** 410,461 ****
   *----------------------------------------------------------------------
   *
-  * Ns_RegisterDriver --
-  *
-  *	Register a set of communications driver procs (no longer
-  *	supported).
-  *
-  * Results:
-  *	NULL.
-  *
-  * Side effects:
-  *	None.
-  *
-  *----------------------------------------------------------------------
-  */
- 
- void *
- Ns_RegisterDriver(char *server, char *label, void *procs, void *drvData)
- {
-     Ns_Log(Error, "driver: loadable drivers no longer supported");
-     return NULL;
- }
- 
- 
- /*
-  *----------------------------------------------------------------------
-  *
-  * Ns_GetDriverContext --
-  *
-  *	Return the driver's context (no longer supported)
-  *
-  * Results:
-  *	NULL. 
-  *
-  * Side effects:
-  *	None 
-  *
-  *----------------------------------------------------------------------
-  */
- 
- void *
- Ns_GetDriverContext(Ns_Driver drv)
- {
-     return NULL;
- }
- 
- 
- /*
-  *----------------------------------------------------------------------
-  *
   * NsStartDrivers --
   *
--- 410,413 ----
***************
*** 482,487 ****
      drvPtr = firstDrvPtr;
      while (drvPtr != NULL) {
! 	drvPtr->sock = Ns_SockListenEx(drvPtr->bindaddr, drvPtr->port,
! 	    drvPtr->backlog);
  	if (drvPtr->sock == INVALID_SOCKET) {
  	    Ns_Log(Error, "%s: failed to listen on %s:%d: %s",
--- 434,448 ----
      drvPtr = firstDrvPtr;
      while (drvPtr != NULL) {
!         if (drvPtr->bindaddr[0] == '/') {
!             drvPtr->opt |= NS_DRIVER_UNIX;
!         }
!         if (drvPtr->opts & NS_DRIVER_UDP) {
!             drvPtr->sock = Ns_SockListenUdp(drvPtr->bindaddr, drvPtr->port);
!         } else
!         if (drvPtr->opts & NS_DRIVER_UNIX) {
!             drvPtr->sock = Ns_SockListenUnix(drvPtr->bindaddr);
!         } else {
!             drvPtr->sock = Ns_SockListenEx(drvPtr->bindaddr, drvPtr->port, drvPtr->backlog);
!         }
  	if (drvPtr->sock == INVALID_SOCKET) {
  	    Ns_Log(Error, "%s: failed to listen on %s:%d: %s",
***************
*** 1225,1230 ****
      sockPtr->keep = 0;
      sockPtr->arg = NULL;
!     sockPtr->sock = Ns_SockAccept(drvPtr->sock,
! 				  (struct sockaddr *) &sockPtr->sa, &slen);
      if (sockPtr->sock == INVALID_SOCKET) {
  	/* 
--- 1186,1194 ----
      sockPtr->keep = 0;
      sockPtr->arg = NULL;
!     if (drvPtr->opts & NS_DRIVER_UDP) {
!         sockPtr->sock = drvPtr->sock;
!     } else {
!         sockPtr->sock = Ns_SockAccept(drvPtr->sock, (struct sockaddr *) &sockPtr->sa, &slen);
!     }
      if (sockPtr->sock == INVALID_SOCKET) {
  	/*