From b38de6f02fa04e36b881d2aad9c7f792beb0b6a1 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Thu, 3 Mar 2016 05:14:31 +0000
Subject: daemon: introduce host_with_port for identifying sockets

This allows us to share more code between daemons and avoids
having to make additional syscalls for preparing REMOTE_HOST
and REMOTE_PORT in the PSGI env in -httpd.

This will also make supporting HTTP (and NNTP) over Unix sockets
easier in a future commit.
---
 lib/PublicInbox/HTTP.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'lib/PublicInbox/HTTP.pm')

diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index 17e74475..6c4c20d7 100644
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -11,7 +11,7 @@ package PublicInbox::HTTP;
 use strict;
 use warnings;
 use base qw(Danga::Socket);
-use fields qw(httpd env rbuf input_left);
+use fields qw(httpd env rbuf input_left remote_addr remote_port);
 use Fcntl qw(:seek);
 use HTTP::Parser::XS qw(parse_http_request); # supports pure Perl fallback
 use HTTP::Status qw(status_message);
@@ -38,6 +38,8 @@ sub new ($$$) {
 	$self->SUPER::new($sock);
 	$self->{httpd} = $httpd;
 	$self->{rbuf} = '';
+	($self->{remote_addr}, $self->{remote_port}) =
+		PublicInbox::Daemon::host_with_port($addr);
 	$self->watch_read(1);
 	$self;
 }
@@ -113,8 +115,8 @@ sub app_dispatch ($) {
 	my ($self) = @_;
 	$self->watch_read(0);
 	my $env = $self->{env};
-	$env->{REMOTE_ADDR} = $self->peer_ip_string; # Danga::Socket
-	$env->{REMOTE_PORT} = $self->{peer_port}; # set by peer_ip_string
+	$env->{REMOTE_ADDR} = $self->{remote_addr};
+	$env->{REMOTE_PORT} = $self->{remote_port};
 	if (my $host = $env->{HTTP_HOST}) {
 		$host =~ s/:(\d+)\z// and $env->{SERVER_PORT} = $1;
 		$env->{SERVER_NAME} = $host;
-- 
cgit v1.2.3-24-ge0c7