Put proper reference IDs in response PDUs properly.

[metaproxy-moved-to-github.git] / src / ex_filter_frontend_net.cpp

diff --git a/src/ex_filter_frontend_net.cpp b/src/ex_filter_frontend_net.cpp
index 23c5aa1..18df43d 100644 (file)
--- a/src/ex_filter_frontend_net.cpp
+++ b/src/ex_filter_frontend_net.cpp
@@ -1,3 +1,10 @@
+/* $Id: ex_filter_frontend_net.cpp,v 1.24 2006-01-13 15:09:35 adam Exp $
+   Copyright (c) 2005, Index Data.
+
+%LICENSE%
+ */
+
+#include "config.hpp"
 
 #include <cstdlib>
 #include <iostream>
@@ -6,54 +13,41 @@
 #include <boost/program_options.hpp>
 namespace po = boost::program_options;
 
-#include "config.hpp"
 
+#include "util.hpp"
 #include "filter_frontend_net.hpp"
+#include "filter_z3950_client.hpp"
+#include "filter_virt_db.hpp"
+#include "filter_session_shared.hpp"
+#include "filter_log.hpp"
 
-#include "router.hpp"
+#include "router_chain.hpp"
 #include "session.hpp"
 #include "package.hpp"
 
-class FilterInit: public yp2::Filter {
+class HTTPFilter: public yp2::filter::Base {
 public:
     void process(yp2::Package & package) const {
-
         if (package.session().is_closed())
         {
             // std::cout << "Got Close.\n";
         }
-       
+        
         Z_GDU *gdu = package.request().get();
-        if (gdu)
+        if (gdu && gdu->which == Z_GDU_HTTP_Request)
         {
-            ODR odr = odr_createmem(ODR_ENCODE);
-            switch(gdu->which)
-            {
-            case Z_GDU_Z3950:
-                // std::cout << "Got PDU. Sending init response\n";
-                Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse);
-                
-                apdu->u.initResponse->implementationName = "YP2/YAZ";
-                
-                package.response() = apdu;
-                break;
-            case Z_GDU_HTTP_Request:
-                Z_GDU *gdu = z_get_HTTP_Response(odr, 200);
-                Z_HTTP_Response *http_res = gdu->u.HTTP_Response;
-        
-                z_HTTP_header_add(odr, &http_res->headers,
-                                  "Content-Type", "text/plain");
-           
-                http_res->content_buf = 
-                    odr_strdup(odr, "Welcome to YP2");
-                http_res->content_len = strlen(http_res->content_buf);
-
-                package.response() = gdu;
-                break;
-            default:
-                break;
-            } 
-            odr_destroy(odr);
+            yp2::odr odr;
+            Z_GDU *gdu = z_get_HTTP_Response(odr, 200);
+            Z_HTTP_Response *http_res = gdu->u.HTTP_Response;
+            
+            z_HTTP_header_add(odr, &http_res->headers,
+                              "Content-Type", "text/plain");
+            
+            http_res->content_buf = 
+                odr_strdup(odr, "Welcome to YP2");
+            http_res->content_len = strlen(http_res->content_buf);
+            
+            package.response() = gdu;
         }
         return package.move();
     };
@@ -94,19 +88,42 @@ int main(int argc, char **argv)
 
            yp2::RouterChain router;
 
-            // put in frontend first
-            yp2::FilterFrontendNet filter_front;
+            // put frontend filter in router
+            yp2::filter::FrontendNet filter_front;
             filter_front.ports() = ports;
 
             // 0=no time, >0 timeout in seconds
             if (vm.count("duration")) {
                 filter_front.listen_duration() = vm["duration"].as<int>();
             }
-           router.rule(filter_front);
+           router.append(filter_front);
+
+            // put log filter in router
+            yp2::filter::Log filter_log_front("FRONT");
+            router.append(filter_log_front);
+
+            // put Virt db filter in router
+            yp2::filter::Virt_db filter_virt_db;
+            filter_virt_db.add_map_db2vhost("gils", "indexdata.dk/gils",
+                                            "");
+            filter_virt_db.add_map_db2vhost("Default", "localhost:9999/Default",
+                                            "");
+            filter_virt_db.add_map_db2vhost("2", "localhost:9999/Slow", "");
+           router.append(filter_virt_db);
+
+            yp2::filter::SessionShared filter_session_shared;
+            //router.append(filter_session_shared);
+
+            yp2::filter::Log filter_log_back("BACK");
+            router.append(filter_log_back);
+
+            // put HTTP backend filter in router
+            HTTPFilter filter_init;
+           router.append(filter_init);
 
-            // put in a backend
-            FilterInit filter_init;
-           router.rule(filter_init);
+            // put Z39.50 backend filter in router
+            yp2::filter::Z3950Client z3950_client;
+           router.append(z3950_client);
 
             yp2::Session session;
             yp2::Origin origin;
@@ -126,6 +143,7 @@ int main(int argc, char **argv)
  * Local variables:
  * c-basic-offset: 4
  * indent-tabs-mode: nil
+ * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */