@@ -1,9 +1,9 @@
 /*
  * Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com>
  *
- * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsIO.c,v 1.7 2000/06/05 18:09:54 welch Exp $
+ * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsIO.c,v 1.7.2.1 2000/07/11 04:58:46 hobbs Exp $
  *
  * TLS (aka SSL) Channel - can be layered on any bi-directional
  * Tcl_Channel (Note: Requires Trf Core Patch)
  *
  * This was built from scratch based upon observation of OpenSSL 0.9.2B
@@ -48,11 +48,28 @@
 
 /*
  * This structure describes the channel type structure for TCP socket
  * based IO:
  */
-
+#ifdef TCL_CHANNEL_VERSION_2
+static Tcl_ChannelType tlsChannelType = {
+    "tls",		/* Type name. */
+    TCL_CHANNEL_VERSION_2,	/* A NG channel */
+    CloseProc,		/* Close proc. */
+    InputProc,		/* Input proc. */
+    OutputProc,		/* Output proc. */
+    NULL,		/* Seek proc. */
+    NULL,		/* Set option proc. */
+    GetOptionProc,	/* Get option proc. */
+    WatchProc,		/* Initialize notifier. */
+    GetHandleProc,	/* Get file handle out of channel. */
+    NULL,		/* Close2Proc. */
+    BlockModeProc,	/* Set blocking/nonblocking mode.*/
+    NULL,		/* FlushProc. */
+    NULL,		/* handlerProc. */
+};
+#else
 static Tcl_ChannelType tlsChannelType = {
     "tls",		/* Type name. */
     BlockModeProc,	/* Set blocking/nonblocking mode.*/
     CloseProc,		/* Close proc. */
     InputProc,		/* Input proc. */
@@ -61,10 +78,11 @@
     NULL,		/* Set option proc. */
     GetOptionProc,	/* Get option proc. */
     WatchProc,		/* Initialize notifier. */
     GetHandleProc,	/* Get file handle out of channel. */
 };
+#endif
 
 Tcl_ChannelType *Tls_ChannelType()
 {
     return &tlsChannelType;
 }
@@ -96,12 +114,16 @@
     if (mode == TCL_MODE_NONBLOCKING) {
 	statePtr->flags |= TLS_TCL_ASYNC;
     } else {
 	statePtr->flags &= ~(TLS_TCL_ASYNC);
     }
+#ifdef TCL_CHANNEL_VERSION_2
+    return 0;
+#else
     return Tcl_SetChannelOption(statePtr->interp, Tls_GetParent(statePtr),
 		"-blocking", (mode == TCL_MODE_NONBLOCKING) ? "0" : "1");
+#endif
 }
 
 /*
  *-------------------------------------------------------------------
  *
@@ -335,10 +357,30 @@
                                                  * NULL to get all options and
                                                  * their values. */
                  Tcl_DString *dsPtr)	         /* Where to store the computed value
                                                   * initialized by caller. */
 {
+#ifdef TCL_CHANNEL_VERSION_2
+    State *statePtr = (State *) instanceData;
+    Tcl_Channel downChan = Tls_GetParent(statePtr);
+    Tcl_DriverGetOptionProc *getOptionProc;
+
+    getOptionProc = Tcl_ChannelGetOptionProc(Tcl_GetChannelType(downChan));
+    if (getOptionProc != NULL) {
+	return (*getOptionProc)(Tcl_GetChannelInstanceData(downChan),
+		interp, optionName, dsPtr);
+    } else if (optionName == (char*) NULL) {
+	/*
+	 * Request is query for all options, this is ok.
+	 */
+	return TCL_OK;
+    }
+    /*
+     * Request for a specific option has to fail, we don't have any.
+     */
+    return TCL_ERROR;
+#else
     State *statePtr = (State *) instanceData;
     size_t len = 0;
 
     if (optionName != (char *) NULL) {
         len = strlen(optionName);
@@ -355,10 +397,11 @@
             return TCL_OK;
         }
     }
 #endif
     return TCL_OK;
+#endif
 }
 
 /*
  *-------------------------------------------------------------------
  *
@@ -622,10 +665,13 @@
 
 Tcl_Channel
 Tls_GetParent( statePtr )
     State *statePtr;
 {
+#ifdef TCL_CHANNEL_VERSION_2
+    return Tcl_GetStackedChannel(statePtr->self);
+#else
 #if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 2
     return statePtr->parent;
 #else
     /* The reason for the existence of this procedure is
      * the fact that stacking a transform over another
@@ -640,29 +686,31 @@
      * It walks the chain of Channel structures until it
      * finds the one pointing having 'ctrl' as instanceData
      * and then returns the superceding channel to that. (AK)
      */
  
-  Tcl_Channel self = statePtr->self;
-  Tcl_Channel next;
-
-  while ((ClientData) statePtr != Tcl_GetChannelInstanceData (self)) {
-    next = Tcl_GetStackedChannel (self);
-    if (next == (Tcl_Channel) NULL) {
-      /* 09/24/1999 Unstacking bug, found by Matt Newman <matt@sensus.org>.
-       *
-       * We were unable to find the channel structure for this
-       * transformation in the chain of stacked channel. This
-       * means that we are currently in the process of unstacking
-       * it *and* there were some bytes waiting which are now
-       * flushed. In this situation the pointer to the channel
-       * itself already refers to the parent channel we have to
-       * write the bytes into, so we return that.
-       */
-      return statePtr->self;
-    }
-    self = next;
-  }
-
-  return Tcl_GetStackedChannel (self);
+    Tcl_Channel self = statePtr->self;
+    Tcl_Channel next;
+
+    while ((ClientData) statePtr != Tcl_GetChannelInstanceData (self)) {
+	next = Tcl_GetStackedChannel (self);
+	if (next == (Tcl_Channel) NULL) {
+	    /* 09/24/1999 Unstacking bug,
+	     * found by Matt Newman <matt@sensus.org>.
+	     *
+	     * We were unable to find the channel structure for this
+	     * transformation in the chain of stacked channel. This
+	     * means that we are currently in the process of unstacking
+	     * it *and* there were some bytes waiting which are now
+	     * flushed. In this situation the pointer to the channel
+	     * itself already refers to the parent channel we have to
+	     * write the bytes into, so we return that.
+	     */
+	    return statePtr->self;
+	}
+	self = next;
+    }
+
+    return Tcl_GetStackedChannel (self);
+#endif
 #endif
 }