X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fhttp.c;h=020e285bbad31a72270930fc45a8507f2ec3b854;hb=5cc5bfa026237076ecb44ae016b78069edfcc492;hp=98b9489ac6be3a607301d70711d2e5e3ed8375ba;hpb=c99908a4b07dafc96ee813375971fd9b589bc551;p=pazpar2-moved-to-github.git

diff --git a/src/http.c b/src/http.c
index 98b9489..020e285 100644
--- a/src/http.c
+++ b/src/http.c
@@ -1,5 +1,22 @@
-/*
- * $Id: http.c,v 1.20 2007-03-31 20:27:15 marc Exp $
+/* $Id: http.c,v 1.27 2007-04-16 09:03:25 adam Exp $
+   Copyright (c) 2006-2007, Index Data.
+
+This file is part of Pazpar2.
+
+Pazpar2 is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Pazpar2; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
  */
 
 #include <stdio.h>
@@ -21,10 +38,12 @@
 #endif
 
 #include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
 
 #include <yaz/yaz-util.h>
 #include <yaz/comstack.h>
-#include <netdb.h>
+#include <yaz/nmem.h>
 
 #include "cconfig.h"
 #include "util.h"
@@ -34,12 +53,9 @@
 #include "http_command.h"
 
 static void proxy_io(IOCHAN i, int event);
-static struct http_channel *http_create(void);
+static struct http_channel *http_create(const char *addr);
 static void http_destroy(IOCHAN i);
 
-extern IOCHAN channel_list;
-extern struct parameters global_parameters;
-
 // If this is set, we proxy normal HTTP requests
 static struct sockaddr_in *proxy_addr = 0; 
 static char proxy_url[256] = "";
@@ -590,7 +606,7 @@ static int http_proxy(struct http_request *rq)
         p->first_response = 1;
         c->proxy = p;
         // We will add EVENT_OUTPUT below
-        p->iochan = iochan_create(sock, 0, proxy_io, EVENT_INPUT);
+        p->iochan = iochan_create(sock, proxy_io, EVENT_INPUT);
         iochan_setdata(p->iochan, p);
         p->iochan->next = channel_list;
         channel_list = p->iochan;
@@ -619,9 +635,9 @@ static int http_proxy(struct http_request *rq)
         sprintf(server_via,  "1.1 %s:%s (%s/%s)",  
                 ser->host, server_port, PACKAGE_NAME, PACKAGE_VERSION);
         hp = http_header_append(c, hp, "Via" , server_via);
-        hp = http_header_append(c, hp,"X-Forwarded-For", c->iochan->addr_str);
-      }
-
+        hp = http_header_append(c, hp, "X-Forwarded-For", c->addr);
+    }
+    
     requestbuf = http_serialize_request(rq);
     http_buf_enqueue(&p->oqueue, requestbuf);
     iochan_setflag(p->iochan, EVENT_OUTPUT);
@@ -900,7 +916,7 @@ static void http_destroy(IOCHAN i)
     iochan_destroy(i);
 }
 
-static struct http_channel *http_create(void)
+static struct http_channel *http_create(const char *addr)
 {
     struct http_channel *r = http_channel_freelist;
 
@@ -922,6 +938,12 @@ static struct http_channel *http_create(void)
     r->state = Http_Idle;
     r->request = 0;
     r->response = 0;
+    if (!addr)
+    {
+        yaz_log(YLOG_WARN, "Invalid HTTP forward address");
+        exit(1);
+    }
+    strcpy(r->addr, addr);
     return r;
 }
 
@@ -949,9 +971,9 @@ static void http_accept(IOCHAN i, int event)
         yaz_log(YLOG_FATAL|YLOG_ERRNO, "fcntl2");
 
     yaz_log(YLOG_DEBUG, "New command connection");
-    c = iochan_create(s, &addr, http_io, EVENT_INPUT | EVENT_EXCEPT);
-
-    ch = http_create();
+    c = iochan_create(s, http_io, EVENT_INPUT | EVENT_EXCEPT);
+    
+    ch = http_create(inet_ntoa(addr.sin_addr));
     ch->iochan = c;
     iochan_setdata(c, ch);
 
@@ -988,14 +1010,21 @@ void http_init(const char *addr)
             yaz_log(YLOG_FATAL, "Unable to resolve '%s'", hostname);
             exit(1);
         }
+        
         memcpy(&myaddr.sin_addr.s_addr, he->h_addr_list[0], he->h_length);
         port = atoi(pp + 1);
+
+        yaz_log(YLOG_LOG, "HTTP address  %s:%d", 
+                "" == he->h_addr_list[0] ? he->h_addr_list[0] : "127.0.0.1" , 
+                    port);
+
     }
     else
     {
         port = atoi(addr);
         myaddr.sin_addr.s_addr = INADDR_ANY;
     }
+
     myaddr.sin_port = htons(port);
 
     if (!(p = getprotobyname("tcp"))) {
@@ -1012,7 +1041,7 @@ void http_init(const char *addr)
     if (listen(l, SOMAXCONN) < 0) 
         yaz_log(YLOG_FATAL|YLOG_ERRNO, "listen");
 
-    c = iochan_create(l, &myaddr, http_accept, EVENT_INPUT | EVENT_EXCEPT);
+    c = iochan_create(l, http_accept, EVENT_INPUT | EVENT_EXCEPT);
     c->next = channel_list;
     channel_list = c;
 }