/**
 * Copyright (C) 2009 Rutgers, the State University of New Jersey.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *         http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.github.inspektr.common.web;

import javax.servlet.http.HttpServletRequest;

/**
 * Captures information from the HttpServletRequest to log later.
 * 
 * @author Scott Battaglia
 * @version $Revision$ $Date$
 * @since 1.0
 *
 */
public final class ClientInfo {

    public static ClientInfo EMPTY_CLIENT_INFO = new ClientInfo();
	
	/** IP Address of the server (local). */
	private final String serverIpAddress;
	
	/** IP Address of the client (Remote) */
	private final String clientIpAddress;
	
	private ClientInfo() {
		this((String) null, (String) null);
	}
	
	public ClientInfo(final HttpServletRequest request) {
		this(request.getLocalAddr(), request.getRemoteAddr());
	}

    public ClientInfo(final HttpServletRequest request, final String alternateLocation) {
        this(request.getLocalAddr(), request.getHeader(alternateLocation));
    }
	
	public ClientInfo(final String serverIpAddress, final String clientIpAddress) {
		this.serverIpAddress = serverIpAddress == null ? "unknown" : serverIpAddress;
		this.clientIpAddress = clientIpAddress == null ? "unknown" : clientIpAddress;
	}

	public String getServerIpAddress() {
		return this.serverIpAddress;
	}

	public String getClientIpAddress() {
		return this.clientIpAddress;
	}
}

@@ -1484,16 +1484,89 @@
 ocation)
+ != null ? request.getHeader(alternateLocation) : request.getRemoteAddr()
 );%0A    %7D

add support for reading the client IP Address from the Header.