Attachment 221791 Details for Bug 244475 – diffs - clean up usage of OPT_DESC

[patch] diffs - clean up usage of OPT_DESC

cvsdiffs (text/plain), 5.66 KB, created by Rich Megginson on 2007-10-09 21:06:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-10-09 21:06:42 UTC

Size: 5.66 KB

patch

obsolete

>Index: ldapserver/ldap/servers/slapd/daemon.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/daemon.c,v
>retrieving revision 1.15
>diff -u -8 -r1.15 daemon.c
>--- ldapserver/ldap/servers/slapd/daemon.c	20 Sep 2007 16:54:38 -0000	1.15
>+++ ldapserver/ldap/servers/slapd/daemon.c	9 Oct 2007 20:47:30 -0000
>@@ -2237,23 +2237,19 @@
> 	conn= connection_table_get_connection(ct,ns);
> 	if(conn==NULL)
> 	{
> 		PR_Close(pr_acceptfd);
> 		return -1;
> 	}
> 	PR_Lock( conn->c_mutex );
> 
>-#if !defined( XP_WIN32 )
>-	ber_sockbuf_set_option(conn->c_sb,LBER_SOCKBUF_OPT_DESC,&pr_clonefd);
>-#else
>+#if defined( XP_WIN32 )
> 	if( !secure )
> 		ber_sockbuf_set_option(conn->c_sb,LBER_SOCKBUF_OPT_DESC,&ns);
>-	else
>-		ber_sockbuf_set_option(conn->c_sb,LBER_SOCKBUF_OPT_DESC,&pr_clonefd);
> #endif
> 
> 	conn->c_sd = ns;
> 	conn->c_prfd = pr_clonefd;
> 	conn->c_flags &= ~CONN_FLAG_CLOSING;
> 
> 	/* Store the fact that this new connection is an SSL connection */
> 	if (secure) {
>@@ -2283,43 +2279,30 @@
> 		memset(&func_pointers, 0, sizeof(func_pointers));
> 		func_pointers.lbextiofn_size = LBER_X_EXTIO_FNS_SIZE; 
> 		func_pointers.lbextiofn_read = secure_read_function;
> 		func_pointers.lbextiofn_write = secure_write_function;
> 		func_pointers.lbextiofn_writev = NULL;
> 		func_pointers.lbextiofn_socket_arg = (struct lextiof_socket_private *) pr_clonefd;
> 		ber_sockbuf_set_option( conn->c_sb,
> 			LBER_SOCKBUF_OPT_EXT_IO_FNS, &func_pointers);
>- 
>-		/* changed here by Cheston
>-		ber_sockbuf_set_option( conn->c_sb,
>-			LBER_SOCKBUF_OPT_READ_FN, (void *)secure_read_function );
>-		ber_sockbuf_set_option( conn->c_sb,
>-			LBER_SOCKBUF_OPT_WRITE_FN, (void *)secure_write_function );
>-		*/
> 	} else {
> 		struct lber_x_ext_io_fns func_pointers;
> 		memset(&func_pointers, 0, sizeof(func_pointers));
> 		func_pointers.lbextiofn_size = LBER_X_EXTIO_FNS_SIZE;
> 		func_pointers.lbextiofn_read = read_function;
> 		func_pointers.lbextiofn_write = write_function;
> 		func_pointers.lbextiofn_writev = NULL;
> #ifdef _WIN32
> 		func_pointers.lbextiofn_socket_arg = (struct lextiof_socket_private *) ns;	
> #else
> 		func_pointers.lbextiofn_socket_arg = (struct lextiof_socket_private *) pr_clonefd;	
> #endif
> 		ber_sockbuf_set_option( conn->c_sb,
> 			LBER_SOCKBUF_OPT_EXT_IO_FNS, &func_pointers);	
>-		/*
>-		ber_sockbuf_set_option( conn->c_sb,
>-			LBER_SOCKBUF_OPT_READ_FN, (void *)read_function );
>-		ber_sockbuf_set_option( conn->c_sb,
>-			LBER_SOCKBUF_OPT_WRITE_FN, (void *)write_function );
>-		*/
> 	}
> 
> 	if( secure && config_get_SSLclientAuth() != SLAPD_SSLCLIENTAUTH_OFF ) { 
> 	    /* Prepare to handle the client's certificate (if any): */
> 		int rv;
> 
> 		rv = slapd_ssl_handshakeCallback (conn->c_prfd, (void*)handle_handshake_done, conn);
>         
>Index: ldapserver/ldap/servers/slapd/start_tls_extop.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/start_tls_extop.c,v
>retrieving revision 1.9
>diff -u -8 -r1.9 start_tls_extop.c
>--- ldapserver/ldap/servers/slapd/start_tls_extop.c	27 Feb 2007 02:57:30 -0000	1.9
>+++ ldapserver/ldap/servers/slapd/start_tls_extop.c	9 Oct 2007 20:47:30 -0000
>@@ -272,34 +272,27 @@
> 
> 
> 	/* From here on, messages will be sent through the SSL layer, so we need to get our 
> 	 * connection ready. */
> 
> 	secure = 1;
> 	ns = configure_pr_socket( &newsocket, secure, 0 /*never local*/ );
> 
>-
>-	/*
>-	ber_sockbuf_set_option( conn->c_sb, LBER_SOCKBUF_OPT_DESC, &newsocket );
>-	ber_sockbuf_set_option( conn->c_sb, LBER_SOCKBUF_OPT_READ_FN, (void *)secure_read_function );
>-	ber_sockbuf_set_option( conn->c_sb, LBER_SOCKBUF_OPT_WRITE_FN, (void *)secure_write_function );
>-	*/
>-
> 	/*changed to */
> 	{
>-	struct lber_x_ext_io_fns *func_pointers = malloc(LBER_X_EXTIO_FNS_SIZE);
>-		func_pointers->lbextiofn_size = LBER_X_EXTIO_FNS_SIZE;
>-		func_pointers->lbextiofn_read = secure_read_function;
>-		func_pointers->lbextiofn_write = secure_write_function;
>-		func_pointers->lbextiofn_writev = NULL;
>-		func_pointers->lbextiofn_socket_arg = (struct lextiof_socket_private *) newsocket;
>+		struct lber_x_ext_io_fns func_pointers;
>+		memset(&func_pointers, 0, sizeof(func_pointers));
>+		func_pointers.lbextiofn_size = LBER_X_EXTIO_FNS_SIZE; 
>+		func_pointers.lbextiofn_read = secure_read_function;
>+		func_pointers.lbextiofn_write = secure_write_function;
>+		func_pointers.lbextiofn_writev = NULL;
>+		func_pointers.lbextiofn_socket_arg = (struct lextiof_socket_private *) newsocket;
> 		ber_sockbuf_set_option( conn->c_sb,
>-			LBER_SOCKBUF_OPT_EXT_IO_FNS, func_pointers);
>-		free(func_pointers);
>+			LBER_SOCKBUF_OPT_EXT_IO_FNS, &func_pointers);
> 	}	
> 	conn->c_flags |= CONN_FLAG_SSL;
> 	conn->c_flags |= CONN_FLAG_START_TLS;
> 	conn->c_sd = ns;
> 	conn->c_prfd = newsocket;
> 
> 	
> 	rv = slapd_ssl_handshakeCallback (conn->c_prfd, (void *)handle_handshake_done, conn);
>@@ -415,36 +408,27 @@
> 	ssl_fd = PR_PopIOLayer( c->c_prfd, PR_TOP_IO_LAYER );
> 	ssl_fd->dtor( ssl_fd );
> 
> 
> #ifndef _WIN32
> 	secure = 0;
> 	ns = configure_pr_socket( &(c->c_prfd), secure, 0 /*never local*/ );
> 
>-	ber_sockbuf_set_option( c->c_sb, LBER_SOCKBUF_OPT_DESC, &(c->c_prfd) );
>-
> #else
> 	ns = PR_FileDesc2NativeHandle( c->c_prfd );
> 	c->c_prfd = NULL;
> 
> 	configure_ns_socket( &ns );
>-
>-	ber_sockbuf_set_option( c->c_sb, LBER_SOCKBUF_OPT_DESC, &ns );	
>-
> #endif
> 
> 	c->c_sd = ns;
>         c->c_flags &= ~CONN_FLAG_SSL;
>         c->c_flags &= ~CONN_FLAG_START_TLS;
> 
>-	ber_sockbuf_set_option( c->c_sb, LBER_SOCKBUF_OPT_READ_FN, (void *)read_function );
>-	ber_sockbuf_set_option( c->c_sb, LBER_SOCKBUF_OPT_WRITE_FN, (void *)write_function );
>-
>-
> 	/*  authentication & authorization credentials must be set to "anonymous". */
> 
> 	bind_credentials_clear( c, PR_FALSE, PR_TRUE );
> 
> 	PR_Unlock( c->c_mutex );
> 
> 
>

Actions: View | Diff

Attachments on bug 244475: 190111 | 190391 | 221791 | 222111