mturk 2005/06/18 01:01:54
Modified: jni/native/src sslnetwork.c sslutils.c
Log:
Fix compile time warnings.
Revision Changes Path
1.16 +18 -17 jakarta-tomcat-connectors/jni/native/src/sslnetwork.c
Index: sslnetwork.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/sslnetwork.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sslnetwork.c 17 Jun 2005 14:17:00 -0000 1.15
+++ sslnetwork.c 18 Jun 2005 08:01:54 -0000 1.16
@@ -309,8 +309,9 @@
}
static apr_status_t APR_THREAD_FUNC
-ssl_socket_recv(tcn_ssl_conn_t *con, char *buf, apr_size_t *len)
+ssl_socket_recv(void *sock, char *buf, apr_size_t *len)
{
+ tcn_ssl_conn_t *con = (tcn_ssl_conn_t *)sock;
int s, rd = (int)(*len);
apr_status_t rv = APR_SUCCESS;
@@ -355,9 +356,10 @@
}
static apr_status_t APR_THREAD_FUNC
-ssl_socket_send(tcn_ssl_conn_t *con, const char *buf,
+ssl_socket_send(void *sock, const char *buf,
apr_size_t *len)
{
+ tcn_ssl_conn_t *con = (tcn_ssl_conn_t *)sock;
int s, rd = (int)(*len);
apr_status_t rv = APR_SUCCESS;
@@ -397,17 +399,18 @@
}
static apr_status_t APR_THREAD_FUNC
-ssl_socket_sendv(tcn_ssl_conn_t *sock,
+ssl_socket_sendv(void *sock,
const struct iovec *vec,
apr_int32_t nvec, apr_size_t *len)
{
+ tcn_ssl_conn_t *con = (tcn_ssl_conn_t *)sock;
apr_status_t rv;
apr_size_t readed = 0;
apr_int32_t i;
for (i = 0; i < nvec; i++) {
apr_size_t rd = vec[i].iov_len;
- if ((rv = ssl_socket_send(sock, vec[i].iov_base, &rd)) !=
APR_SUCCESS) {
+ if ((rv = ssl_socket_send(con, vec[i].iov_base, &rd)) !=
APR_SUCCESS) {
*len = readed;
return rv;
}
@@ -419,23 +422,21 @@
TCN_IMPLEMENT_CALL(jint, SSLSocket, attach)(TCN_STDARGS, jlong ctx,
- jlong sock, jlong pool)
+ jlong sock)
{
tcn_ssl_ctxt_t *c = J2P(ctx, tcn_ssl_ctxt_t *);
tcn_socket_t *s = J2P(sock, tcn_socket_t *);
- apr_pool_t *p = J2P(pool, apr_pool_t *);
tcn_ssl_conn_t *con;
apr_os_sock_t oss;
apr_status_t rv;
UNREFERENCED(o);
- TCN_ASSERT(pool != 0);
TCN_ASSERT(ctx != 0);
TCN_ASSERT(sock != 0);
if ((rv = apr_os_sock_get(&oss, s->sock)) != APR_SUCCESS)
return rv;
- if ((con = ssl_create(e, c, p)) == NULL)
+ if ((con = ssl_create(e, c, s->pool)) == NULL)
return APR_EGENERAL;
con->sock = s->sock;
@@ -445,14 +446,14 @@
else
SSL_set_connect_state(con->ssl);
/* Change socket type */
- s->type = TCN_SOCKET_SSL;
- s->cleanup = ssl_cleanup;
- s->net_recv = ssl_socket_recv;
- s->net_send = ssl_socket_send;
- s->net_sendv = ssl_socket_sendv;
- s->net_shutdown = ssl_socket_shutdown;
- s->net_close = ssl_socket_close;
- s->opaque = con;
+ s->type = TCN_SOCKET_SSL;
+ s->cleanup = ssl_cleanup;
+ s->recv = ssl_socket_recv;
+ s->send = ssl_socket_send;
+ s->sendv = ssl_socket_sendv;
+ s->shutdown = ssl_socket_shutdown;
+ s->close = ssl_socket_close;
+ s->opaque = con;
return APR_SUCCESS;
}
1.30 +1 -3 jakarta-tomcat-connectors/jni/native/src/sslutils.c
Index: sslutils.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/sslutils.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sslutils.c 17 Jun 2005 09:41:30 -0000 1.29
+++ sslutils.c 18 Jun 2005 08:01:54 -0000 1.30
@@ -336,7 +336,6 @@
RSA *SSL_callback_tmp_RSA(SSL *ssl, int export, int keylen)
{
- tcn_ssl_conn_t *conn = (tcn_ssl_conn_t *)SSL_get_app_data(ssl);
int idx;
/* doesn't matter if export flag is on,
@@ -372,7 +371,6 @@
*/
DH *SSL_callback_tmp_DH(SSL *ssl, int export, int keylen)
{
- tcn_ssl_conn_t *conn = (tcn_ssl_conn_t *)SSL_get_app_data(ssl);
int idx;
switch (keylen) {
case 512:
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
