--- base.orig.h 2006-11-21 12:28:28.000000000 +0100
+++ base.h      2006-11-21 12:33:40.000000000 +0100
@@ -370,6 +370,7 @@

        sock_addr dst_addr;
        buffer *dst_addr_buf;
+       buffer *src_addr_buf;

        /* request */
        buffer *parse_request;

--- connections.orig.c  2006-11-21 12:33:28.000000000 +0100
+++ connections.c       2006-11-21 15:13:57.000000000 +0100
@@ -648,6 +648,7 @@
        CLEAN(server_name);
        CLEAN(error_handler);
        CLEAN(dst_addr_buf);
+       CLEAN(src_addr_buf);

 #undef CLEAN
        con->write_queue = chunkqueue_init();
@@ -712,6 +713,7 @@
                CLEAN(server_name);
                CLEAN(error_handler);
                CLEAN(dst_addr_buf);
+               CLEAN(src_addr_buf);
 #undef CLEAN
                free(con->plugin_ctx);
                free(con->cond_cache);
@@ -1251,6 +1253,9 @@
        int cnt;
        sock_addr cnt_addr;
        socklen_t cnt_len;
+
+       sock_addr srv_addr;
+       socklen_t srv_addr_len;
        /* accept it and register the fd */

        cnt_len = sizeof(cnt_addr);
@@ -1298,6 +1303,13 @@
                buffer_copy_string(con->dst_addr_buf, inet_ntop_cache_get_ip(srv, &(con->dst_addr)));
                con->srv_socket = srv_socket;

+               srv_addr_len = sizeof(srv_addr);
+               if (-1 == getsockname(con->fd, &(srv_addr.plain), &srv_addr_len)) {
+                       buffer_copy_string(con->src_addr_buf, inet_ntop_cache_get_ip(srv, &(srv_socket->addr)));
+               } else {
+                       buffer_copy_string(con->src_addr_buf,inet_ntop_cache_get_ip(srv, &(srv_addr)));
+               }
+
                if (-1 == (fdevent_fcntl_set(srv->ev, con->fd))) {
                        log_error_write(srv, __FILE__, __LINE__, "ss", "fcntl failed: ", strerror(errno));
                        return NULL;

--- mod_magnet.orig.c   2006-11-20 18:03:03.000000000 +0100
+++ mod_magnet.c        2006-11-21 13:05:30.000000000 +0100
@@ -365,7 +365,11 @@
                MAGNET_ENV_REQUEST_METHOD,
                MAGNET_ENV_REQUEST_URI,
                MAGNET_ENV_REQUEST_ORIG_URI,
-               MAGNET_ENV_REQUEST_PROTOCOL
+               MAGNET_ENV_REQUEST_PROTOCOL,
+
+               MAGNET_ENV_REMOTE_ADDR,
+
+               MAGNET_ENV_SERVER_ADDR
                } type;
 } magnet_env_t;

@@ -389,6 +393,10 @@
                { "request.orig-uri", MAGNET_ENV_REQUEST_ORIG_URI },
                { "request.protocol", MAGNET_ENV_REQUEST_PROTOCOL },

+               { "remote.address", MAGNET_ENV_REMOTE_ADDR },
+
+               { "server.address", MAGNET_ENV_SERVER_ADDR },
+
                { NULL, MAGNET_ENV_UNSET }
        };

@@ -418,6 +426,10 @@
        case MAGNET_ENV_REQUEST_URI:      dest = con->request.uri; break;
        case MAGNET_ENV_REQUEST_ORIG_URI: dest = con->request.orig_uri; break;
        case MAGNET_ENV_REQUEST_PROTOCOL: break;
+
+       case MAGNET_ENV_REMOTE_ADDR: dest = con->dst_addr_buf; break;
+
+       case MAGNET_ENV_SERVER_ADDR: dest = con->src_addr_buf; break;

        case MAGNET_ENV_UNSET: break;
        }