tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jni/native/src sslinfo.c
Date Tue, 12 Jul 2005 13:28:57 GMT
mturk       2005/07/12 06:28:57

  Modified:    jni/native/src sslinfo.c
  Log:
  Socket used is abstract socket not the SSL opaque.
  
  Revision  Changes    Path
  1.7       +11 -4     jakarta-tomcat-connectors/jni/native/src/sslinfo.c
  
  Index: sslinfo.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/sslinfo.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- sslinfo.c	8 Jul 2005 07:49:56 -0000	1.6
  +++ sslinfo.c	12 Jul 2005 13:28:57 -0000	1.7
  @@ -203,13 +203,15 @@
   TCN_IMPLEMENT_CALL(jobject, SSLSocket, getInfoB)(TCN_STDARGS, jlong sock,
                                                    jint what)
   {
  -    tcn_ssl_conn_t *s = J2P(sock, tcn_ssl_conn_t *);
  +    tcn_socket_t   *a = J2P(sock, tcn_socket_t *);
  +    tcn_ssl_conn_t *s;
       jbyteArray array = NULL;
       apr_status_t rv = APR_SUCCESS;
   
       UNREFERENCED(o);
       TCN_ASSERT(sock != 0);
   
  +    s = (tcn_ssl_conn_t *)(a->opaque);
       switch (what) {
           case SSL_INFO_SESSION_ID:
           {
  @@ -281,13 +283,15 @@
   TCN_IMPLEMENT_CALL(jstring, SSLSocket, getInfoS)(TCN_STDARGS, jlong sock,
                                                    jint what)
   {
  -    tcn_ssl_conn_t *s = J2P(sock, tcn_ssl_conn_t *);
  +    tcn_socket_t   *a = J2P(sock, tcn_socket_t *);
  +    tcn_ssl_conn_t *s;
       jstring value = NULL;
       apr_status_t rv = APR_SUCCESS;
   
       UNREFERENCED(o);
       TCN_ASSERT(sock != 0);
   
  +    s = (tcn_ssl_conn_t *)(a->opaque);
       switch (what) {
           case SSL_INFO_SESSION_ID:
           {
  @@ -491,12 +495,15 @@
   TCN_IMPLEMENT_CALL(jint, SSLSocket, getInfoI)(TCN_STDARGS, jlong sock,
                                                 jint what)
   {
  -    tcn_ssl_conn_t *s = J2P(sock, tcn_ssl_conn_t *);
  +    tcn_socket_t   *a = J2P(sock, tcn_socket_t *);
  +    tcn_ssl_conn_t *s;
       jint value = -1;
   
       UNREFERENCED(o);
       TCN_ASSERT(sock != 0);
   
  +    s = (tcn_ssl_conn_t *)(a->opaque);
  +
       switch (what) {
           case SSL_INFO_CIPHER_USEKEYSIZE:
           case SSL_INFO_CIPHER_ALGKEYSIZE:
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message