Commit ea8867b7 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

The local_addr and remote_addr fields in the conn_rec are now 

apr_sockaddr_t * instead of sockaddr_in.  This is a small step
towards IPv6 support.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87342 13f79535-47bb-0310-9956-ffa450edef68
parent 328a6817

include/httpd.h

+2 −6
Original line number Diff line number Diff line
@@ -86,10 +86,6 @@ extern "C" { 
#include "apr_time.h"

#include "apr_network_io.h"



#ifdef HAVE_NETINET_IN_H

#include <netinet/in.h>

#endif



#ifdef CORE_PRIVATE



/* ----------------------------- config dir ------------------------------ */
@@ -839,9 +835,9 @@ struct conn_rec { 
    /* Who is the client? */



    /** local address */

    struct sockaddr_in local_addr;

    apr_sockaddr_t *local_addr;

    /** remote address */

    struct sockaddr_in remote_addr;

    apr_sockaddr_t *remote_addr;

    /** Client's IP address */

    char *remote_ip;

    /** Client's DNS name, if known.  NULL if DNS hasn't been checked,

modules/aaa/mod_access.c

+3 −1
Original line number Diff line number Diff line
@@ -334,8 +334,10 @@ static int find_allowdeny(request_rec *r, apr_array_header_t *a, int method) 
	    return 1;



	case T_IP:

            /* XXX handle IPv6 with separate T_IP6 type or add common 

             *     address masking operations to APR */

	    if (ap[i].x.ip.net != APR_INADDR_NONE

		&& (r->connection->remote_addr.sin_addr.s_addr

		&& (r->connection->remote_addr->sa.sin.sin_addr.s_addr

		    & ap[i].x.ip.mask) == ap[i].x.ip.net) {

		return 1;

	    }

modules/dav/main/util.c

+2 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ dav_lookup_result dav_lookup_uri(const char *uri, request_rec * r) 
{

    dav_lookup_result result = { 0 };

    const char *scheme;

    unsigned short port = ntohs(r->connection->local_addr.sin_port);

    apr_port_t port;

    uri_components comp;

    char *new_file;

    const char *domain;
@@ -215,6 +215,7 @@ dav_lookup_result dav_lookup_uri(const char *uri, request_rec * r) 
       the port, must match our port.

       the URI must not have a query (args) or a fragment

     */

    apr_get_port(&port, r->connection->local_addr);

    if (strcasecmp(comp.scheme, scheme) != 0 ||

	comp.port != port) {

	result.err.status = HTTP_BAD_GATEWAY;

modules/http/http_core.c

+1 −1
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ static apr_inline void do_double_reverse (conn_rec *conn) 


	for (haddr = hptr->h_addr_list; *haddr; haddr++) {

	    if (((struct in_addr *)(*haddr))->s_addr

		== conn->remote_addr.sin_addr.s_addr) {

		== conn->remote_addr->sa.sin.sin_addr.s_addr) {

		conn->double_reverse = 1;

		return;

	    }

server/connection.c

+4 −7
Original line number Diff line number Diff line
@@ -272,7 +272,6 @@ conn_rec *ap_new_connection(apr_pool_t *p, server_rec *server, 
                            apr_socket_t *inout, long id)

{

    conn_rec *conn = (conn_rec *) apr_pcalloc(p, sizeof(conn_rec));

    apr_sockaddr_t *sa;



    /* Got a connection structure, so initialize what fields we can

     * (the rest are zeroed out by pcalloc).
@@ -282,15 +281,13 @@ conn_rec *ap_new_connection(apr_pool_t *p, server_rec *server, 
    conn->notes = apr_make_table(p, 5);



    conn->pool = p;

    apr_get_sockaddr(&sa, APR_LOCAL, inout);

    conn->local_addr = sa->sa.sin;

    apr_get_ipaddr(&conn->local_ip, sa);

    apr_get_sockaddr(&conn->local_addr, APR_LOCAL, inout);

    apr_get_ipaddr(&conn->local_ip, conn->local_addr);

    apr_get_sockaddr(&conn->remote_addr, APR_REMOTE, inout);

    apr_get_ipaddr(&conn->remote_ip, conn->remote_addr);

    conn->base_server = server;

    conn->client_socket = inout;



    apr_get_sockaddr(&sa, APR_REMOTE, inout);

    conn->remote_addr = sa->sa.sin;

    apr_get_ipaddr(&conn->remote_ip, sa);   

    conn->id = id;



    return conn;